Revert "Reuse milhouse subtrees to shrink inactivity_scores in memory (#7062)"

This reverts commit 6399ad482b.
This commit is contained in:
Michael Sproul
2025-03-04 09:17:32 +11:00
parent 6399ad482b
commit fcf1e3f24f
15 changed files with 63 additions and 202 deletions

View File

@@ -2713,16 +2713,16 @@ where
let mut block_hash_from_slot: HashMap<Slot, SignedBeaconBlockHash> = HashMap::new();
let mut state_hash_from_slot: HashMap<Slot, BeaconStateHash> = HashMap::new();
for slot in slots {
// Using a `Box::pin` to reduce the stack size. Clippy was raising a lints.
let (block_hash, new_state) = Box::pin(self.add_attested_block_at_slot_with_sync(
*slot,
state,
state_root,
validators,
sync_committee_strategy,
))
.await
.unwrap();
let (block_hash, new_state) = self
.add_attested_block_at_slot_with_sync(
*slot,
state,
state_root,
validators,
sync_committee_strategy,
)
.await
.unwrap();
state = new_state;

View File

@@ -328,7 +328,8 @@ async fn test_rewards_base_multi_inclusion() {
.extend_slots(E::slots_per_epoch() as usize * 2 - 4)
.await;
check_all_base_rewards(&harness, initial_balances).await;
// pin to reduce stack size for clippy
Box::pin(check_all_base_rewards(&harness, initial_balances)).await;
}
#[tokio::test]
@@ -691,8 +692,7 @@ async fn check_all_base_rewards(
harness: &BeaconChainHarness<EphemeralHarnessType<E>>,
balances: Vec<u64>,
) {
// The box reduces the size on the stack for a clippy lint.
Box::pin(check_all_base_rewards_for_subset(harness, balances, vec![])).await;
check_all_base_rewards_for_subset(harness, balances, vec![]).await;
}
async fn check_all_base_rewards_for_subset(