From 82013f46da63c2f2af4b4ce5bede7285864ab39a Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 3 Jan 2025 16:05:22 +0100
Subject: [PATCH] chore: use more payload conversion fns (#13625)

---
 crates/rpc/rpc-engine-api/src/engine_api.rs   | 7 ++++---
 crates/rpc/rpc-engine-api/tests/it/payload.rs | 8 +++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs
index 843fb07ea..f26f90f87 100644
--- a/crates/rpc/rpc-engine-api/src/engine_api.rs
+++ b/crates/rpc/rpc-engine-api/src/engine_api.rs
@@ -1108,6 +1108,7 @@ mod tests {
     // tests covering `engine_getPayloadBodiesByRange` and `engine_getPayloadBodiesByHash`
     mod get_payload_bodies {
         use super::*;
+        use alloy_rpc_types_engine::ExecutionPayloadBodyV1;
         use reth_testing_utils::generators::{self, random_block_range, BlockRangeParams};
 
         #[tokio::test]
@@ -1153,7 +1154,7 @@ mod tests {
             let expected = blocks
                 .iter()
                 .cloned()
-                .map(|b| Some(convert_to_payload_body_v1(b.unseal::<Block>())))
+                .map(|b| Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>())))
                 .collect::<Vec<_>>();
 
             let res = api.get_payload_bodies_by_range_v1(start, count).await.unwrap();
@@ -1195,7 +1196,7 @@ mod tests {
                     if first_missing_range.contains(&b.number) {
                         None
                     } else {
-                        Some(convert_to_payload_body_v1(b.unseal::<Block>()))
+                        Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>()))
                     }
                 })
                 .collect::<Vec<_>>();
@@ -1214,7 +1215,7 @@ mod tests {
                     {
                         None
                     } else {
-                        Some(convert_to_payload_body_v1(b.unseal::<Block>()))
+                        Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>()))
                     }
                 })
                 .collect::<Vec<_>>();
diff --git a/crates/rpc/rpc-engine-api/tests/it/payload.rs b/crates/rpc/rpc-engine-api/tests/it/payload.rs
index fbc528417..0314365d4 100644
--- a/crates/rpc/rpc-engine-api/tests/it/payload.rs
+++ b/crates/rpc/rpc-engine-api/tests/it/payload.rs
@@ -9,9 +9,7 @@ use alloy_rpc_types_engine::{
 };
 use assert_matches::assert_matches;
 use reth_primitives::{proofs, Block, SealedBlock, SealedHeader, TransactionSigned};
-use reth_rpc_types_compat::engine::payload::{
-    block_to_payload, block_to_payload_v1, convert_to_payload_body_v1,
-};
+use reth_rpc_types_compat::engine::payload::{block_to_payload, block_to_payload_v1};
 use reth_testing_utils::generators::{
     self, random_block, random_block_range, BlockParams, BlockRangeParams, Rng,
 };
@@ -38,8 +36,8 @@ fn payload_body_roundtrip() {
         0..=99,
         BlockRangeParams { tx_count: 0..2, ..Default::default() },
     ) {
-        let unsealed = block.clone().unseal::<Block>();
-        let payload_body: ExecutionPayloadBodyV1 = convert_to_payload_body_v1(unsealed);
+        let payload_body: ExecutionPayloadBodyV1 =
+            ExecutionPayloadBodyV1::from_block(block.clone().unseal::<Block>());
 
         assert_eq!(
             Ok(block.body.transactions),