clean up after merge

sigp · Jul 16, 2024 · 6127b4b · 6127b4b
1 parent 53ccea7
commit 6127b4b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
@@ -1789,10 +1789,7 @@ impl<E: EthSpec> ExecutionLayer<E> {
         let _timer = metrics::start_timer(&metrics::EXECUTION_LAYER_GET_PAYLOAD_BODIES_BY_RANGE);
         self.engine()
             .request(|engine: &Engine| async move {
-                engine
-                    .api
-                    .get_payload_bodies_by_range(start, count)
-                    .await
+                engine.api.get_payload_bodies_by_range(start, count).await
             })
             .await
             .map_err(Box::new)

diff --git a/testing/ef_tests/check_all_files_accessed.py b/testing/ef_tests/check_all_files_accessed.py
@@ -47,10 +47,7 @@
     # TODO(electra) re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
     "tests/.*/electra/ssz_static/LightClientUpdate",
     "tests/.*/electra/ssz_static/LightClientFinalityUpdate",
-    "tests/.*/electra/ssz_static/LightClientBootstrap",
-    # TODO(electra) re-enable as DepositRequest when EF tests are updated
-    "tests/.*/electra/operations/deposit_receipt",
-    "tests/.*/electra/ssz_static/DepositReceipt"
+    "tests/.*/electra/ssz_static/LightClientBootstrap"
 ]
 
 

diff --git a/testing/ef_tests/tests/tests.rs b/testing/ef_tests/tests/tests.rs
@@ -629,8 +629,8 @@ mod ssz_static {
 
     #[test]
     fn consolidation() {
-        SszStaticHandler::<Consolidation, MinimalEthSpec>::electra_and_later().run();
-        SszStaticHandler::<Consolidation, MainnetEthSpec>::electra_and_later().run();
+        SszStaticHandler::<ConsolidationRequest, MinimalEthSpec>::electra_and_later().run();
+        SszStaticHandler::<ConsolidationRequest, MainnetEthSpec>::electra_and_later().run();
     }
 
     #[test]