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

View File

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