From ef111dcbe1e38c72fcfb1d3a71c060e4df723b90 Mon Sep 17 00:00:00 2001 From: Stephen Akridge Date: Mon, 18 Mar 2019 15:20:04 -0700 Subject: [PATCH] Decendent is not a word --- core/src/bank_forks.rs | 20 ++++++++++---------- core/src/locktower.rs | 34 +++++++++++++++++----------------- core/src/replay_stage.rs | 4 ++-- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/core/src/bank_forks.rs b/core/src/bank_forks.rs index fbbbd5d9cd..507af0bffa 100644 --- a/core/src/bank_forks.rs +++ b/core/src/bank_forks.rs @@ -45,8 +45,8 @@ impl BankForks { } /// Create a map of bank slot id to the set of all of its descendants - pub fn decendants(&self) -> HashMap> { - let mut decendants = HashMap::new(); + pub fn descendants(&self) -> HashMap> { + let mut descendants = HashMap::new(); let mut pending: Vec> = self.banks.values().cloned().collect(); let mut done = HashSet::new(); assert!(!pending.is_empty()); @@ -56,16 +56,16 @@ impl BankForks { continue; } done.insert(bank.slot()); - let _ = decendants.entry(bank.slot()).or_insert(HashSet::new()); + let _ = descendants.entry(bank.slot()).or_insert(HashSet::new()); for parent in bank.parents() { - decendants + descendants .entry(parent.slot()) .or_insert(HashSet::new()) .insert(bank.slot()); } pending.extend(bank.parents().into_iter()); } - decendants + descendants } pub fn frozen_banks(&self) -> HashMap> { @@ -148,7 +148,7 @@ mod tests { } #[test] - fn test_bank_forks_decendants() { + fn test_bank_forks_descendants() { let (genesis_block, _) = GenesisBlock::new(10_000); let bank = Bank::new(&genesis_block); let mut bank_forks = BankForks::new(0, bank); @@ -157,11 +157,11 @@ mod tests { bank_forks.insert(1, bank); let bank = Bank::new_from_parent(&bank0, &Pubkey::default(), 2); bank_forks.insert(2, bank); - let decendants = bank_forks.decendants(); - let children: Vec = decendants[&0].iter().cloned().collect(); + let descendants = bank_forks.descendants(); + let children: Vec = descendants[&0].iter().cloned().collect(); assert_eq!(children, vec![1, 2]); - assert!(decendants[&1].is_empty()); - assert!(decendants[&2].is_empty()); + assert!(descendants[&1].is_empty()); + assert!(descendants[&2].is_empty()); } #[test] diff --git a/core/src/locktower.rs b/core/src/locktower.rs index 39634ffee5..c5c4be8ecb 100644 --- a/core/src/locktower.rs +++ b/core/src/locktower.rs @@ -177,19 +177,19 @@ impl Locktower { false } - pub fn is_locked_out(&self, slot: u64, decendants: &HashMap>) -> bool { + pub fn is_locked_out(&self, slot: u64, descendants: &HashMap>) -> bool { let mut lockouts = self.lockouts.clone(); lockouts.process_vote(Vote { slot }); for vote in &lockouts.votes { if vote.slot == slot { continue; } - if !decendants[&vote.slot].contains(&slot) { + if !descendants[&vote.slot].contains(&slot) { return false; } } if let Some(root) = lockouts.root_slot { - decendants[&root].contains(&slot) + descendants[&root].contains(&slot) } else { true } @@ -378,28 +378,28 @@ mod test { #[test] fn test_is_locked_out_empty() { let locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = HashMap::new(); - assert!(locktower.is_locked_out(0, &decendants)); + let descendants = HashMap::new(); + assert!(locktower.is_locked_out(0, &descendants)); } #[test] fn test_is_locked_out_root_slot_child() { let mut locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = vec![(0, vec![1].into_iter().collect())] + let descendants = vec![(0, vec![1].into_iter().collect())] .into_iter() .collect(); locktower.lockouts.root_slot = Some(0); - assert!(locktower.is_locked_out(1, &decendants)); + assert!(locktower.is_locked_out(1, &descendants)); } #[test] fn test_is_locked_out_root_slot_sibling() { let mut locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = vec![(0, vec![1].into_iter().collect())] + let descendants = vec![(0, vec![1].into_iter().collect())] .into_iter() .collect(); locktower.lockouts.root_slot = Some(0); - assert!(!locktower.is_locked_out(2, &decendants)); + assert!(!locktower.is_locked_out(2, &descendants)); } #[test] @@ -413,28 +413,28 @@ mod test { #[test] fn test_is_locked_out_double_vote() { let mut locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = vec![(0, vec![1].into_iter().collect()), (1, HashSet::new())] + let descendants = vec![(0, vec![1].into_iter().collect()), (1, HashSet::new())] .into_iter() .collect(); locktower.record_vote(0); locktower.record_vote(1); - assert!(!locktower.is_locked_out(0, &decendants)); + assert!(!locktower.is_locked_out(0, &descendants)); } #[test] fn test_is_locked_out_child() { let mut locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = vec![(0, vec![1].into_iter().collect())] + let descendants = vec![(0, vec![1].into_iter().collect())] .into_iter() .collect(); locktower.record_vote(0); - assert!(locktower.is_locked_out(1, &decendants)); + assert!(locktower.is_locked_out(1, &descendants)); } #[test] fn test_is_locked_out_sibling() { let mut locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = vec![ + let descendants = vec![ (0, vec![1, 2].into_iter().collect()), (1, HashSet::new()), (2, HashSet::new()), @@ -443,18 +443,18 @@ mod test { .collect(); locktower.record_vote(0); locktower.record_vote(1); - assert!(!locktower.is_locked_out(2, &decendants)); + assert!(!locktower.is_locked_out(2, &descendants)); } #[test] fn test_is_locked_out_last_vote_expired() { let mut locktower = Locktower::new(EpochStakes::new_for_tests(2), 0, 0.67); - let decendants = vec![(0, vec![1, 4].into_iter().collect()), (1, HashSet::new())] + let descendants = vec![(0, vec![1, 4].into_iter().collect()), (1, HashSet::new())] .into_iter() .collect(); locktower.record_vote(0); locktower.record_vote(1); - assert!(locktower.is_locked_out(4, &decendants)); + assert!(locktower.is_locked_out(4, &descendants)); locktower.record_vote(4); assert_eq!(locktower.lockouts.votes[0].slot, 0); assert_eq!(locktower.lockouts.votes[0].confirmation_count, 2); diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index a12dc1b7c8..2b16ad7eab 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -127,14 +127,14 @@ impl ReplayStage { let locktower_start = Instant::now(); // Locktower voting - let decendants = bank_forks.read().unwrap().decendants(); + let descendants = bank_forks.read().unwrap().descendants(); let ancestors = bank_forks.read().unwrap().ancestors(); let frozen_banks = bank_forks.read().unwrap().frozen_banks(); let mut votable: Vec<(u128, Arc)> = frozen_banks .values() .filter(|b| b.is_votable()) .filter(|b| !locktower.has_voted(b.slot())) - .filter(|b| !locktower.is_locked_out(b.slot(), &decendants)) + .filter(|b| !locktower.is_locked_out(b.slot(), &descendants)) .map(|bank| { ( bank,