From 29577fa20f21decd07d826da5068fc6d299a8d5e Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 21 Nov 2024 18:36:25 +0100 Subject: [PATCH] Replace use of fully qualified syntax --- crates/e2e-test-utils/src/lib.rs | 6 ++---- crates/node/builder/src/builder/mod.rs | 6 ++---- crates/node/builder/src/launch/common.rs | 6 ++---- crates/node/builder/src/launch/engine.rs | 3 +-- crates/node/builder/src/launch/mod.rs | 3 +-- crates/node/builder/src/setup.rs | 6 ++---- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/crates/e2e-test-utils/src/lib.rs b/crates/e2e-test-utils/src/lib.rs index df459f641b43..73a7e39f1a49 100644 --- a/crates/e2e-test-utils/src/lib.rs +++ b/crates/e2e-test-utils/src/lib.rs @@ -59,8 +59,7 @@ where Components: NodeComponents, Network: PeersHandleProvider>, >, N::AddOns: RethRpcAddOns>, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { let tasks = TaskManager::current(); let exec = tasks.executor(); @@ -135,8 +134,7 @@ where LocalPayloadAttributesBuilder: PayloadAttributesBuilder< <::Engine as PayloadTypes>::PayloadAttributes, >, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { let tasks = TaskManager::current(); let exec = tasks.executor(); diff --git a/crates/node/builder/src/builder/mod.rs b/crates/node/builder/src/builder/mod.rs index 3ad90a493f13..65ae704fe831 100644 --- a/crates/node/builder/src/builder/mod.rs +++ b/crates/node/builder/src/builder/mod.rs @@ -365,8 +365,7 @@ where >>::Components, >, >, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { self.node(node).launch().await } @@ -557,8 +556,7 @@ where T: NodeTypesWithEngine + NodeTypesForProvider, CB: NodeComponentsBuilder>, AO: RethRpcAddOns, CB::Components>>, - T::Primitives: - FullNodePrimitives>, + T::Primitives: FullNodePrimitives, { /// Launches the node with the [`DefaultNodeLauncher`] that sets up engine API consensus and rpc pub async fn launch( diff --git a/crates/node/builder/src/launch/common.rs b/crates/node/builder/src/launch/common.rs index 9cc841f6fea8..47ec68ff0d7d 100644 --- a/crates/node/builder/src/launch/common.rs +++ b/crates/node/builder/src/launch/common.rs @@ -408,8 +408,7 @@ where pub async fn create_provider_factory(&self) -> eyre::Result> where N: ProviderNodeTypes, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { let factory = ProviderFactory::new( self.right().clone(), @@ -476,8 +475,7 @@ where ) -> eyre::Result, ProviderFactory>>> where N: ProviderNodeTypes, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { let factory = self.create_provider_factory().await?; let ctx = LaunchContextWith { diff --git a/crates/node/builder/src/launch/engine.rs b/crates/node/builder/src/launch/engine.rs index f485be2c22db..ef1edc899ebe 100644 --- a/crates/node/builder/src/launch/engine.rs +++ b/crates/node/builder/src/launch/engine.rs @@ -77,8 +77,7 @@ where LocalPayloadAttributesBuilder: PayloadAttributesBuilder< <::Engine as PayloadTypes>::PayloadAttributes, >, - Types::Primitives: - FullNodePrimitives>, + Types::Primitives: FullNodePrimitives, { type Node = NodeHandle, AO>; diff --git a/crates/node/builder/src/launch/mod.rs b/crates/node/builder/src/launch/mod.rs index be317e4be318..a1819948ee48 100644 --- a/crates/node/builder/src/launch/mod.rs +++ b/crates/node/builder/src/launch/mod.rs @@ -102,8 +102,7 @@ where T: FullNodeTypes, Types = Types>, CB: NodeComponentsBuilder, AO: RethRpcAddOns>, - Types::Primitives: - FullNodePrimitives>, + Types::Primitives: FullNodePrimitives, { type Node = NodeHandle, AO>; diff --git a/crates/node/builder/src/setup.rs b/crates/node/builder/src/setup.rs index 400e3d844565..71f0ceb56cdd 100644 --- a/crates/node/builder/src/setup.rs +++ b/crates/node/builder/src/setup.rs @@ -41,8 +41,7 @@ where N: ProviderNodeTypes, Client: EthBlockClient + 'static, Executor: BlockExecutorProvider, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { // building network downloaders using the fetch client let header_downloader = ReverseHeadersDownloaderBuilder::new(config.headers) @@ -92,8 +91,7 @@ where Body = <::Block as reth_node_api::Block>::Body, > + 'static, Executor: BlockExecutorProvider, - N::Primitives: - FullNodePrimitives>, + N::Primitives: FullNodePrimitives, { let mut builder = Pipeline::::builder();