From 1458394cd99ffd841943d8b07a5cd7f56a4f45a0 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Tue, 26 Sep 2023 11:46:20 +1000
Subject: [PATCH] Fix compilation issues after merging `unstable`.

---
 beacon_node/beacon_chain/tests/store_tests.rs | 8 ++------
 common/eth2/src/types.rs                      | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/beacon_node/beacon_chain/tests/store_tests.rs b/beacon_node/beacon_chain/tests/store_tests.rs
index cb5b98fa2..6b6206d5e 100644
--- a/beacon_node/beacon_chain/tests/store_tests.rs
+++ b/beacon_node/beacon_chain/tests/store_tests.rs
@@ -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))
             .unwrap();
 
-    let mock = mock_execution_layer_from_parts(
-        &harness.spec,
-        harness.runtime.task_executor.clone(),
-        None,
-        None,
-    );
+    let mock =
+        mock_execution_layer_from_parts(&harness.spec, harness.runtime.task_executor.clone(), None);
 
     // Initialise a new beacon chain from the finalized checkpoint.
     // The slot clock must be set to a time ahead of the checkpoint state.
diff --git a/common/eth2/src/types.rs b/common/eth2/src/types.rs
index 389b25a4a..cc790f467 100644
--- a/common/eth2/src/types.rs
+++ b/common/eth2/src/types.rs
@@ -1491,7 +1491,7 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockContents<T, Payload> {
         match (Payload::block_type(), blobs) {
             (BlockType::Full, Some(blobs)) => {
                 Self::BlockAndBlobSidecars(BeaconBlockAndBlobSidecars {
-                    block: block,
+                    block,
                     blob_sidecars: blobs,
                 })
             }