Fix various clippy lints
This commit is contained in:
parent
6e5e1721f7
commit
21ecaddac1
@ -98,7 +98,7 @@ impl ClientConfig {
|
|||||||
|
|
||||||
// Custom bootnodes
|
// Custom bootnodes
|
||||||
if let Some(boot_addresses_str) = args.value_of("boot-nodes") {
|
if let Some(boot_addresses_str) = args.value_of("boot-nodes") {
|
||||||
let boot_addresses_split = boot_addresses_str.split(",");
|
let boot_addresses_split = boot_addresses_str.split(',');
|
||||||
for boot_address in boot_addresses_split {
|
for boot_address in boot_addresses_split {
|
||||||
if let Ok(boot_address) = boot_address.parse::<Multiaddr>() {
|
if let Ok(boot_address) = boot_address.parse::<Multiaddr>() {
|
||||||
config.net_conf.boot_nodes.append(&mut vec![boot_address]);
|
config.net_conf.boot_nodes.append(&mut vec![boot_address]);
|
||||||
|
@ -120,12 +120,11 @@ impl<T: Store, E: EthSpec> BitwiseLMDGhost<T, E> {
|
|||||||
|
|
||||||
// not in the cache recursively search for ancestors using a log-lookup
|
// not in the cache recursively search for ancestors using a log-lookup
|
||||||
if let Some(ancestor) = {
|
if let Some(ancestor) = {
|
||||||
let ancestor_lookup = self.ancestors
|
let ancestor_lookup = *self.ancestors
|
||||||
[log2_int((block_height - target_height - 1u64).as_u64()) as usize]
|
[log2_int((block_height - target_height - 1u64).as_u64()) as usize]
|
||||||
.get(&block_hash)
|
.get(&block_hash)
|
||||||
//TODO: Panic if we can't lookup and fork choice fails
|
//TODO: Panic if we can't lookup and fork choice fails
|
||||||
.expect("All blocks should be added to the ancestor log lookup table")
|
.expect("All blocks should be added to the ancestor log lookup table");
|
||||||
.clone();
|
|
||||||
self.get_ancestor(ancestor_lookup, target_height, &spec)
|
self.get_ancestor(ancestor_lookup, target_height, &spec)
|
||||||
} {
|
} {
|
||||||
// add the result to the cache
|
// add the result to the cache
|
||||||
@ -152,7 +151,7 @@ impl<T: Store, E: EthSpec> BitwiseLMDGhost<T, E> {
|
|||||||
// these have already been weighted by balance
|
// these have already been weighted by balance
|
||||||
for (hash, votes) in latest_votes.iter() {
|
for (hash, votes) in latest_votes.iter() {
|
||||||
if let Some(ancestor) = self.get_ancestor(*hash, block_height, spec) {
|
if let Some(ancestor) = self.get_ancestor(*hash, block_height, spec) {
|
||||||
let current_vote_value = current_votes.get(&ancestor).unwrap_or_else(|| &0).clone();
|
let current_vote_value = *current_votes.get(&ancestor).unwrap_or_else(|| &0);
|
||||||
current_votes.insert(ancestor, current_vote_value + *votes);
|
current_votes.insert(ancestor, current_vote_value + *votes);
|
||||||
total_vote_count += votes;
|
total_vote_count += votes;
|
||||||
}
|
}
|
||||||
|
@ -120,12 +120,11 @@ impl<T: Store, E: EthSpec> OptimizedLMDGhost<T, E> {
|
|||||||
|
|
||||||
// not in the cache recursively search for ancestors using a log-lookup
|
// not in the cache recursively search for ancestors using a log-lookup
|
||||||
if let Some(ancestor) = {
|
if let Some(ancestor) = {
|
||||||
let ancestor_lookup = self.ancestors
|
let ancestor_lookup = *self.ancestors
|
||||||
[log2_int((block_height - target_height - 1u64).as_u64()) as usize]
|
[log2_int((block_height - target_height - 1u64).as_u64()) as usize]
|
||||||
.get(&block_hash)
|
.get(&block_hash)
|
||||||
//TODO: Panic if we can't lookup and fork choice fails
|
//TODO: Panic if we can't lookup and fork choice fails
|
||||||
.expect("All blocks should be added to the ancestor log lookup table")
|
.expect("All blocks should be added to the ancestor log lookup table");
|
||||||
.clone();
|
|
||||||
self.get_ancestor(ancestor_lookup, target_height, &spec)
|
self.get_ancestor(ancestor_lookup, target_height, &spec)
|
||||||
} {
|
} {
|
||||||
// add the result to the cache
|
// add the result to the cache
|
||||||
@ -152,7 +151,7 @@ impl<T: Store, E: EthSpec> OptimizedLMDGhost<T, E> {
|
|||||||
// these have already been weighted by balance
|
// these have already been weighted by balance
|
||||||
for (hash, votes) in latest_votes.iter() {
|
for (hash, votes) in latest_votes.iter() {
|
||||||
if let Some(ancestor) = self.get_ancestor(*hash, block_height, spec) {
|
if let Some(ancestor) = self.get_ancestor(*hash, block_height, spec) {
|
||||||
let current_vote_value = current_votes.get(&ancestor).unwrap_or_else(|| &0).clone();
|
let current_vote_value = *current_votes.get(&ancestor).unwrap_or_else(|| &0);
|
||||||
current_votes.insert(ancestor, current_vote_value + *votes);
|
current_votes.insert(ancestor, current_vote_value + *votes);
|
||||||
total_vote_count += votes;
|
total_vote_count += votes;
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,7 @@ where
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
|
fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
|
||||||
if bytes.len() == 0 {
|
if bytes.is_empty() {
|
||||||
Ok(FixedLenVec::from(vec![]))
|
Ok(FixedLenVec::from(vec![]))
|
||||||
} else if T::is_ssz_fixed_len() {
|
} else if T::is_ssz_fixed_len() {
|
||||||
bytes
|
bytes
|
||||||
|
@ -102,9 +102,7 @@ impl<'a> SszDecoderBuilder<'a> {
|
|||||||
.and_then(|o| Some(o.offset))
|
.and_then(|o| Some(o.offset))
|
||||||
.unwrap_or_else(|| BYTES_PER_LENGTH_OFFSET);
|
.unwrap_or_else(|| BYTES_PER_LENGTH_OFFSET);
|
||||||
|
|
||||||
if previous_offset > offset {
|
if (previous_offset > offset) || (offset > self.bytes.len()) {
|
||||||
return Err(DecodeError::OutOfBoundsByte { i: offset });
|
|
||||||
} else if offset > self.bytes.len() {
|
|
||||||
return Err(DecodeError::OutOfBoundsByte { i: offset });
|
return Err(DecodeError::OutOfBoundsByte { i: offset });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,11 +54,9 @@ impl Decode for bool {
|
|||||||
match bytes[0] {
|
match bytes[0] {
|
||||||
0b0000_0000 => Ok(false),
|
0b0000_0000 => Ok(false),
|
||||||
0b0000_0001 => Ok(true),
|
0b0000_0001 => Ok(true),
|
||||||
_ => {
|
_ => Err(DecodeError::BytesInvalid(
|
||||||
return Err(DecodeError::BytesInvalid(
|
format!("Out-of-range for boolean: {}", bytes[0]).to_string(),
|
||||||
format!("Out-of-range for boolean: {}", bytes[0]).to_string(),
|
)),
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -121,7 +119,7 @@ impl<T: Decode> Decode for Vec<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
|
fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
|
||||||
if bytes.len() == 0 {
|
if bytes.is_empty() {
|
||||||
Ok(vec![])
|
Ok(vec![])
|
||||||
} else if T::is_ssz_fixed_len() {
|
} else if T::is_ssz_fixed_len() {
|
||||||
bytes
|
bytes
|
||||||
|
Loading…
Reference in New Issue
Block a user