resolve merge conflicts between untstable and release-v7.0.0

2026-03-20 13:24:44 +00:00 · 2025-03-23 11:09:02 -06:00
parent d323699fde 04868027a6
commit cbf1c04a14
63 changed files with 1422 additions and 242 deletions
--- a/beacon_node/beacon_chain/src/test_utils.rs
+++ b/beacon_node/beacon_chain/src/test_utils.rs
@@ -857,7 +857,7 @@ where
    pub fn get_hot_state(&self, state_hash: BeaconStateHash) -> Option<BeaconState<E>> {
        self.chain
            .store
-            .load_hot_state(&state_hash.into())
+            .load_hot_state(&state_hash.into(), true)
            .unwrap()
            .map(|(state, _)| state)
    }