gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow empty ancestors

Browse Source
This commit is contained in:
Anatoly Yakovenko
2019-03-19 16:54:58 -07:00
committed by Grimes
parent f4c914a630
commit a0d940acf0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/locktower.rs
View File

@@ -125,6 +125,7 @@ impl Locktower {
confirmation_count: MAX_LOCKOUT_HISTORY as u32, confirmation_count: MAX_LOCKOUT_HISTORY as u32,
slot: root, slot: root,
}; };
trace!("ROOT: {}", vote.slot);
Self::update_ancestor_lockouts(&mut stake_lockouts, &vote, ancestors); Self::update_ancestor_lockouts(&mut stake_lockouts, &vote, ancestors);
} }
} }
@@ -228,7 +229,7 @@ impl Locktower {
ancestors: &HashMap<u64, HashSet<u64>>, ancestors: &HashMap<u64, HashSet<u64>>,
) { ) {
let mut slot_with_ancestors = vec![vote.slot]; let mut slot_with_ancestors = vec![vote.slot];
slot_with_ancestors.extend(&ancestors[&vote.slot]); slot_with_ancestors.extend(ancestors.get(&vote.slot).unwrap_or(&HashSet::new()));
for slot in slot_with_ancestors { for slot in slot_with_ancestors {
let entry = &mut stake_lockouts.entry(slot).or_default(); let entry = &mut stake_lockouts.entry(slot).or_default();
entry.lockout += vote.lockout(); entry.lockout += vote.lockout();
@@ -244,7 +245,7 @@ impl Locktower {
ancestors: &HashMap<u64, HashSet<u64>>, ancestors: &HashMap<u64, HashSet<u64>>,
) { ) {
let mut slot_with_ancestors = vec![slot]; let mut slot_with_ancestors = vec![slot];
slot_with_ancestors.extend(&ancestors[&slot]); slot_with_ancestors.extend(ancestors.get(&slot).unwrap_or(&HashSet::new()));
for slot in slot_with_ancestors { for slot in slot_with_ancestors {
let entry = &mut stake_lockouts.entry(slot).or_default(); let entry = &mut stake_lockouts.entry(slot).or_default();
entry.stake += lamports; entry.stake += lamports;