Cleanups

sigp · Sep 5, 2024 · 5c49ae4 · 5c49ae4
1 parent 32c288e
commit 5c49ae4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 48 deletions.
diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
@@ -144,6 +144,7 @@ pub enum Error {
         payload: ExecutionBlockHash,
         transactions_root: Hash256,
     },
+    PayloadBodiesByRangeNotSupported,
     InvalidJWTSecret(String),
     InvalidForkForPayload,
     InvalidPayloadBody(String),
@@ -1822,7 +1823,9 @@ impl<E: EthSpec> ExecutionLayer<E> {
 
         // Use efficient payload bodies by range method if supported.
         let capabilities = self.get_engine_capabilities(None).await?;
-        if capabilities.get_payload_bodies_by_range_v1 {
+        if capabilities.get_payload_bodies_by_range_v1
+            || capabilities.get_payload_bodies_by_range_v2
+        {
             let mut payload_bodies = self.get_payload_bodies_by_range(block_number, 1).await?;
 
             if payload_bodies.len() != 1 {
@@ -1837,8 +1840,7 @@ impl<E: EthSpec> ExecutionLayer<E> {
                 })
                 .transpose()
         } else {
-            // FIXME(sproul): return an error here?
-            Ok(None)
+            Err(Error::PayloadBodiesByRangeNotSupported)
         }
     }
 

diff --git a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs
@@ -561,30 +561,17 @@ pub async fn handle_rpc<E: EthSpec>(
 
                 match maybe_payload {
                     Some(payload) => {
-                        // FIXME(sproul): remove electra support here?
-                        let json_payload_body = if payload.fork_name().electra_enabled() {
-                            let payload_body = ExecutionPayloadBodyV2 {
-                                transactions: payload.transactions().clone(),
-                                withdrawals: payload.withdrawals().ok().cloned(),
-                                deposit_requests: payload.deposit_requests().ok().cloned(),
-                                withdrawal_requests: payload.withdrawal_requests().ok().cloned(),
-                                consolidation_requests: payload
-                                    .consolidation_requests()
-                                    .ok()
-                                    .cloned(),
-                            };
-                            JsonExecutionPayloadBody::V2(JsonExecutionPayloadBodyV2::<E>::from(
-                                payload_body,
-                            ))
-                        } else {
-                            let payload_body = ExecutionPayloadBodyV1 {
-                                transactions: payload.transactions().clone(),
-                                withdrawals: payload.withdrawals().ok().cloned(),
-                            };
-                            JsonExecutionPayloadBody::V1(JsonExecutionPayloadBodyV1::<E>::from(
-                                payload_body,
-                            ))
+                        assert!(
+                            !payload.fork_name().electra_enabled(),
+                            "payload bodies V1 is not supported for Electra blocks"
+                        );
+                        let payload_body = ExecutionPayloadBodyV1 {
+                            transactions: payload.transactions().clone(),
+                            withdrawals: payload.withdrawals().ok().cloned(),
                         };
+                        let json_payload_body = JsonExecutionPayloadBody::V1(
+                            JsonExecutionPayloadBodyV1::<E>::from(payload_body),
+                        );
                         response.push(Some(json_payload_body));
                     }
                     None => response.push(None),
@@ -618,29 +605,16 @@ pub async fn handle_rpc<E: EthSpec>(
                         // deposit_requests
                         // withdrawal_requests
                         // consolidation_requests
-                        let json_payload_body = if payload.fork_name().electra_enabled() {
-                            let payload_body = ExecutionPayloadBodyV2 {
-                                transactions: payload.transactions().clone(),
-                                withdrawals: payload.withdrawals().ok().cloned(),
-                                deposit_requests: payload.deposit_requests().ok().cloned(),
-                                withdrawal_requests: payload.withdrawal_requests().ok().cloned(),
-                                consolidation_requests: payload
-                                    .consolidation_requests()
-                                    .ok()
-                                    .cloned(),
-                            };
-                            JsonExecutionPayloadBody::V2(JsonExecutionPayloadBodyV2::<E>::from(
-                                payload_body,
-                            ))
-                        } else {
-                            let payload_body = ExecutionPayloadBodyV1 {
-                                transactions: payload.transactions().clone(),
-                                withdrawals: payload.withdrawals().ok().cloned(),
-                            };
-                            JsonExecutionPayloadBody::V1(JsonExecutionPayloadBodyV1::<E>::from(
-                                payload_body,
-                            ))
+                        let payload_body = ExecutionPayloadBodyV2 {
+                            transactions: payload.transactions().clone(),
+                            withdrawals: payload.withdrawals().ok().cloned(),
+                            deposit_requests: payload.deposit_requests().ok().cloned(),
+                            withdrawal_requests: payload.withdrawal_requests().ok().cloned(),
+                            consolidation_requests: payload.consolidation_requests().ok().cloned(),
                         };
+                        let json_payload_body = JsonExecutionPayloadBody::V2(
+                            JsonExecutionPayloadBodyV2::<E>::from(payload_body),
+                        );
                         response.push(Some(json_payload_body));
                     }
                     None => response.push(None),