diff --git a/Cargo.lock b/Cargo.lock index f2693321e..9dcdc61ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9013,18 +9013,17 @@ dependencies = [ "reth-chainspec", "reth-engine-primitives", "reth-ethereum-engine-primitives", + "reth-ethereum-primitives", "reth-metrics", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-primitives-traits", "reth-provider", "reth-rpc-api", "reth-storage-api", "reth-tasks", "reth-testing-utils", - "reth-tokio-util", "reth-transaction-pool", "serde", "thiserror 2.0.11", diff --git a/crates/rpc/rpc-engine-api/Cargo.toml b/crates/rpc/rpc-engine-api/Cargo.toml index 461da2049..d21f8dc5c 100644 --- a/crates/rpc/rpc-engine-api/Cargo.toml +++ b/crates/rpc/rpc-engine-api/Cargo.toml @@ -48,10 +48,9 @@ parking_lot.workspace = true [dev-dependencies] reth-ethereum-engine-primitives.workspace = true reth-provider = { workspace = true, features = ["test-utils"] } -reth-primitives.workspace = true +reth-ethereum-primitives.workspace = true reth-primitives-traits.workspace = true reth-payload-builder = { workspace = true, features = ["test-utils"] } -reth-tokio-util.workspace = true reth-testing-utils.workspace = true alloy-rlp.workspace = true diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs index e9945fc04..e990479a0 100644 --- a/crates/rpc/rpc-engine-api/src/engine_api.rs +++ b/crates/rpc/rpc-engine-api/src/engine_api.rs @@ -1049,8 +1049,8 @@ mod tests { use reth_chainspec::{ChainSpec, EthereumHardfork, MAINNET}; use reth_engine_primitives::BeaconEngineMessage; use reth_ethereum_engine_primitives::{EthEngineTypes, EthereumEngineValidator}; + use reth_ethereum_primitives::Block; use reth_payload_builder::test_utils::spawn_test_payload_service; - use reth_primitives::{Block, TransactionSigned}; use reth_provider::test_utils::MockEthProvider; use reth_tasks::TokioTaskExecutor; use reth_testing_utils::generators::random_block; @@ -1118,11 +1118,9 @@ mod tests { let (mut handle, api) = setup_engine_api(); tokio::spawn(async move { - api.new_payload_v1(ExecutionPayloadV1::from_block_slow( - &Block::::default(), - )) - .await - .unwrap(); + api.new_payload_v1(ExecutionPayloadV1::from_block_slow(&Block::default())) + .await + .unwrap(); }); assert_matches!(handle.from_api.recv().await, Some(BeaconEngineMessage::NewPayload { .. })); } diff --git a/crates/rpc/rpc-engine-api/tests/it/payload.rs b/crates/rpc/rpc-engine-api/tests/it/payload.rs index 2158320b5..c7eae89ff 100644 --- a/crates/rpc/rpc-engine-api/tests/it/payload.rs +++ b/crates/rpc/rpc-engine-api/tests/it/payload.rs @@ -8,13 +8,13 @@ use alloy_rpc_types_engine::{ PayloadError, }; use assert_matches::assert_matches; -use reth_primitives::{Block, SealedBlock, TransactionSigned}; -use reth_primitives_traits::proofs; +use reth_ethereum_primitives::{Block, TransactionSigned}; +use reth_primitives_traits::{proofs, SealedBlock}; use reth_testing_utils::generators::{ self, random_block, random_block_range, BlockParams, BlockRangeParams, Rng, }; -fn transform_block Block>(src: SealedBlock, f: F) -> ExecutionPayload { +fn transform_block Block>(src: SealedBlock, f: F) -> ExecutionPayload { let unsealed = src.into_block(); let mut transformed: Block = f(unsealed); // Recalculate roots