Address Clippy 1.73 lints (#4809)
## Proposed Changes Fix Clippy lints enabled by default in Rust 1.73.0, released today.
This commit is contained in:
parent
b82f7843ff
commit
9769a247b2
@ -66,7 +66,7 @@ impl CheckpointMap {
|
|||||||
pub fn insert(&mut self, checkpoint: Checkpoint, eth1_finalization_data: Eth1FinalizationData) {
|
pub fn insert(&mut self, checkpoint: Checkpoint, eth1_finalization_data: Eth1FinalizationData) {
|
||||||
self.store
|
self.store
|
||||||
.entry(checkpoint.epoch)
|
.entry(checkpoint.epoch)
|
||||||
.or_insert_with(Vec::new)
|
.or_default()
|
||||||
.push((checkpoint.root, eth1_finalization_data));
|
.push((checkpoint.root, eth1_finalization_data));
|
||||||
|
|
||||||
// faster to reduce size after the fact than do pre-checking to see
|
// faster to reduce size after the fact than do pre-checking to see
|
||||||
|
@ -343,7 +343,7 @@ impl<T: EthSpec> ExecutionBlockGenerator<T> {
|
|||||||
let block_hash = block.block_hash();
|
let block_hash = block.block_hash();
|
||||||
self.block_hashes
|
self.block_hashes
|
||||||
.entry(block.block_number())
|
.entry(block.block_number())
|
||||||
.or_insert_with(Vec::new)
|
.or_default()
|
||||||
.push(block_hash);
|
.push(block_hash);
|
||||||
self.blocks.insert(block_hash, block);
|
self.blocks.insert(block_hash, block);
|
||||||
|
|
||||||
|
@ -5,8 +5,8 @@ use beacon_chain::{BeaconChain, BeaconChainTypes};
|
|||||||
use eth2::lighthouse::StandardBlockReward;
|
use eth2::lighthouse::StandardBlockReward;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use warp_utils::reject::beacon_chain_error;
|
use warp_utils::reject::beacon_chain_error;
|
||||||
//// The difference between block_rewards and beacon_block_rewards is the later returns block
|
/// The difference between block_rewards and beacon_block_rewards is the later returns block
|
||||||
//// reward format that satisfies beacon-api specs
|
/// reward format that satisfies beacon-api specs
|
||||||
pub fn compute_beacon_block_rewards<T: BeaconChainTypes>(
|
pub fn compute_beacon_block_rewards<T: BeaconChainTypes>(
|
||||||
chain: Arc<BeaconChain<T>>,
|
chain: Arc<BeaconChain<T>>,
|
||||||
block_id: BlockId,
|
block_id: BlockId,
|
||||||
|
@ -1043,7 +1043,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
|
|||||||
Subnet::Attestation(_) => {
|
Subnet::Attestation(_) => {
|
||||||
subnet_to_peer
|
subnet_to_peer
|
||||||
.entry(subnet)
|
.entry(subnet)
|
||||||
.or_insert_with(Vec::new)
|
.or_default()
|
||||||
.push((*peer_id, info.clone()));
|
.push((*peer_id, info.clone()));
|
||||||
}
|
}
|
||||||
Subnet::SyncCommittee(id) => {
|
Subnet::SyncCommittee(id) => {
|
||||||
|
@ -330,13 +330,15 @@ impl Eq for Score {}
|
|||||||
|
|
||||||
impl PartialOrd for Score {
|
impl PartialOrd for Score {
|
||||||
fn partial_cmp(&self, other: &Score) -> Option<std::cmp::Ordering> {
|
fn partial_cmp(&self, other: &Score) -> Option<std::cmp::Ordering> {
|
||||||
self.score().partial_cmp(&other.score())
|
Some(self.cmp(other))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Ord for Score {
|
impl Ord for Score {
|
||||||
fn cmp(&self, other: &Score) -> std::cmp::Ordering {
|
fn cmp(&self, other: &Score) -> std::cmp::Ordering {
|
||||||
self.partial_cmp(other).unwrap_or(std::cmp::Ordering::Equal)
|
self.score()
|
||||||
|
.partial_cmp(&other.score())
|
||||||
|
.unwrap_or(std::cmp::Ordering::Equal)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,14 +151,8 @@ impl<T: EthSpec> AttestationMap<T> {
|
|||||||
indexed,
|
indexed,
|
||||||
} = SplitAttestation::new(attestation, attesting_indices);
|
} = SplitAttestation::new(attestation, attesting_indices);
|
||||||
|
|
||||||
let attestation_map = self
|
let attestation_map = self.checkpoint_map.entry(checkpoint).or_default();
|
||||||
.checkpoint_map
|
let attestations = attestation_map.attestations.entry(data).or_default();
|
||||||
.entry(checkpoint)
|
|
||||||
.or_insert_with(AttestationDataMap::default);
|
|
||||||
let attestations = attestation_map
|
|
||||||
.attestations
|
|
||||||
.entry(data)
|
|
||||||
.or_insert_with(Vec::new);
|
|
||||||
|
|
||||||
// Greedily aggregate the attestation with all existing attestations.
|
// Greedily aggregate the attestation with all existing attestations.
|
||||||
// NOTE: this is sub-optimal and in future we will remove this in favour of max-clique
|
// NOTE: this is sub-optimal and in future we will remove this in favour of max-clique
|
||||||
|
@ -48,7 +48,7 @@ impl<E: EthSpec> KeyValueStore<E> for MemoryStore<E> {
|
|||||||
self.col_keys
|
self.col_keys
|
||||||
.write()
|
.write()
|
||||||
.entry(col.as_bytes().to_vec())
|
.entry(col.as_bytes().to_vec())
|
||||||
.or_insert_with(HashSet::new)
|
.or_default()
|
||||||
.insert(key.to_vec());
|
.insert(key.to_vec());
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -193,7 +193,7 @@ impl<T: SlotClock + 'static, E: EthSpec> AttestationService<T, E> {
|
|||||||
.into_iter()
|
.into_iter()
|
||||||
.fold(HashMap::new(), |mut map, duty_and_proof| {
|
.fold(HashMap::new(), |mut map, duty_and_proof| {
|
||||||
map.entry(duty_and_proof.duty.committee_index)
|
map.entry(duty_and_proof.duty.committee_index)
|
||||||
.or_insert_with(Vec::new)
|
.or_default()
|
||||||
.push(duty_and_proof);
|
.push(duty_and_proof);
|
||||||
map
|
map
|
||||||
});
|
});
|
||||||
|
@ -163,7 +163,7 @@ impl SyncDutiesMap {
|
|||||||
|
|
||||||
committees_writer
|
committees_writer
|
||||||
.entry(committee_period)
|
.entry(committee_period)
|
||||||
.or_insert_with(CommitteeDuties::default)
|
.or_default()
|
||||||
.init(validator_indices);
|
.init(validator_indices);
|
||||||
|
|
||||||
// Return shared reference
|
// Return shared reference
|
||||||
|
Loading…
Reference in New Issue
Block a user