From 3fa7790e0dd4b0f21f2dcd1bd12ef40d633c7c7d Mon Sep 17 00:00:00 2001
From: Pawan Dhananjay <pawandhananjay@gmail.com>
Date: Thu, 10 Oct 2024 13:36:23 -0700
Subject: [PATCH] Remove get_active_balance

---
 .../src/per_epoch_processing/single_pass.rs   | 22 ++++++++++---------
 consensus/types/src/beacon_state.rs           | 21 ------------------
 consensus/types/src/validator.rs              | 10 ---------
 3 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/consensus/state_processing/src/per_epoch_processing/single_pass.rs b/consensus/state_processing/src/per_epoch_processing/single_pass.rs
index fcb480a37c..1d37562a95 100644
--- a/consensus/state_processing/src/per_epoch_processing/single_pass.rs
+++ b/consensus/state_processing/src/per_epoch_processing/single_pass.rs
@@ -941,21 +941,23 @@ fn process_pending_consolidations<E: EthSpec>(
             break;
         }
 
-        // Calculate the active balance while we have the source validator loaded. This is a safe
-        // reordering.
-        let source_balance = *state
-            .balances()
-            .get(source_index)
-            .ok_or(BeaconStateError::UnknownValidator(source_index))?;
-        let active_balance =
-            source_validator.get_active_balance(source_balance, spec, state_ctxt.fork_name);
+        // Calculate the consolidated balance
+        let max_effective_balance =
+            source_validator.get_max_effective_balance(spec, state_ctxt.fork_name);
+        let source_effective_balance = std::cmp::min(
+            *state
+                .balances()
+                .get(source_index)
+                .ok_or(BeaconStateError::UnknownValidator(source_index))?,
+            max_effective_balance,
+        );
 
         // Churn any target excess active balance of target and raise its max.
         state.switch_to_compounding_validator(target_index, spec)?;
 
         // Move active balance to target. Excess balance is withdrawable.
-        decrease_balance(state, source_index, active_balance)?;
-        increase_balance(state, target_index, active_balance)?;
+        decrease_balance(state, source_index, source_effective_balance)?;
+        increase_balance(state, target_index, source_effective_balance)?;
 
         affected_validators.insert(source_index);
         affected_validators.insert(target_index);
diff --git a/consensus/types/src/beacon_state.rs b/consensus/types/src/beacon_state.rs
index 8eed790a02..d96752e0bf 100644
--- a/consensus/types/src/beacon_state.rs
+++ b/consensus/types/src/beacon_state.rs
@@ -2121,27 +2121,6 @@ impl<E: EthSpec> BeaconState<E> {
             .map_err(Into::into)
     }
 
-    /// Get active balance for the given `validator_index`.
-    pub fn get_active_balance(
-        &self,
-        validator_index: usize,
-        spec: &ChainSpec,
-        current_fork: ForkName,
-    ) -> Result<u64, Error> {
-        let max_effective_balance = self
-            .validators()
-            .get(validator_index)
-            .map(|validator| validator.get_max_effective_balance(spec, current_fork))
-            .ok_or(Error::UnknownValidator(validator_index))?;
-        Ok(std::cmp::min(
-            *self
-                .balances()
-                .get(validator_index)
-                .ok_or(Error::UnknownValidator(validator_index))?,
-            max_effective_balance,
-        ))
-    }
-
     pub fn get_pending_balance_to_withdraw(&self, validator_index: usize) -> Result<u64, Error> {
         let mut pending_balance = 0;
         for withdrawal in self
diff --git a/consensus/types/src/validator.rs b/consensus/types/src/validator.rs
index 298604d4f3..e94f4b4a0a 100644
--- a/consensus/types/src/validator.rs
+++ b/consensus/types/src/validator.rs
@@ -262,16 +262,6 @@ impl Validator {
             spec.max_effective_balance
         }
     }
-
-    pub fn get_active_balance(
-        &self,
-        validator_balance: u64,
-        spec: &ChainSpec,
-        current_fork: ForkName,
-    ) -> u64 {
-        let max_effective_balance = self.get_max_effective_balance(spec, current_fork);
-        std::cmp::min(validator_balance, max_effective_balance)
-    }
 }
 
 impl Default for Validator {