chore: make op-node-testing- leaner

crates/e2e-test-utils/Cargo.toml

@@ -11,22 +11,28 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-reth.workspace = true
 reth-chainspec.workspace = true
 reth-tracing.workspace = true
 reth-db = { workspace = true, features = ["test-utils"] }
 reth-rpc-layer.workspace = true
+reth-rpc-server-types.workspace = true
+reth-rpc-eth-api.workspace = true
+reth-rpc-api = { workspace = true, features = ["client"] }
 reth-payload-builder = { workspace = true, features = ["test-utils"] }
 reth-payload-builder-primitives.workspace = true
 reth-payload-primitives.workspace = true
 reth-primitives.workspace = true
 reth-provider.workspace = true
+reth-network-api.workspace = true
+reth-network.workspace = true
 reth-node-api.workspace = true
+reth-node-core.workspace = true
 reth-node-builder = { workspace = true, features = ["test-utils"] }
 reth-tokio-util.workspace = true
 reth-stages-types.workspace = true
 reth-network-peers.workspace = true
 reth-engine-local.workspace = true
+reth-tasks.workspace = true
 
 # currently need to enable this for workspace level
 reth-optimism-primitives  = { workspace = true, features = ["arbitrary"] }

crates/e2e-test-utils/src/engine_api.rs

@@ -1,20 +1,17 @@
 use crate::traits::PayloadEnvelopeExt;
 use alloy_primitives::B256;
+use alloy_rpc_types_engine::{ForkchoiceState, PayloadStatusEnum};
 use jsonrpsee::{
     core::client::ClientT,
     http_client::{transport::HttpBackend, HttpClient},
 };
-use reth::{
-    api::{EngineTypes, PayloadBuilderAttributes},
-    providers::CanonStateNotificationStream,
-    rpc::{
-        api::EngineApiClient,
-        types::engine::{ForkchoiceState, PayloadStatusEnum},
-    },
-};
 use reth_chainspec::EthereumHardforks;
+use reth_node_api::EngineTypes;
 use reth_node_builder::BuiltPayload;
 use reth_payload_builder::PayloadId;
+use reth_payload_primitives::PayloadBuilderAttributes;
+use reth_provider::CanonStateNotificationStream;
+use reth_rpc_api::EngineApiClient;
 use reth_rpc_layer::AuthClientService;
 use std::{marker::PhantomData, sync::Arc};
 
@@ -83,7 +80,7 @@ impl<E: EngineTypes, ChainSpec: EthereumHardforks> EngineApiTestContext<E, Chain
             .await?
         };
 
-        assert_eq!(submission.status, expected_status);
+        assert_eq!(submission.status.as_str(), expected_status.as_str());
 
         Ok(submission.latest_valid_hash.unwrap_or_default())
     }

crates/e2e-test-utils/src/lib.rs

@@ -1,27 +1,25 @@
 //! Utilities for end-to-end tests.
 
-use std::sync::Arc;
-
 use node::NodeTestContext;
-use reth::{
-    args::{DiscoveryArgs, NetworkArgs, RpcServerArgs},
-    blockchain_tree::externals::NodeTypesForTree,
-    builder::{NodeBuilder, NodeConfig, NodeHandle},
-    network::PeersHandleProvider,
-    primitives::EthPrimitives,
-    rpc::server_types::RpcModuleSelection,
-    tasks::TaskManager,
-};
 use reth_chainspec::EthChainSpec;
 use reth_db::{test_utils::TempDatabase, DatabaseEnv};
 use reth_engine_local::LocalPayloadAttributesBuilder;
+use reth_network_api::test_utils::PeersHandleProvider;
 use reth_node_builder::{
     components::NodeComponentsBuilder,
     rpc::{EngineValidatorAddOn, RethRpcAddOns},
-    EngineNodeLauncher, FullNodeTypesAdapter, Node, NodeAdapter, NodeComponents,
-    NodeTypesWithDBAdapter, NodeTypesWithEngine, PayloadAttributesBuilder, PayloadTypes,
+    EngineNodeLauncher, FullNodeTypesAdapter, Node, NodeAdapter, NodeBuilder, NodeComponents,
+    NodeConfig, NodeHandle, NodeTypesWithDBAdapter, NodeTypesWithEngine, PayloadAttributesBuilder,
+    PayloadTypes,
 };
-use reth_provider::providers::{BlockchainProvider, BlockchainProvider2, NodeTypesForProvider};
+use reth_node_core::args::{DiscoveryArgs, NetworkArgs, RpcServerArgs};
+use reth_primitives::EthPrimitives;
+use reth_provider::providers::{
+    BlockchainProvider, BlockchainProvider2, NodeTypesForProvider, NodeTypesForTree,
+};
+use reth_rpc_server_types::RpcModuleSelection;
+use reth_tasks::TaskManager;
+use std::sync::Arc;
 use tracing::{span, Level};
 use wallet::Wallet;
 

crates/e2e-test-utils/src/network.rs

@@ -1,5 +1,7 @@
 use futures_util::StreamExt;
