From 2296643e398656d83e39dde5553c37553e6c921b Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Fri, 10 Jun 2022 13:47:31 +1000
Subject: [PATCH] Fix failing payload_invalidation tests

---
 .../tests/payload_invalidation.rs             | 24 +++++++++----------
 beacon_node/execution_layer/src/lib.rs        | 14 +----------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/beacon_node/beacon_chain/tests/payload_invalidation.rs b/beacon_node/beacon_chain/tests/payload_invalidation.rs
index 83fdc1b0128..04f6b0d8e26 100644
--- a/beacon_node/beacon_chain/tests/payload_invalidation.rs
+++ b/beacon_node/beacon_chain/tests/payload_invalidation.rs
@@ -980,14 +980,14 @@ async fn payload_preparation() {
     let fee_recipient = Address::repeat_byte(99);
 
     // Provide preparation data to the EL for `proposer`.
-    el.update_proposer_preparation_blocking(
+    el.update_proposer_preparation(
         Epoch::new(1),
         &[ProposerPreparationData {
             validator_index: proposer as u64,
             fee_recipient,
         }],
     )
-    .unwrap();
+    .await;
 
     rig.harness
         .chain
@@ -1082,16 +1082,14 @@ async fn payload_preparation_before_transition_block() {
     let el = rig.execution_layer();
 
     let head = rig.harness.chain.head().unwrap();
-    let head_execution_status = rig
-        .harness
-        .chain
-        .canonical_head
-        .read()
-        .head_execution_status()
-        .unwrap();
     assert_eq!(
-        head_execution_status.block_hash(),
-        Some(ExecutionBlockHash::zero()),
+        head.beacon_block
+            .message()
+            .body()
+            .execution_payload()
+            .unwrap()
+            .block_hash(),
+        ExecutionBlockHash::zero(),
         "the head block is post-bellatrix but pre-transition"
     );
 
@@ -1104,14 +1102,14 @@ async fn payload_preparation_before_transition_block() {
     let fee_recipient = Address::repeat_byte(99);
 
     // Provide preparation data to the EL for `proposer`.
-    el.update_proposer_preparation_blocking(
+    el.update_proposer_preparation(
         Epoch::new(0),
         &[ProposerPreparationData {
             validator_index: proposer as u64,
             fee_recipient,
         }],
     )
-    .unwrap();
+    .await;
 
     rig.move_to_terminal_block();
 
diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
index cff21902722..79631ff9466 100644
--- a/beacon_node/execution_layer/src/lib.rs
+++ b/beacon_node/execution_layer/src/lib.rs
@@ -447,19 +447,7 @@ impl ExecutionLayer {
     }
 
     /// Updates the proposer preparation data provided by validators
-    pub fn update_proposer_preparation_blocking(
-        &self,
-        update_epoch: Epoch,
-        preparation_data: &[ProposerPreparationData],
-    ) -> Result<(), Error> {
-        self.block_on_generic(|_| async move {
-            self.update_proposer_preparation(update_epoch, preparation_data)
-                .await
-        })
-    }
-
-    /// Updates the proposer preparation data provided by validators
-    async fn update_proposer_preparation(
+    pub async fn update_proposer_preparation(
         &self,
         update_epoch: Epoch,
         preparation_data: &[ProposerPreparationData],