remove unused pool

Author: tac0turtle

bin/ev-reth/src/main.rs

@@ -50,11 +50,11 @@ fn main() {
         }
     }
 
-    if let Err(err) = Cli::<EthereumChainSpecParser, EvolveArgs>::parse().run(
-        async move |builder, evolve_args| {
-            log_startup(&evolve_args);
+    if let Err(err) = Cli::<EthereumChainSpecParser, EvolveArgs>::parse()
+        .run(|builder, _evolve_args| async move {
+            log_startup();
             let handle = builder
-                .node(EvolveNode::new(evolve_args))
+                .node(EvolveNode::new())
                 .extend_rpc_modules(move |ctx| {
                     // Build custom txpool RPC with config + optional CLI/env override
                     let evolve_cfg = EvolveConfig::default();
@@ -70,8 +70,8 @@ fn main() {
 
             info!("=== EV-RETH: Node launched successfully with ev-reth payload builder ===");
             handle.node_exit_future.await
-        },
-    ) {
+        })
+    {
         eprintln!("Error: {err:?}");
         std::process::exit(1);
     }

crates/node/src/args.rs

@@ -1,5 +1,5 @@
-use clap::Parser;
+use clap::Args;
 
 /// Evolve CLI arguments (currently empty; reserved for future toggles).
-#[derive(Debug, Clone, Parser, PartialEq, Eq, Default)]
+#[derive(Debug, Clone, Default, Args)]
 pub struct EvolveArgs {}

crates/node/src/lib.rs

@@ -31,6 +31,6 @@ pub use builder::{create_payload_builder_service, EvolvePayloadBuilder};
 pub use config::{ConfigError, EvolvePayloadBuilderConfig};
 pub use error::EvolveEngineError;
 pub use executor::{build_evm_config, EvolveEvmConfig, EvolveExecutorBuilder};
-pub use node::{log_startup, parse_args, EvolveEngineTypes, EvolveNode, EvolveNodeAddOns};
+pub use node::{log_startup, EvolveEngineTypes, EvolveNode, EvolveNodeAddOns};
 pub use payload_service::{EvolveEnginePayloadBuilder, EvolvePayloadBuilderBuilder};
 pub use validator::{EvolveEngineValidator, EvolveEngineValidatorBuilder};

crates/node/src/node.rs

@@ -4,7 +4,6 @@ use alloy_rpc_types::engine::{
     ExecutionData, ExecutionPayloadEnvelopeV2, ExecutionPayloadEnvelopeV3,
     ExecutionPayloadEnvelopeV4, ExecutionPayloadEnvelopeV5, ExecutionPayloadV1,
 };
-use clap::Parser;
 use reth_ethereum::{
     chainspec::ChainSpec,
     node::{
@@ -24,7 +23,6 @@ use serde::{Deserialize, Serialize};
 use tracing::info;
 
 use crate::{
-    args::EvolveArgs,
     attributes::{EvolveEnginePayloadAttributes, EvolveEnginePayloadBuilderAttributes},
     executor::EvolveExecutorBuilder,
     payload_service::EvolvePayloadBuilderBuilder,
@@ -67,15 +65,12 @@ impl EngineTypes for EvolveEngineTypes {
 /// Evolve node type.
 #[derive(Debug, Clone, Default)]
 #[non_exhaustive]
-pub struct EvolveNode {
-    /// Evolve-specific arguments.
-    pub args: EvolveArgs,
-}
+pub struct EvolveNode {}
 
 impl EvolveNode {
     /// Create a new evolve node with the given arguments.
-    pub const fn new(args: EvolveArgs) -> Self {
-        Self { args }
+    pub const fn new() -> Self {
+        Self {}
     }
 }
 
@@ -109,7 +104,7 @@ where
             .pool(EthereumPoolBuilder::default())
             .executor(EvolveExecutorBuilder::default())
             .payload(BasicPayloadServiceBuilder::new(
-                EvolvePayloadBuilderBuilder::new(&self.args),
+                EvolvePayloadBuilderBuilder::new(),
             ))
             .network(EthereumNetworkBuilder::default())
             .consensus(evolve_ev_reth::consensus::EvolveConsensusBuilder::default())
@@ -121,13 +116,7 @@ where
 }
 
 /// Helper logging to announce node startup with args.
-pub fn log_startup(args: &EvolveArgs) {
-    info!("=== EV-RETH: Starting with args: {:?} ===", args);
+pub fn log_startup() {
     info!("=== EV-RETH: Evolve node mode enabled ===");
     info!("=== EV-RETH: Using custom payload builder with transaction support ===");
 }
-
-/// Ensure Clap derives are linked when this crate is used without the binary.
-pub fn parse_args() -> EvolveArgs {
-    EvolveArgs::parse()
-}

crates/node/src/payload_service.rs

@@ -24,9 +24,8 @@ use tokio::runtime::Handle;
 use tracing::info;
 
 use crate::{
-    args::EvolveArgs, attributes::EvolveEnginePayloadBuilderAttributes,
-    builder::EvolvePayloadBuilder, config::EvolvePayloadBuilderConfig, executor::EvolveEvmConfig,
-    node::EvolveEngineTypes,
+    attributes::EvolveEnginePayloadBuilderAttributes, builder::EvolvePayloadBuilder,
+    config::EvolvePayloadBuilderConfig, executor::EvolveEvmConfig, node::EvolveEngineTypes,
 };
 
 use evolve_ev_reth::config::set_current_block_gas_limit;
@@ -40,7 +39,7 @@ pub struct EvolvePayloadBuilderBuilder {
 
 impl EvolvePayloadBuilderBuilder {
     /// Create a new builder with evolve args.
-    pub fn new(_args: &EvolveArgs) -> Self {
+    pub fn new() -> Self {
         let config = EvolvePayloadBuilderConfig::new();
         info!("Created Evolve payload builder with config: {:?}", config);
         Self { config }
@@ -49,21 +48,17 @@ impl EvolvePayloadBuilderBuilder {
 
 impl Default for EvolvePayloadBuilderBuilder {
     fn default() -> Self {
-        Self::new(&EvolveArgs::default())
+        Self::new()
     }
 }
 
 /// The evolve engine payload builder that integrates with the evolve payload builder.
 #[derive(Debug, Clone)]
-pub struct EvolveEnginePayloadBuilder<Pool, Client>
+pub struct EvolveEnginePayloadBuilder<Client>
 where
-    Pool: Clone,
     Client: Clone,
 {
     pub(crate) evolve_builder: Arc<EvolvePayloadBuilder<Client>>,
-    #[allow(dead_code)]
-    pub(crate) pool: Pool,
-    #[allow(dead_code)]
     pub(crate) config: EvolvePayloadBuilderConfig,
 }
 
@@ -80,7 +75,7 @@ where
         + Unpin
         + 'static,
 {
-    type PayloadBuilder = EvolveEnginePayloadBuilder<Pool, Node::Provider>;
+    type PayloadBuilder = EvolveEnginePayloadBuilder<Node::Provider>;
 
     async fn build_payload_builder(
         self,
@@ -98,6 +93,8 @@ where
 
         config.validate()?;
 
+        let _ = pool;
+
         let evolve_builder = Arc::new(EvolvePayloadBuilder::new(
             Arc::new(ctx.provider().clone()),
             evm_config,
@@ -106,13 +103,12 @@ where
 
         Ok(EvolveEnginePayloadBuilder {
             evolve_builder,
-            pool,
             config,
         })
     }
 }
 
-impl<Pool, Client> PayloadBuilder for EvolveEnginePayloadBuilder<Pool, Client>
+impl<Client> PayloadBuilder for EvolveEnginePayloadBuilder<Client>
 where
     Client: reth_ethereum::provider::StateProviderFactory
         + ChainSpecProvider<ChainSpec = ChainSpec>
@@ -121,7 +117,6 @@ where
         + Send
         + Sync
         + 'static,
-    Pool: TransactionPool<Transaction: PoolTransaction<Consensus = TransactionSigned>>,
 {
     type Attributes = EvolveEnginePayloadBuilderAttributes;
     type BuiltPayload = EthBuiltPayload;