-use reth::network::{NetworkEvent, NetworkEventListenerProvider, PeersHandleProvider, PeersInfo};
+use reth_network_api::{
+    test_utils::PeersHandleProvider, NetworkEvent, NetworkEventListenerProvider, PeersInfo,
+};
 use reth_network_peers::{NodeRecord, PeerId};
 use reth_tokio_util::EventStream;
 use reth_tracing::tracing::info;

crates/e2e-test-utils/src/node.rs

@@ -1,33 +1,28 @@
-use std::{marker::PhantomData, pin::Pin};
-
+use crate::{
+    engine_api::EngineApiTestContext, network::NetworkTestContext, payload::PayloadTestContext,
+    rpc::RpcTestContext, traits::PayloadEnvelopeExt,
+};
 use alloy_consensus::BlockHeader;
 use alloy_primitives::{BlockHash, BlockNumber, Bytes, B256};
+use alloy_rpc_types_engine::PayloadStatusEnum;
 use alloy_rpc_types_eth::BlockNumberOrTag;
 use eyre::Ok;
 use futures_util::Future;
-use reth::{
-    api::{BuiltPayload, EngineTypes, FullNodeComponents, PayloadBuilderAttributes},
-    builder::FullNode,
-    network::PeersHandleProvider,
-    providers::{BlockReader, BlockReaderIdExt, CanonStateSubscriptions, StageCheckpointReader},
-    rpc::{
-        api::eth::helpers::{EthApiSpec, EthTransactions, TraceExt},
-        types::engine::PayloadStatusEnum,
-    },
-};
 use reth_chainspec::EthereumHardforks;
-use reth_node_api::Block;
-use reth_node_builder::{rpc::RethRpcAddOns, NodeTypes, NodeTypesWithEngine};
+use reth_network_api::test_utils::PeersHandleProvider;
+use reth_node_api::{Block, EngineTypes, FullNodeComponents};
+use reth_node_builder::{rpc::RethRpcAddOns, FullNode, NodeTypes, NodeTypesWithEngine};
+use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes};
 use reth_primitives::EthPrimitives;
+use reth_provider::{
+    BlockReader, BlockReaderIdExt, CanonStateSubscriptions, StageCheckpointReader,
+};
+use reth_rpc_eth_api::helpers::{EthApiSpec, EthTransactions, TraceExt};
 use reth_stages_types::StageId;
+use std::{marker::PhantomData, pin::Pin};
 use tokio_stream::StreamExt;
 use url::Url;
 
-use crate::{
-    engine_api::EngineApiTestContext, network::NetworkTestContext, payload::PayloadTestContext,
-    rpc::RpcTestContext, traits::PayloadEnvelopeExt,
-};
-
 /// An helper struct to handle node actions
 #[allow(missing_debug_implementations)]
 pub struct NodeTestContext<Node, AddOns>

crates/e2e-test-utils/src/payload.rs

@@ -1,8 +1,7 @@
 use futures_util::StreamExt;
-use reth::api::BuiltPayload;
 use reth_payload_builder::{PayloadBuilderHandle, PayloadId};
 use reth_payload_builder_primitives::{Events, PayloadBuilder};
-use reth_payload_primitives::{PayloadBuilderAttributes, PayloadTypes};
+use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadTypes};
 use tokio_stream::wrappers::BroadcastStream;
 
 /// Helper for payload operations

crates/e2e-test-utils/src/rpc.rs

@@ -2,19 +2,14 @@ use alloy_consensus::TxEnvelope;
 use alloy_network::eip2718::Decodable2718;
 use alloy_primitives::{Bytes, B256};
 use alloy_rlp::Encodable;
-use reth::{
-    builder::{rpc::RpcRegistry, FullNodeComponents},
-    rpc::api::{
-        eth::{
-            helpers::{EthApiSpec, EthTransactions, TraceExt},
-            EthApiTypes,
-        },
-        DebugApiServer,
-    },
-};
 use reth_chainspec::EthereumHardforks;
