gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-21 22:04:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge issues

Browse Source
This commit is contained in:
realbigsean
2023-07-07 10:17:04 -04:00
parent cfe2452533
commit c4da1ba450
14 changed files with 143 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/src/test_utils.rs
View File

@@ -812,9 +812,9 @@ where
&self,
state: BeaconState<E>,
slot: Slot,
) -> (SignedBlindedBeaconBlock<E>, BeaconState<E>) {
) -> (BlockContentsTuple<E, BlindedPayload<E>>, BeaconState<E>) {
let (unblinded, new_state) = self.make_block(state, slot).await;
(unblinded.into(), new_state)
((unblinded.0.into(), unblinded.1), new_state)
}
/// Returns a newly created block, signed by the proposer for the given slot.
@@ -1839,7 +1839,9 @@ where
self.set_current_slot(slot);
let block_hash: SignedBeaconBlockHash = self
.chain
.process_block(block_root, block.into(), NotifyExecutionLayer::Yes,|| Ok(()),)
.process_block(block_root, block.into(), NotifyExecutionLayer::Yes, || {
Ok(())
})
.await?
.try_into()
.unwrap();