feat: NodePrimitivesProvider (#12855)

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

@@ -6,8 +6,9 @@ use node::NodeTestContext;
 use reth::{
     args::{DiscoveryArgs, NetworkArgs, RpcServerArgs},
     blockchain_tree::externals::NodeTypesForTree,
-    builder::{FullNodePrimitives, NodeBuilder, NodeConfig, NodeHandle},
+    builder::{NodeBuilder, NodeConfig, NodeHandle},
     network::PeersHandleProvider,
+    primitives::EthPrimitives,
     rpc::server_types::RpcModuleSelection,
     tasks::TaskManager,
 };
@@ -121,7 +122,7 @@ pub async fn setup_engine<N>(
 where
     N: Default
         + Node<TmpNodeAdapter<N, BlockchainProvider2<NodeTypesWithDBAdapter<N, TmpDB>>>>
-        + NodeTypesWithEngine
+        + NodeTypesWithEngine<Primitives = EthPrimitives>
         + NodeTypesForProvider,
     N::ComponentsBuilder: NodeComponentsBuilder<
         TmpNodeAdapter<N, BlockchainProvider2<NodeTypesWithDBAdapter<N, TmpDB>>>,
@@ -134,8 +135,6 @@ where
     LocalPayloadAttributesBuilder<N::ChainSpec>: PayloadAttributesBuilder<
         <<N as NodeTypesWithEngine>::Engine as PayloadTypes>::PayloadAttributes,
     >,
-    N::Primitives:
-        FullNodePrimitives<Block = reth_primitives::Block, BlockBody = reth_primitives::BlockBody>,
 {
     let tasks = TaskManager::current();
     let exec = tasks.executor();

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

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, pin::Pin};
 
-use alloy_consensus::{BlockHeader, Sealable};
+use alloy_consensus::BlockHeader;
 use alloy_primitives::{BlockHash, BlockNumber, Bytes, B256};
 use alloy_rpc_types_eth::BlockNumberOrTag;
 use eyre::Ok;
@@ -16,8 +16,9 @@ use reth::{
     },
 };
 use reth_chainspec::EthereumHardforks;
-use reth_node_api::{Block, FullBlock, NodePrimitives};
+use reth_node_api::Block;
 use reth_node_builder::{rpc::RethRpcAddOns, NodeTypes, NodeTypesWithEngine};
+use reth_primitives::EthPrimitives;
 use reth_stages_types::StageId;
 use tokio_stream::StreamExt;
 use url::Url;
@@ -56,7 +57,7 @@ where
     Node::Types: NodeTypesWithEngine<
         ChainSpec: EthereumHardforks,
         Engine = Engine,
-        Primitives: NodePrimitives<Block: FullBlock>,
+        Primitives = EthPrimitives,
     >,
     Node::Network: PeersHandleProvider,
     AddOns: RethRpcAddOns<Node>,