From d062f61125c7c14d14f71f31f391a5e0069ecdcb Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Tue, 27 Jun 2023 15:26:14 +1000
Subject: [PATCH] Fix failing tests after merge

---
 beacon_node/beacon_chain/src/beacon_chain.rs  |  2 +-
 beacon_node/beacon_chain/src/lib.rs           |  2 +-
 .../beacon_chain/tests/block_verification.rs  | 33 +++++++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index a6e1d0ee6..c99f312a0 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -2921,7 +2921,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         }
     }
 
-    async fn import_available_block(
+    pub async fn import_available_block(
         self: &Arc<Self>,
         block: Box<AvailableExecutedBlock<T::EthSpec>>,
     ) -> Result<AvailabilityProcessingStatus, BlockError<T::EthSpec>> {
diff --git a/beacon_node/beacon_chain/src/lib.rs b/beacon_node/beacon_chain/src/lib.rs
index 8c004e792..94fb8c855 100644
--- a/beacon_node/beacon_chain/src/lib.rs
+++ b/beacon_node/beacon_chain/src/lib.rs
@@ -70,7 +70,7 @@ pub use attestation_verification::Error as AttestationError;
 pub use beacon_fork_choice_store::{BeaconForkChoiceStore, Error as ForkChoiceStoreError};
 pub use block_verification::{
     get_block_root, AvailabilityPendingExecutedBlock, BlockError, ExecutedBlock,
-    ExecutionPayloadError, GossipVerifiedBlock, IntoExecutionPendingBlock,
+    ExecutionPayloadError, ExecutionPendingBlock, GossipVerifiedBlock, IntoExecutionPendingBlock,
     PayloadVerificationOutcome, PayloadVerificationStatus,
 };
 pub use canonical_head::{CachedHead, CanonicalHead, CanonicalHeadRwLock};
diff --git a/beacon_node/beacon_chain/tests/block_verification.rs b/beacon_node/beacon_chain/tests/block_verification.rs
index 2bdcc83d8..f9847845b 100644
--- a/beacon_node/beacon_chain/tests/block_verification.rs
+++ b/beacon_node/beacon_chain/tests/block_verification.rs
@@ -4,6 +4,8 @@ use beacon_chain::blob_verification::BlockWrapper;
 use beacon_chain::{
     blob_verification::AsBlock,
     test_utils::{AttestationStrategy, BeaconChainHarness, BlockStrategy, EphemeralHarnessType},
+    AvailabilityProcessingStatus, BeaconChain, BeaconChainTypes, ExecutedBlock,
+    ExecutionPendingBlock,
 };
 use beacon_chain::{
     BeaconSnapshot, BlockError, ChainSegmentResult, IntoExecutionPendingBlock, NotifyExecutionLayer,
@@ -1409,7 +1411,8 @@ async fn import_duplicate_block_unrealized_justification() {
     // Produce a block to justify epoch 2.
     let state = harness.get_current_state();
     let slot = harness.get_current_slot();
-    let (block, _) = harness.make_block(state.clone(), slot).await;
+    let (block_contents, _) = harness.make_block(state.clone(), slot).await;
+    let (block, _) = block_contents;
     let block = Arc::new(block);
     let block_root = block.canonical_root();
 
@@ -1425,9 +1428,7 @@ async fn import_duplicate_block_unrealized_justification() {
         .unwrap();
 
     // Import the first block, simulating a block processed via a finalized chain segment.
-    chain
-        .clone()
-        .import_execution_pending_block(verified_block1)
+    import_execution_pending_block(chain.clone(), verified_block1)
         .await
         .unwrap();
 
@@ -1446,9 +1447,7 @@ async fn import_duplicate_block_unrealized_justification() {
     drop(fc);
 
     // Import the second verified block, simulating a block processed via RPC.
-    chain
-        .clone()
-        .import_execution_pending_block(verified_block2)
+    import_execution_pending_block(chain.clone(), verified_block2)
         .await
         .unwrap();
 
@@ -1467,3 +1466,23 @@ async fn import_duplicate_block_unrealized_justification() {
         Some(unrealized_justification)
     );
 }
+
+async fn import_execution_pending_block<T: BeaconChainTypes>(
+    chain: Arc<BeaconChain<T>>,
+    execution_pending_block: ExecutionPendingBlock<T>,
+) -> Result<AvailabilityProcessingStatus, String> {
+    match chain
+        .clone()
+        .into_executed_block(execution_pending_block)
+        .await
+        .unwrap()
+    {
+        ExecutedBlock::Available(block) => chain
+            .import_available_block(Box::from(block))
+            .await
+            .map_err(|e| format!("{e:?}")),
+        ExecutedBlock::AvailabilityPending(_) => {
+            Err("AvailabilityPending not expected in this test. Block not imported.".to_string())
+        }
+    }
+}