cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Operation pool: HashMap instead of BTreeMap

Browse Source
This commit is contained in:
Michael Sproul 2019-03-20 13:06:06 +11:00
parent 05dd936a97
commit 03c01c8a8d
No known key found for this signature in database
GPG Key ID: 77B1309D2E54E914
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
eth2/operation_pool/src/lib.rs
View File

@ -10,7 +10,7 @@ use std::collections::{btree_map::Entry, hash_map, BTreeMap, HashMap, HashSet};
use types::chain_spec::Domain; use types::chain_spec::Domain;
use types::{ use types::{
Attestation, AttestationData, AttesterSlashing, BeaconState, ChainSpec, Deposit, Epoch, Attestation, AttestationData, AttesterSlashing, BeaconState, ChainSpec, Deposit, Epoch,
ProposerSlashing, Transfer, VoluntaryExit, ProposerSlashing, Transfer, Validator, VoluntaryExit,
}; };
#[cfg(test)] #[cfg(test)]
@ -29,11 +29,11 @@ pub struct OperationPool {
// longer than an epoch // longer than an epoch
deposits: BTreeMap<u64, Deposit>, deposits: BTreeMap<u64, Deposit>,
/// Map from attester index to slashing. /// Map from attester index to slashing.
attester_slashings: BTreeMap<u64, AttesterSlashing>, attester_slashings: HashMap<u64, AttesterSlashing>,
/// Map from proposer index to slashing. /// Map from proposer index to slashing.
proposer_slashings: BTreeMap<u64, ProposerSlashing>, proposer_slashings: HashMap<u64, ProposerSlashing>,
/// Map from exiting validator to their exit data. /// Map from exiting validator to their exit data.
voluntary_exits: BTreeMap<u64, VoluntaryExit>, voluntary_exits: HashMap<u64, VoluntaryExit>,
/// Set of transfers. /// Set of transfers.
transfers: HashSet<Transfer>, transfers: HashSet<Transfer>,
} }
@ -268,24 +268,14 @@ impl OperationPool {
/// Prune slashings for all slashed or withdrawn validators. /// Prune slashings for all slashed or withdrawn validators.
pub fn prune_proposer_slashings(&mut self, finalized_state: &BeaconState, spec: &ChainSpec) { pub fn prune_proposer_slashings(&mut self, finalized_state: &BeaconState, spec: &ChainSpec) {
let to_prune = self prune_validator_hash_map(
.proposer_slashings &mut self.proposer_slashings,
.keys() |validator| {
.flat_map(|&validator_index| { validator.slashed
finalized_state || validator.is_withdrawable_at(finalized_state.current_epoch(spec))
.validator_registry },
.get(validator_index as usize) finalized_state,
.filter(|validator| { );
validator.slashed
|| validator.is_withdrawable_at(finalized_state.current_epoch(spec))
})
.map(|_| validator_index)
})
.collect::<Vec<_>>();
for validator_index in to_prune {
self.proposer_slashings.remove(&validator_index);
}
} }
// TODO: copy ProposerSlashing code for AttesterSlashing // TODO: copy ProposerSlashing code for AttesterSlashing
@ -314,21 +304,11 @@ impl OperationPool {
/// Prune if validator has already exited at the last finalized state. /// Prune if validator has already exited at the last finalized state.
pub fn prune_voluntary_exits(&mut self, finalized_state: &BeaconState, spec: &ChainSpec) { pub fn prune_voluntary_exits(&mut self, finalized_state: &BeaconState, spec: &ChainSpec) {
let to_prune = self prune_validator_hash_map(
.voluntary_exits &mut self.voluntary_exits,
.keys() |validator| validator.is_exited_at(finalized_state.current_epoch(spec)),
.flat_map(|&validator_index| { finalized_state,
finalized_state );
.validator_registry
.get(validator_index as usize)
.filter(|validator| validator.is_exited_at(finalized_state.current_epoch(spec)))
.map(|_| validator_index)
})
.collect::<Vec<_>>();
for validator_index in to_prune {
self.voluntary_exits.remove(&validator_index);
}
} }
/// Insert a transfer into the pool, checking it for validity in the process. /// Insert a transfer into the pool, checking it for validity in the process.
@ -393,6 +373,26 @@ where
.collect() .collect()
} }
/// Remove all entries from the given hash map for which `prune_if` returns true.
///
/// The keys in the map should be validator indices, which will be looked up
/// in the state's validator registry and then passed to `prune_if`.
/// Entries for unknown validators will be kept.
fn prune_validator_hash_map<T, F>(
map: &mut HashMap<u64, T>,
prune_if: F,
finalized_state: &BeaconState,
) where
F: Fn(&Validator) -> bool,
{
map.retain(|&validator_index, _| {
finalized_state
.validator_registry
.get(validator_index as usize)
.map_or(true, |validator| !prune_if(validator))
});
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::DepositInsertStatus::*; use super::DepositInsertStatus::*;
@ -459,7 +459,6 @@ mod tests {
fn prune_deposits() { fn prune_deposits() {
let rng = &mut XorShiftRng::from_seed([42; 16]); let rng = &mut XorShiftRng::from_seed([42; 16]);
let mut op_pool = OperationPool::new(); let mut op_pool = OperationPool::new();
let spec = ChainSpec::foundation();
let start1 = 100; let start1 = 100;
let count = 100; let count = 100;