Fix clippy warnings (#1385)

## Issue Addressed

NA

## Proposed Changes

Fixes most clippy warnings and ignores the rest of them, see issue #1388.
This commit is contained in:
blacktemplar
2020-07-23 14:18:00 +00:00
parent ba10c80633
commit 23a8f31f83
93 changed files with 396 additions and 396 deletions

View File

@@ -1,5 +1,4 @@
use proto_array::fork_choice_test_definition::*;
use serde_yaml;
use std::fs::File;
fn main() {

View File

@@ -358,14 +358,12 @@ impl ProtoArray {
}
}
}
} else if child_leads_to_viable_head {
// There is no current best-child and the child is viable.
change_to_child
} else {
if child_leads_to_viable_head {
// There is no current best-child and the child is viable.
change_to_child
} else {
// There is no current best-child but the child is not viable.
no_change
}
// There is no current best-child but the child is not viable.
no_change
};
let parent = self

View File

@@ -95,7 +95,7 @@ impl ProtoArrayForkChoice {
.map_err(|e| format!("Failed to add finalized block to proto_array: {:?}", e))?;
Ok(Self {
proto_array: proto_array,
proto_array,
votes: ElasticList::default(),
balances: vec![],
})
@@ -171,6 +171,10 @@ impl ProtoArrayForkChoice {
self.proto_array.nodes.len()
}
pub fn is_empty(&self) -> bool {
self.proto_array.nodes.is_empty()
}
pub fn contains_block(&self, block_root: &Hash256) -> bool {
self.proto_array.indices.contains_key(block_root)
}

View File

@@ -45,7 +45,7 @@ impl From<SszContainer> for ProtoArrayForkChoice {
};
Self {
proto_array: proto_array,
proto_array,
votes: ElasticList(from.votes),
balances: from.balances,
}