From 4bd527546bcd580d7034c96cee4b2534575bafb9 Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Wed, 23 Aug 2023 11:23:12 +1000
Subject: [PATCH] Fix failing beacon chain tests and remove unnecessary blob
 clone

---
 beacon_node/beacon_chain/src/test_utils.rs    | 8 ++++----
 beacon_node/beacon_chain/tests/store_tests.rs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs
index 1172746825..dea0f61926 100644
--- a/beacon_node/beacon_chain/src/test_utils.rs
+++ b/beacon_node/beacon_chain/src/test_utils.rs
@@ -1893,11 +1893,11 @@ where
         self.set_current_slot(slot);
         let (block, blobs) = block_contents;
         // Note: we are just dropping signatures here and skipping signature verification.
-        let blobs_without_signatures = blobs.as_ref().map(|blobs| {
+        let blobs_without_signatures = blobs.map(|blobs| {
             VariableList::from(
                 blobs
                     .into_iter()
-                    .map(|blob| blob.message.clone())
+                    .map(|blob| blob.message)
                     .collect::<Vec<_>>(),
             )
         });
@@ -1922,11 +1922,11 @@ where
     ) -> Result<SignedBeaconBlockHash, BlockError<E>> {
         let (block, blobs) = block_contents;
         // Note: we are just dropping signatures here and skipping signature verification.
-        let blobs_without_signatures = blobs.as_ref().map(|blobs| {
+        let blobs_without_signatures = blobs.map(|blobs| {
             VariableList::from(
                 blobs
                     .into_iter()
-                    .map(|blob| blob.message.clone())
+                    .map(|blob| blob.message)
                     .collect::<Vec<_>>(),
             )
         });
diff --git a/beacon_node/beacon_chain/tests/store_tests.rs b/beacon_node/beacon_chain/tests/store_tests.rs
index 899b31cb8b..0183b59e1b 100644
--- a/beacon_node/beacon_chain/tests/store_tests.rs
+++ b/beacon_node/beacon_chain/tests/store_tests.rs
@@ -2380,10 +2380,10 @@ async fn process_blocks_and_attestations_for_unaligned_checkpoint() {
     let (unadvanced_split_state, unadvanced_split_state_root) =
         harness.get_current_state_and_root();
 
-    let (invalid_fork_block, _) = harness
+    let ((invalid_fork_block, _), _) = harness
         .make_block(unadvanced_split_state.clone(), split_slot)
         .await;
-    let (valid_fork_block, _) = harness
+    let ((valid_fork_block, _), _) = harness
         .make_block(unadvanced_split_state.clone(), split_slot + 1)
         .await;