fix CI

dapplion · Feb 26, 2024 · 0ad7641 · 0ad7641
1 parent 5e4c129
commit 0ad7641
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs
@@ -1172,7 +1172,7 @@ where
     /// A list of sync messages for the given state.
     pub fn make_sync_committee_messages(
         &self,
-        state: &BeaconState<E>,
+        state: &mut BeaconState<E>,
         head_block_root: Hash256,
         message_slot: Slot,
         relative_sync_committee: RelativeSyncCommittee,
@@ -1191,6 +1191,8 @@ where
             .spec
             .fork_at_epoch(message_slot.epoch(E::slots_per_epoch()));
 
+        state.update_pubkey_cache().unwrap();
+
         sync_committee
             .pubkeys
             .as_ref()
@@ -1387,14 +1389,16 @@ where
 
     pub fn make_sync_contributions(
         &self,
-        state: &BeaconState<E>,
+        state: &mut BeaconState<E>,
         block_hash: Hash256,
         slot: Slot,
         relative_sync_committee: RelativeSyncCommittee,
     ) -> HarnessSyncContributions<E> {
         let sync_messages =
             self.make_sync_committee_messages(state, block_hash, slot, relative_sync_committee);
 
+        state.update_pubkey_cache().unwrap();
+
         let sync_contributions: Vec<Option<SignedContributionAndProof<E>>> = sync_messages
             .iter()
             .enumerate()
@@ -2008,7 +2012,7 @@ where
 
     pub fn sync_committee_sign_block(
         &self,
-        state: &BeaconState<E>,
+        state: &mut BeaconState<E>,
         block_hash: Hash256,
         slot: Slot,
         relative_sync_committee: RelativeSyncCommittee,
@@ -2043,14 +2047,14 @@ where
         validators: &[usize],
         sync_committee_strategy: SyncCommitteeStrategy,
     ) -> Result<(SignedBeaconBlockHash, BeaconState<E>), BlockError<E>> {
-        let (block_hash, block, state) = self.add_block_at_slot(slot, state).await?;
+        let (block_hash, block, mut state) = self.add_block_at_slot(slot, state).await?;
         self.attest_block(&state, state_root, block_hash, &block.0, validators);
 
         if sync_committee_strategy == SyncCommitteeStrategy::AllValidators
             && state.current_sync_committee().is_ok()
         {
             self.sync_committee_sign_block(
-                &state,
+                &mut state,
                 block_hash.into(),
                 slot,
                 if (slot + 1).epoch(E::slots_per_epoch())

diff --git a/beacon_node/beacon_chain/tests/rewards.rs b/beacon_node/beacon_chain/tests/rewards.rs
@@ -54,7 +54,7 @@ async fn test_sync_committee_rewards() {
 
     // Create and add sync committee message to op_pool
     let sync_contributions = harness.make_sync_contributions(
-        &harness.get_current_state(),
+        &mut harness.get_current_state(),
         latest_block_root,
         harness.get_current_slot(),
         RelativeSyncCommittee::Current,

diff --git a/beacon_node/beacon_chain/tests/sync_committee_verification.rs b/beacon_node/beacon_chain/tests/sync_committee_verification.rs
@@ -71,9 +71,9 @@ fn get_valid_sync_committee_message_for_block(
     message_index: usize,
     block_root: Hash256,
 ) -> (SyncCommitteeMessage, usize, SecretKey, SyncSubnetId) {
-    let head_state = harness.chain.head_beacon_state_cloned();
+    let mut head_state = harness.chain.head_beacon_state_cloned();
     let (signature, _) = harness
-        .make_sync_committee_messages(&head_state, block_root, slot, relative_sync_committee)
+        .make_sync_committee_messages(&mut head_state, block_root, slot, relative_sync_committee)
         .get(0)
         .expect("sync messages should exist")
         .get(message_index)
@@ -94,13 +94,14 @@ fn get_valid_sync_contribution(
     harness: &BeaconChainHarness<EphemeralHarnessType<E>>,
     relative_sync_committee: RelativeSyncCommittee,
 ) -> (SignedContributionAndProof<E>, usize, SecretKey) {
-    let head_state = harness.chain.head_beacon_state_cloned();
+    let mut head_state = harness.chain.head_beacon_state_cloned();
 
     let head_block_root = harness.chain.head_snapshot().beacon_block_root;
+    let head_state_slot = head_state.slot();
     let sync_contributions = harness.make_sync_contributions(
-        &head_state,
+        &mut head_state,
         head_block_root,
-        head_state.slot(),
+        head_state_slot,
         relative_sync_committee,
     );
 

diff --git a/beacon_node/http_api/src/lib.rs b/beacon_node/http_api/src/lib.rs
@@ -771,7 +771,7 @@ pub fn serve<T: BeaconChainTypes>(
                                 let index_opt = match &validator_id {
                                     ValidatorId::PublicKey(pubkey) => state
                                         .get_validator_index_readonly(pubkey)
-                                        .map_err(|e| warp_utils::reject::beacon_state_error(e))?,
+                                        .map_err(warp_utils::reject::beacon_state_error)?,
                                     ValidatorId::Index(index) => Some(*index as usize),
                                 };
 
@@ -1040,12 +1040,12 @@ pub fn serve<T: BeaconChainTypes>(
                                     .pubkeys
                                     .iter()
                                     .map(|pubkey| {
-                                        Ok(state
+                                        state
                                             .get_validator_index_readonly(pubkey)?
                                             .map(|index| index as u64)
                                             .ok_or(BeaconChainError::ValidatorPubkeyUnknown(
                                                 *pubkey,
-                                            ))?)
+                                            ))
                                     })
                                     .collect::<Result<Vec<_>, BeaconChainError>>()
                                     .map_err(warp_utils::reject::beacon_chain_error)?;