refactor: optional stake_history arg is never None (#34556)

refactor: optional stake_history arg is never none
solana-labs · Dec 22, 2023 · 88af74d · 88af74d
1 parent 8a8466c
commit 88af74d
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 147 deletions.
diff --git a/cli/src/stake.rs b/cli/src/stake.rs
@@ -2320,7 +2320,7 @@ pub fn build_stake_state(
                 deactivating,
             } = stake.delegation.stake_activating_and_deactivating(
                 current_epoch,
-                Some(stake_history),
+                stake_history,
                 new_rate_activation_epoch,
             );
             let lockup = if lockup.is_in_force(clock, None) {

diff --git a/program-test/tests/warp.rs b/program-test/tests/warp.rs
@@ -205,7 +205,7 @@ async fn stake_rewards_from_warp() {
     assert_eq!(
         stake
             .delegation
-            .stake_activating_and_deactivating(clock.epoch, Some(&stake_history), None),
+            .stake_activating_and_deactivating(clock.epoch, &stake_history, None),
         StakeActivationStatus::with_effective(stake.delegation.stake),
     );
 }
@@ -321,7 +321,7 @@ async fn stake_rewards_filter_bench_core(num_stake_accounts: u64) {
     assert_eq!(
         stake
             .delegation
-            .stake_activating_and_deactivating(clock.epoch, Some(&stake_history), None),
+            .stake_activating_and_deactivating(clock.epoch, &stake_history, None),
         StakeActivationStatus::with_effective(stake.delegation.stake),
     );
 }

diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs
@@ -595,7 +595,7 @@ mod tests {
             if let StakeStateV2::Stake(_meta, stake, _stake_flags) = account.state().unwrap() {
                 let stake_status = stake.delegation.stake_activating_and_deactivating(
                     clock.epoch,
-                    Some(stake_history),
+                    stake_history,
                     None,
                 );
                 active_stake += stake_status.effective;
@@ -6846,15 +6846,11 @@ mod tests {
                 create_account_shared_data_for_test(&stake_history),
             );
             if stake_amount
-                == stake.stake(
-                    clock.epoch,
-                    Some(&stake_history),
-                    new_warmup_cooldown_rate_epoch,
-                )
+                == stake.stake(clock.epoch, &stake_history, new_warmup_cooldown_rate_epoch)
                 && merge_from_amount
                     == merge_from_stake.stake(
                         clock.epoch,
-                        Some(&stake_history),
+                        &stake_history,
                         new_warmup_cooldown_rate_epoch,
                     )
             {
@@ -6935,14 +6931,10 @@ mod tests {
                 stake_history::id(),
                 create_account_shared_data_for_test(&stake_history),
             );
-            if 0 == stake.stake(
-                clock.epoch,
-                Some(&stake_history),
-                new_warmup_cooldown_rate_epoch,
-            ) && 0
-                == merge_from_stake.stake(
+            if 0 == stake.stake(clock.epoch, &stake_history, new_warmup_cooldown_rate_epoch)
+                && 0 == merge_from_stake.stake(
                     clock.epoch,
-                    Some(&stake_history),
+                    &stake_history,
                     new_warmup_cooldown_rate_epoch,
                 )
             {
@@ -7388,11 +7380,7 @@ mod tests {
                     initial_stake_state
                         .delegation()
                         .unwrap()
-                        .stake_activating_and_deactivating(
-                            current_epoch,
-                            Some(&stake_history),
-                            None
-                        )
+                        .stake_activating_and_deactivating(current_epoch, &stake_history, None)
                 );
             }
 
@@ -7888,7 +7876,7 @@ mod tests {
                 },
                 stake.delegation.stake_activating_and_deactivating(
                     current_epoch,
-                    Some(&stake_history),
+                    &stake_history,
                     None
                 )
             );