formatting and lint check

This commit is contained in:
Vladimir Komendantskiy 2018-05-15 22:25:41 +01:00
parent c8034da332
commit 5f916c4d08
4 changed files with 15 additions and 13 deletions

View File

@ -242,7 +242,10 @@ impl<NodeUid: Clone + Debug + Eq + Hash> Agreement<NodeUid> {
self.sent_bval.clear();
self.received_aux.clear();
self.epoch += 1;
debug!("Agreement instance {:?} started epoch {}", self.uid, self.epoch);
debug!(
"Agreement instance {:?} started epoch {}",
self.uid, self.epoch
);
let decision = if vals.len() != 1 {
self.estimated = Some(coin);

View File

@ -289,8 +289,10 @@ impl<NodeUid: Clone + Debug + Eq + Hash + Ord> CommonSubset<NodeUid> {
.filter(|(k, _)| delivered_1.get(k).is_some())
.map(|(k, v)| (k.clone(), v.clone()))
.collect();
debug!("Broadcast results among the Agreement instances that delivered 1: {:?}",
broadcast_results);
debug!(
"Broadcast results among the Agreement instances that delivered 1: {:?}",
broadcast_results
);
if delivered_1.len() == broadcast_results.len() {
debug!("Agreement instances completed with {:?}", broadcast_results);

View File

@ -146,8 +146,8 @@ where
// FIXME: Handle the node IDs in `ser_batches`.
let batches: Vec<Vec<T>> = if let Some(ser_batches) = cs_out {
ser_batches
.into_iter()
.map(|(_, ser_batch)| bincode::deserialize(&ser_batch))
.values()
.map(|ser_batch| bincode::deserialize(&ser_batch))
.collect::<Result<_, _>>()?
} else {
return Ok(());

View File

@ -5,7 +5,7 @@ extern crate hbbft;
extern crate log;
extern crate env_logger;
use std::collections::{BTreeMap, HashSet, HashMap, VecDeque};
use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
use hbbft::common_subset;
use hbbft::common_subset::CommonSubset;
@ -119,7 +119,7 @@ impl TestNetwork {
let (output, messages) = self.nodes.get_mut(&sender_id).unwrap().handle_message();
let messages = messages
.into_iter()
.map(|TargetedMessage { target: _, message }| message)
.map(|TargetedMessage { message, .. }| message)
.collect();
self.dispatch_messages(sender_id, messages);
(sender_id, output)
@ -137,7 +137,7 @@ impl TestNetwork {
sender_id,
messages
.into_iter()
.map(|TargetedMessage { target: _, message }| message)
.map(|TargetedMessage { message, .. }| message)
.collect(),
);
}
@ -165,7 +165,7 @@ fn test_common_subset_4_nodes() {
let mut network = TestNetwork::new(&all_ids);
let expected_node_decision: HashMap<NodeUid, ProposedValue> = all_ids
.iter()
.map(|id| (id.clone(), proposed_value.clone()))
.map(|id| (*id, proposed_value.clone()))
.collect();
network.send_proposed_value(NodeUid(0), proposed_value.clone());
@ -176,9 +176,6 @@ fn test_common_subset_4_nodes() {
let nodes = test_common_subset(network);
for node in nodes.values() {
assert_eq!(
node.decision,
Some(expected_node_decision.clone())
);
assert_eq!(node.decision, Some(expected_node_decision.clone()));
}
}