cerc-io/lighthouse
15
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix compilation issues after merging unstable.

Browse Source
This commit is contained in:
Jimmy Chen 2023-09-26 11:46:20 +10:00
parent 7a3cb135d4
commit 1458394cd9
No known key found for this signature in database
GPG Key ID: 7AAEE02659DCF690
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/tests/store_tests.rs
View File

@ -2159,12 +2159,8 @@ async fn weak_subjectivity_sync_test(slots: Vec<Slot>, checkpoint_slot: Slot) {
.map_err(|e| println!("Unable to read trusted setup file: {}", e)) .map_err(|e| println!("Unable to read trusted setup file: {}", e))
.unwrap(); .unwrap();
let mock = mock_execution_layer_from_parts( let mock =
&harness.spec, mock_execution_layer_from_parts(&harness.spec, harness.runtime.task_executor.clone(), None);
harness.runtime.task_executor.clone(),
None,
None,
);
// Initialise a new beacon chain from the finalized checkpoint. // Initialise a new beacon chain from the finalized checkpoint.
// The slot clock must be set to a time ahead of the checkpoint state. // The slot clock must be set to a time ahead of the checkpoint state.

2
common/eth2/src/types.rs
View File

@ -1491,7 +1491,7 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockContents<T, Payload> {
match (Payload::block_type(), blobs) { match (Payload::block_type(), blobs) {
(BlockType::Full, Some(blobs)) => { (BlockType::Full, Some(blobs)) => {
Self::BlockAndBlobSidecars(BeaconBlockAndBlobSidecars { Self::BlockAndBlobSidecars(BeaconBlockAndBlobSidecars {
block: block, block,
blob_sidecars: blobs, blob_sidecars: blobs,
}) })
} }