Use spec fn for max_effective_balance

sigp · Jun 26, 2024 · 7deb40d · 7deb40d
1 parent ffcc61b
commit 7deb40d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/consensus/types/src/beacon_state.rs b/consensus/types/src/beacon_state.rs
@@ -892,11 +892,7 @@ impl<E: EthSpec> BeaconState<E> {
             return Err(Error::InsufficientValidators);
         }
 
-        let max_effective_balance = if self.fork_name_unchecked() >= ForkName::Electra {
-            spec.max_effective_balance_electra
-        } else {
-            spec.max_effective_balance
-        };
+        let max_effective_balance = spec.max_effective_balance_for_fork(self.fork_name_unchecked());
 
         let mut i = 0;
         loop {
@@ -1095,11 +1091,7 @@ impl<E: EthSpec> BeaconState<E> {
 
         let seed = self.get_seed(epoch, Domain::SyncCommittee, spec)?;
 
-        let max_effective_balance = if self.fork_name_unchecked() >= ForkName::Electra {
-            spec.max_effective_balance_electra
-        } else {
-            spec.max_effective_balance
-        };
+        let max_effective_balance = spec.max_effective_balance_for_fork(self.fork_name_unchecked());
 
         let mut i = 0;
         let mut sync_committee_indices = Vec::with_capacity(E::SyncCommitteeSize::to_usize());

diff --git a/consensus/types/src/validator.rs b/consensus/types/src/validator.rs
@@ -219,6 +219,7 @@ impl Validator {
         }
     }
 
+    /// TODO(electra): refactor these functions and make it simpler.. this is a mess
     /// Returns `true` if the validator is partially withdrawable.
     fn is_partially_withdrawable_validator_capella(&self, balance: u64, spec: &ChainSpec) -> bool {
         self.has_eth1_withdrawal_credential(spec)