diff --git a/crates/optimism/bin/src/main.rs b/crates/optimism/bin/src/main.rs index 840da3bcf..6494298ba 100644 --- a/crates/optimism/bin/src/main.rs +++ b/crates/optimism/bin/src/main.rs @@ -5,7 +5,7 @@ use clap::Parser; use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher}; use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli}; -use reth_optimism_node::{args::RollupArgs, node::OptimismAddOns, OpNode}; +use reth_optimism_node::{args::RollupArgs, node::OpAddOns, OpNode}; use reth_provider::providers::BlockchainProvider2; use tracing as _; @@ -36,7 +36,7 @@ fn main() { let handle = builder .with_types_and_provider::>() .with_components(OpNode::components(rollup_args)) - .with_add_ons(OptimismAddOns::new(sequencer_http_arg)) + .with_add_ons(OpAddOns::new(sequencer_http_arg)) .launch_with_fn(|builder| { let launcher = EngineNodeLauncher::new( builder.task_executor().clone(), diff --git a/crates/optimism/node/src/node.rs b/crates/optimism/node/src/node.rs index 2e1f71a51..0eb024fe2 100644 --- a/crates/optimism/node/src/node.rs +++ b/crates/optimism/node/src/node.rs @@ -105,9 +105,8 @@ where OpConsensusBuilder, >; - type AddOns = OptimismAddOns< - NodeAdapter>::Components>, - >; + type AddOns = + OpAddOns>::Components>>; fn components_builder(&self) -> Self::ComponentsBuilder { let Self { args } = self; @@ -115,7 +114,7 @@ where } fn add_ons(&self) -> Self::AddOns { - OptimismAddOns::new(self.args.sequencer_http.clone()) + OpAddOns::new(self.args.sequencer_http.clone()) } } @@ -131,24 +130,24 @@ impl NodeTypesWithEngine for OpNode { /// Add-ons w.r.t. optimism. #[derive(Debug)] -pub struct OptimismAddOns( +pub struct OpAddOns( pub RpcAddOns, OptimismEngineValidatorBuilder>, ); -impl Default for OptimismAddOns { +impl Default for OpAddOns { fn default() -> Self { Self::new(None) } } -impl OptimismAddOns { +impl OpAddOns { /// Create a new instance with the given `sequencer_http` URL. pub fn new(sequencer_http: Option) -> Self { Self(RpcAddOns::new(move |ctx| OpEthApi::new(ctx, sequencer_http), Default::default())) } } -impl NodeAddOns for OptimismAddOns +impl NodeAddOns for OpAddOns where N: FullNodeComponents>, OpEngineValidator: EngineValidator<::Engine>, @@ -163,7 +162,7 @@ where } } -impl RethRpcAddOns for OptimismAddOns +impl RethRpcAddOns for OpAddOns where N: FullNodeComponents>, OpEngineValidator: EngineValidator<::Engine>, diff --git a/crates/optimism/node/tests/e2e/utils.rs b/crates/optimism/node/tests/e2e/utils.rs index a8afab87e..c3b6acddc 100644 --- a/crates/optimism/node/tests/e2e/utils.rs +++ b/crates/optimism/node/tests/e2e/utils.rs @@ -6,14 +6,14 @@ use reth_e2e_test_utils::{ }; use reth_optimism_chainspec::OpChainSpecBuilder; use reth_optimism_node::{ - node::OptimismAddOns, OpBuiltPayload, OpNode as OtherOpNode, OpPayloadBuilderAttributes, + node::OpAddOns, OpBuiltPayload, OpNode as OtherOpNode, OpPayloadBuilderAttributes, }; use reth_payload_builder::EthPayloadBuilderAttributes; use std::sync::Arc; use tokio::sync::Mutex; /// Optimism Node Helper type -pub(crate) type OpNode = NodeHelperType>>; +pub(crate) type OpNode = NodeHelperType>>; pub(crate) async fn setup(num_nodes: usize) -> eyre::Result<(Vec, TaskManager, Wallet)> { let genesis: Genesis = serde_json::from_str(include_str!("../assets/genesis.json")).unwrap(); diff --git a/crates/optimism/node/tests/it/builder.rs b/crates/optimism/node/tests/it/builder.rs index 3bd2da755..67cac17d3 100644 --- a/crates/optimism/node/tests/it/builder.rs +++ b/crates/optimism/node/tests/it/builder.rs @@ -4,7 +4,7 @@ use reth_db::test_utils::create_test_rw_db; use reth_node_api::FullNodeComponents; use reth_node_builder::{NodeBuilder, NodeConfig}; use reth_optimism_chainspec::BASE_MAINNET; -use reth_optimism_node::{node::OptimismAddOns, OpNode}; +use reth_optimism_node::{node::OpAddOns, OpNode}; #[test] fn test_basic_setup() { @@ -15,7 +15,7 @@ fn test_basic_setup() { .with_database(db) .with_types::() .with_components(OpNode::components(Default::default())) - .with_add_ons(OptimismAddOns::new(None)) + .with_add_ons(OpAddOns::new(None)) .on_component_initialized(move |ctx| { let _provider = ctx.provider(); Ok(())