chore: rm reth-interfaces from engine api (#8468)

Cargo.lock

@@ -7875,7 +7875,7 @@ dependencies = [
  "reth-beacon-consensus",
  "reth-engine-primitives",
  "reth-ethereum-engine-primitives",
- "reth-interfaces",
+ "reth-evm",
  "reth-metrics",
  "reth-payload-builder",
  "reth-primitives",
@@ -7883,7 +7883,9 @@ dependencies = [
  "reth-rpc-api",
  "reth-rpc-types",
  "reth-rpc-types-compat",
+ "reth-storage-api",
  "reth-tasks",
+ "reth-testing-utils",
  "reth-tokio-util",
  "serde",
  "thiserror",

crates/rpc/rpc-engine-api/Cargo.toml

@@ -14,14 +14,15 @@ workspace = true
 [dependencies]
 # reth
 reth-primitives.workspace = true
-reth-provider.workspace = true
-reth-rpc-types.workspace = true
 reth-rpc-api.workspace = true
+reth-rpc-types.workspace = true
+reth-storage-api.workspace = true
 reth-beacon-consensus.workspace = true
 reth-payload-builder.workspace = true
 reth-tasks.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-engine-primitives.workspace = true
+reth-evm.workspace = true
 
 # async
 tokio = { workspace = true, features = ["sync"] }
@@ -40,10 +41,10 @@ serde.workspace = true
 
 [dev-dependencies]
 reth-ethereum-engine-primitives.workspace = true
-reth-interfaces = { workspace = true, features = ["test-utils"] }
 reth-provider = { workspace = true, features = ["test-utils"] }
 reth-payload-builder = { workspace = true, features = ["test-utils"] }
 reth-tokio-util.workspace = true
+reth-testing-utils.workspace = true
 
 alloy-rlp.workspace = true
 

crates/rpc/rpc-engine-api/src/engine_api.rs

@@ -6,9 +6,9 @@ use reth_engine_primitives::{
     validate_payload_timestamp, EngineApiMessageVersion, EngineTypes, PayloadAttributes,
     PayloadBuilderAttributes, PayloadOrAttributes,
 };
+use reth_evm::provider::EvmEnvProvider;
 use reth_payload_builder::PayloadStore;
 use reth_primitives::{BlockHash, BlockHashOrNumber, BlockNumber, ChainSpec, Hardfork, B256, U64};
-use reth_provider::{BlockReader, EvmEnvProvider, HeaderProvider, StateProviderFactory};
 use reth_rpc_api::EngineApiServer;
 use reth_rpc_types::engine::{
     CancunPayloadFields, ClientVersionV1, ExecutionPayload, ExecutionPayloadBodiesV1,
@@ -19,6 +19,7 @@ use reth_rpc_types::engine::{
 use reth_rpc_types_compat::engine::payload::{
     convert_payload_input_v2_to_payload, convert_to_payload_body_v1,
 };
+use reth_storage_api::{BlockReader, HeaderProvider, StateProviderFactory};
 use reth_tasks::TaskSpawner;
 use std::{sync::Arc, time::Instant};
 use tokio::sync::oneshot;
@@ -831,7 +832,7 @@ mod tests {
     use assert_matches::assert_matches;
     use reth_beacon_consensus::{BeaconConsensusEngineEvent, BeaconEngineMessage};
     use reth_ethereum_engine_primitives::EthEngineTypes;
-    use reth_interfaces::test_utils::generators::random_block;
+    use reth_testing_utils::generators::random_block;
 
     use reth_payload_builder::test_utils::spawn_test_payload_service;
     use reth_primitives::{SealedBlock, B256, MAINNET};
@@ -903,7 +904,7 @@ mod tests {
     // tests covering `engine_getPayloadBodiesByRange` and `engine_getPayloadBodiesByHash`
     mod get_payload_bodies {
         use super::*;
-        use reth_interfaces::test_utils::{generators, generators::random_block_range};
+        use reth_testing_utils::{generators, generators::random_block_range};
 
         #[tokio::test]
         async fn invalid_params() {
@@ -1017,8 +1018,8 @@ mod tests {
     // https://github.com/ethereum/execution-apis/blob/main/src/engine/paris.md#specification-3
     mod exchange_transition_configuration {
         use super::*;
-        use reth_interfaces::test_utils::generators;
         use reth_primitives::U256;
+        use reth_testing_utils::generators;
 
         #[tokio::test]
         async fn terminal_td_mismatch() {

crates/rpc/rpc-engine-api/tests/it/payload.rs

@@ -2,9 +2,6 @@
 
 use alloy_rlp::{Decodable, Error as RlpError};
 use assert_matches::assert_matches;
-use reth_interfaces::test_utils::generators::{
-    self, random_block, random_block_range, random_header, Rng,
-};
 use reth_primitives::{
     bytes::{Bytes, BytesMut},
     proofs, Block, SealedBlock, TransactionSigned, Withdrawals, B256, U256,
@@ -16,6 +13,7 @@ use reth_rpc_types_compat::engine::payload::{
     block_to_payload, block_to_payload_v1, convert_to_payload_body_v1, try_into_sealed_block,
     try_payload_v1_to_block,
 };
+use reth_testing_utils::generators::{self, random_block, random_block_range, random_header, Rng};
 
 fn transform_block<F: FnOnce(Block) -> Block>(src: SealedBlock, f: F) -> ExecutionPayload {
     let unsealed = src.unseal();