blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove continues from compute_active_feature_set()

This commit is contained in:
Michael Vines 2020-09-25 21:54:19 -07:00 committed by mergify[bot]
parent b15d6148dd
commit a36252bfa0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/src/bank.rs
View File

@ -3506,6 +3506,7 @@ impl Bank {
let slot = self.slot();
for feature_id in &self.feature_set.inactive {
let mut activated = false;
if let Some(mut account) = self.get_account(feature_id) {
if let Some(mut feature) = Feature::from_account(&account) {
match feature.activated_at {
@ -3517,22 +3518,24 @@ impl Bank {
self.store_account(feature_id, &account);
}
newly_activated.insert(*feature_id);
active.insert(*feature_id);
activated = true;
info!("Feature {} activated at slot {}", feature_id, slot);
continue;
}
}
Some(activation_slot) => {
if slot >= activation_slot {
// Feature is already active
active.insert(*feature_id);
continue;
activated = true;
}
}
}
}
}
inactive.insert(*feature_id);
if activated {
active.insert(*feature_id);
} else {
inactive.insert(*feature_id);
}
}
self.feature_set = Arc::new(FeatureSet { active, inactive });