jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use more payload conversion fns (#13625)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-03 16:05:22 +01:00
committed by GitHub
parent 3c9139e30f
commit 82013f46da
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/rpc/rpc-engine-api/src/engine_api.rs
View File

@ -1108,6 +1108,7 @@ mod tests {
// tests covering `engine_getPayloadBodiesByRange` and `engine_getPayloadBodiesByHash` // tests covering `engine_getPayloadBodiesByRange` and `engine_getPayloadBodiesByHash`
mod get_payload_bodies { mod get_payload_bodies {
use super::*; use super::*;
use alloy_rpc_types_engine::ExecutionPayloadBodyV1;
use reth_testing_utils::generators::{self, random_block_range, BlockRangeParams}; use reth_testing_utils::generators::{self, random_block_range, BlockRangeParams};
#[tokio::test] #[tokio::test]
@ -1153,7 +1154,7 @@ mod tests {
let expected = blocks let expected = blocks
.iter() .iter()
.cloned() .cloned()
.map(|b| Some(convert_to_payload_body_v1(b.unseal::<Block>()))) .map(|b| Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>())))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let res = api.get_payload_bodies_by_range_v1(start, count).await.unwrap(); 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) { if first_missing_range.contains(&b.number) {
None None
} else { } else {
Some(convert_to_payload_body_v1(b.unseal::<Block>())) Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>()))
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -1214,7 +1215,7 @@ mod tests {
{ {
None None
} else { } else {
Some(convert_to_payload_body_v1(b.unseal::<Block>())) Some(ExecutionPayloadBodyV1::from_block(b.unseal::<Block>()))
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();

8
crates/rpc/rpc-engine-api/tests/it/payload.rs
View File

@ -9,9 +9,7 @@ use alloy_rpc_types_engine::{
}; };
use assert_matches::assert_matches; use assert_matches::assert_matches;
use reth_primitives::{proofs, Block, SealedBlock, SealedHeader, TransactionSigned}; use reth_primitives::{proofs, Block, SealedBlock, SealedHeader, TransactionSigned};
use reth_rpc_types_compat::engine::payload::{ use reth_rpc_types_compat::engine::payload::{block_to_payload, block_to_payload_v1};
block_to_payload, block_to_payload_v1, convert_to_payload_body_v1,
};
use reth_testing_utils::generators::{ use reth_testing_utils::generators::{
self, random_block, random_block_range, BlockParams, BlockRangeParams, Rng, self, random_block, random_block_range, BlockParams, BlockRangeParams, Rng,
}; };
@ -38,8 +36,8 @@ fn payload_body_roundtrip() {
0..=99, 0..=99,
BlockRangeParams { tx_count: 0..2, ..Default::default() }, BlockRangeParams { tx_count: 0..2, ..Default::default() },
) { ) {
let unsealed = block.clone().unseal::<Block>(); let payload_body: ExecutionPayloadBodyV1 =
let payload_body: ExecutionPayloadBodyV1 = convert_to_payload_body_v1(unsealed); ExecutionPayloadBodyV1::from_block(block.clone().unseal::<Block>());
assert_eq!( assert_eq!(
Ok(block.body.transactions), Ok(block.body.transactions),