poanetwork
/
hbbft
mirror of https://github.com/poanetwork/hbbft.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused code from CommonSubset.

This commit is contained in:
Andreas Fackler 2018-05-30 15:50:16 +02:00
parent c91fa13213
commit f700ae82d0
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common_subset.rs
View File

@ -1,8 +1,5 @@
//! Asynchronous Common Subset algorithm. //! Asynchronous Common Subset algorithm.
// TODO: This module is work in progress. Remove this attribute when it's not needed anymore.
#![allow(unused)]
use std::collections::{BTreeMap, BTreeSet, VecDeque}; use std::collections::{BTreeMap, BTreeSet, VecDeque};
use std::fmt::Debug; use std::fmt::Debug;
use std::hash::Hash; use std::hash::Hash;
@ -13,7 +10,7 @@ use agreement::{Agreement, AgreementMessage};
use broadcast; use broadcast;
use broadcast::{Broadcast, BroadcastMessage}; use broadcast::{Broadcast, BroadcastMessage};
use fmt::HexBytes; use fmt::HexBytes;
use messaging::{DistAlgorithm, NetworkInfo, Target, TargetedMessage}; use messaging::{DistAlgorithm, NetworkInfo, TargetedMessage};
error_chain!{ error_chain!{
types { types {
@ -34,13 +31,8 @@ error_chain!{
} }
} }
// TODO: Make this a generic argument of `Broadcast`. // TODO: Make this a generic argument of `CommonSubset`.
type ProposedValue = Vec<u8>; type ProposedValue = Vec<u8>;
// Type of output from the Common Subset message handler.
type CommonSubsetOutput<NodeUid> = (
Option<BTreeMap<NodeUid, ProposedValue>>,
VecDeque<TargetedMessage<Message<NodeUid>, NodeUid>>,
);
/// Message from Common Subset to remote nodes. /// Message from Common Subset to remote nodes.
#[cfg_attr(feature = "serialization-serde", derive(Serialize))] #[cfg_attr(feature = "serialization-serde", derive(Serialize))]
@ -154,9 +146,6 @@ impl<NodeUid: Clone + Debug + Eq + Hash + Ord> DistAlgorithm for CommonSubset<No
impl<NodeUid: Clone + Debug + Eq + Hash + Ord> CommonSubset<NodeUid> { impl<NodeUid: Clone + Debug + Eq + Hash + Ord> CommonSubset<NodeUid> {
pub fn new(netinfo: Rc<NetworkInfo<NodeUid>>) -> CommonSubsetResult<Self> { pub fn new(netinfo: Rc<NetworkInfo<NodeUid>>) -> CommonSubsetResult<Self> {
let num_nodes = netinfo.num_nodes();
let num_faulty_nodes = netinfo.num_faulty();
// Create all broadcast instances. // Create all broadcast instances.
let mut broadcast_instances: BTreeMap<NodeUid, Broadcast<NodeUid>> = BTreeMap::new(); let mut broadcast_instances: BTreeMap<NodeUid, Broadcast<NodeUid>> = BTreeMap::new();
for proposer_id in netinfo.all_uids() { for proposer_id in netinfo.all_uids() {
@ -260,7 +249,7 @@ impl<NodeUid: Clone + Debug + Eq + Hash + Ord> CommonSubset<NodeUid> {
if agreement.terminated() { if agreement.terminated() {
return Ok(()); return Ok(());
} }
f(agreement); f(agreement)?;
self.messages.extend_agreement(proposer_id, agreement); self.messages.extend_agreement(proposer_id, agreement);
if let Some(output) = agreement.next_output() { if let Some(output) = agreement.next_output() {
output output