-use reth_node_api::NodePrimitives;
-use reth_node_builder::NodeTypes;
+use reth_node_api::{FullNodeComponents, NodePrimitives};
+use reth_node_builder::{rpc::RpcRegistry, NodeTypes};
+use reth_rpc_api::DebugApiServer;
+use reth_rpc_eth_api::{
+    helpers::{EthApiSpec, EthTransactions, TraceExt},
+    EthApiTypes,
+};
 
 #[allow(missing_debug_implementations)]
 pub struct RpcTestContext<Node: FullNodeComponents, EthApi: EthApiTypes> {

crates/e2e-test-utils/src/traits.rs

@@ -1,6 +1,7 @@
-use alloy_rpc_types_engine::ExecutionPayloadEnvelopeV4;
+use alloy_rpc_types_engine::{
+    ExecutionPayloadEnvelopeV3, ExecutionPayloadEnvelopeV4, ExecutionPayloadV3,
+};
 use op_alloy_rpc_types_engine::{OpExecutionPayloadEnvelopeV3, OpExecutionPayloadEnvelopeV4};
-use reth::rpc::types::engine::{ExecutionPayloadEnvelopeV3, ExecutionPayloadV3};
 
 /// The execution payload envelope type.
 pub trait PayloadEnvelopeExt: Send + Sync + std::fmt::Debug {

crates/optimism/node/Cargo.toml

@@ -32,6 +32,7 @@ reth-revm = { workspace = true, features = ["std"] }
 reth-beacon-consensus.workspace = true
 reth-trie-db.workspace = true
 reth-rpc-server-types.workspace = true
+reth-tasks = { workspace = true, optional = true }
 
 # op-reth
 reth-optimism-payload-builder.workspace = true
@@ -62,17 +63,19 @@ parking_lot.workspace = true
 serde_json.workspace = true
 
 # test-utils dependencies
-reth = { workspace = true, optional = true }
 reth-e2e-test-utils = { workspace = true, optional = true }
 alloy-genesis = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 
 [dev-dependencies]
 reth-optimism-node = { workspace = true, features = ["test-utils"] }
 reth-db.workspace = true
+reth-node-core.workspace = true
 reth-node-builder = { workspace = true, features = ["test-utils"] }
 reth-provider = { workspace = true, features = ["test-utils"] }
 reth-revm = { workspace = true, features = ["test-utils"] }
+reth-tasks.workspace = true
+
 alloy-primitives.workspace = true
 op-alloy-consensus.workspace = true
 alloy-signer-local.workspace = true
@@ -82,27 +85,28 @@ futures.workspace = true
 
 [features]
 optimism = [
-    "reth-primitives/optimism",
-    "reth-provider/optimism",
-    "reth-optimism-evm/optimism",
-    "reth-optimism-payload-builder/optimism",
-    "reth-beacon-consensus/optimism",
-    "revm/optimism",
-    "reth-optimism-rpc/optimism",
-    "reth-engine-local/optimism",
-    "reth-optimism-consensus/optimism",
-    "reth-db/optimism",
-    "reth-optimism-node/optimism",
+	"reth-primitives/optimism",
+	"reth-provider/optimism",
+	"reth-optimism-evm/optimism",
+	"reth-optimism-payload-builder/optimism",
+	"reth-beacon-consensus/optimism",
+	"revm/optimism",
+	"reth-optimism-rpc/optimism",
+	"reth-engine-local/optimism",
+	"reth-optimism-consensus/optimism",
+	"reth-db/optimism",
+	"reth-optimism-node/optimism",
+	"reth-node-core/optimism"
 ]
 asm-keccak = [
-    "reth-primitives/asm-keccak",
-    "reth/asm-keccak",
-    "alloy-primitives/asm-keccak",
-    "revm/asm-keccak",
-    "reth-optimism-node/asm-keccak",
+	"reth-primitives/asm-keccak",
+	"alloy-primitives/asm-keccak",
+	"revm/asm-keccak",
+	"reth-optimism-node/asm-keccak",
+	"reth-node-core/asm-keccak"
 ]
 test-utils = [
-    "reth",
+    "reth-tasks",
     "reth-e2e-test-utils",
     "alloy-genesis",
     "tokio",
@@ -125,4 +129,4 @@ test-utils = [
 reth-codec = [
     "reth-primitives/reth-codec",
     "reth-optimism-primitives/reth-codec",
-]
+]

crates/optimism/node/src/utils.rs

@@ -1,12 +1,13 @@
 use crate::{node::OpAddOns, OpBuiltPayload, OpNode as OtherOpNode, OpPayloadBuilderAttributes};
 use alloy_genesis::Genesis;
 use alloy_primitives::{Address, B256};
-use reth::{rpc::types::engine::PayloadAttributes, tasks::TaskManager};
+use alloy_rpc_types_engine::PayloadAttributes;
 use reth_e2e_test_utils::{
     transaction::TransactionTestContext, wallet::Wallet, Adapter, NodeHelperType,
 };
 use reth_optimism_chainspec::OpChainSpecBuilder;
 use reth_payload_builder::EthPayloadBuilderAttributes;
+use reth_tasks::TaskManager;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 

crates/optimism/node/tests/e2e/p2p.rs

@@ -1,6 +1,5 @@
 use alloy_rpc_types_engine::PayloadStatusEnum;
 use futures::StreamExt;
-use reth::blockchain_tree::error::BlockchainTreeError;
 use reth_optimism_node::utils::{advance_chain, setup};
 use std::sync::Arc;
 use tokio::sync::Mutex;
@@ -90,10 +89,10 @@ async fn can_sync() -> eyre::Result<()> {
             canonical_payload_chain[tip_index - reorg_depth + 1].0.clone(),
             canonical_payload_chain[tip_index - reorg_depth + 1].1.clone(),
             PayloadStatusEnum::Invalid {
-                validation_error: BlockchainTreeError::PendingBlockIsFinalized {
-                    last_finalized: (tip - reorg_depth) as u64 + 1,
-                }
-                .to_string(),
+                validation_error: format!(
+                    "block number is lower than the last finalized block number {}",
+                    (tip - reorg_depth) as u64 + 1
+                ),
             },
         )
         .await;