From 6c6f98ba3cc58ae82bb88f9b7cba711ba38c2ff1 Mon Sep 17 00:00:00 2001 From: Ashwin Sekar Date: Wed, 23 Aug 2023 23:42:11 +0000 Subject: [PATCH] ff cleanup: vote_state_update_credit_per_deque --- programs/vote/src/vote_state/mod.rs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs index fb63c7dc8a8c5e..d1e7d1d7a2f679 100644 --- a/programs/vote/src/vote_state/mod.rs +++ b/programs/vote/src/vote_state/mod.rs @@ -549,7 +549,7 @@ pub fn process_new_vote_state( new_root: Option, timestamp: Option, epoch: Epoch, - feature_set: Option<&FeatureSet>, + _feature_set: Option<&FeatureSet>, ) -> Result<(), VoteError> { assert!(!new_state.is_empty()); if new_state.len() > MAX_LOCKOUT_HISTORY { @@ -683,18 +683,9 @@ pub fn process_new_vote_state( // our state. if vote_state.root_slot != new_root { // Award vote credits based on the number of slots that were voted on and have reached finality - if feature_set - .map(|feature_set| { - feature_set.is_active(&feature_set::vote_state_update_credit_per_dequeue::id()) - }) - .unwrap_or(false) - { - // For each finalized slot, there was one voted-on slot in the new vote state that was responsible for - // finalizing it. Each of those votes is awarded 1 credit. - vote_state.increment_credits(epoch, finalized_slot_count); - } else { - vote_state.increment_credits(epoch, 1); - } + // For each finalized slot, there was one voted-on slot in the new vote state that was responsible for + // finalizing it. Each of those votes is awarded 1 credit. + vote_state.increment_credits(epoch, finalized_slot_count); } if let Some(timestamp) = timestamp { let last_slot = new_state.back().unwrap().slot(); @@ -1670,8 +1661,7 @@ mod tests { vec![227, 228, 229, 230, 231, 232, 233, 234, 235, 236], ]; - let mut feature_set = FeatureSet::default(); - feature_set.activate(&feature_set::vote_state_update_credit_per_dequeue::id(), 1); + let feature_set = FeatureSet::default(); for vote_group in test_vote_groups { // Duplicate vote_state so that the new vote can be applied