Skip to content

chore: remove redundant NodeTypes bounds #16160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2025
Merged

chore: remove redundant NodeTypes bounds #16160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cli/commands/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ type FullTypesAdapter<T> = FullNodeTypesAdapter<

/// Helper trait with a common set of requirements for the
/// [`NodeTypes`] in CLI.
pub trait CliNodeTypes: NodeTypes + NodeTypesForProvider {
pub trait CliNodeTypes: NodeTypesForProvider {
type Evm: ConfigureEvm<Primitives = Self::Primitives>;
}

Expand Down
8 changes: 3 additions & 5 deletions crates/e2e-test-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub async fn setup<N>(
attributes_generator: impl Fn(u64) -> <<N as NodeTypes>::Payload as PayloadTypes>::PayloadBuilderAttributes + Send + Sync + Copy + 'static,
) -> eyre::Result<(Vec<NodeHelperType<N>>, TaskManager, Wallet)>
where
N: Default + Node<TmpNodeAdapter<N>> + NodeTypesForProvider + NodeTypes,
N: Default + Node<TmpNodeAdapter<N>> + NodeTypesForProvider,
N::ComponentsBuilder: NodeComponentsBuilder<
TmpNodeAdapter<N>,
Components: NodeComponents<TmpNodeAdapter<N>, Network: PeersHandleProvider>,
Expand Down Expand Up @@ -205,8 +205,7 @@ pub type NodeHelperType<N, Provider = BlockchainProvider<NodeTypesWithDBAdapter<
pub trait NodeBuilderHelper
where
Self: Default
+ NodeTypesForProvider
+ NodeTypes<
+ NodeTypesForProvider<
Payload: PayloadTypes<
PayloadBuilderAttributes: From<reth_payload_builder::EthPayloadBuilderAttributes>,
>,
Expand Down Expand Up @@ -240,8 +239,7 @@ where
impl<T> NodeBuilderHelper for T
where
Self: Default
+ NodeTypesForProvider
+ NodeTypes<
+ NodeTypesForProvider<
Payload: PayloadTypes<
PayloadBuilderAttributes: From<reth_payload_builder::EthPayloadBuilderAttributes>,
>,
Expand Down
8 changes: 4 additions & 4 deletions crates/node/builder/src/builder/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ where
/// Configures the types of the node.
pub fn with_types<T>(self) -> NodeBuilderWithTypes<RethFullAdapter<DB, T>>
where
T: NodeTypes<ChainSpec = ChainSpec> + NodeTypesForProvider,
T: NodeTypesForProvider<ChainSpec = ChainSpec>,
{
self.with_types_and_provider()
}
Expand All @@ -250,7 +250,7 @@ where
self,
) -> NodeBuilderWithTypes<FullNodeTypesAdapter<T, DB, P>>
where
T: NodeTypes<ChainSpec = ChainSpec> + NodeTypesForProvider,
T: NodeTypesForProvider<ChainSpec = ChainSpec>,
P: FullProvider<NodeTypesWithDBAdapter<T, DB>>,
{
NodeBuilderWithTypes::new(self.config, self.database)
Expand Down Expand Up @@ -301,7 +301,7 @@ where
/// Configures the types of the node.
pub fn with_types<T>(self) -> WithLaunchContext<NodeBuilderWithTypes<RethFullAdapter<DB, T>>>
where
T: NodeTypes<ChainSpec = ChainSpec> + NodeTypesForProvider,
T: NodeTypesForProvider<ChainSpec = ChainSpec>,
{
WithLaunchContext { builder: self.builder.with_types(), task_executor: self.task_executor }
}
Expand All @@ -311,7 +311,7 @@ where
self,
) -> WithLaunchContext<NodeBuilderWithTypes<FullNodeTypesAdapter<T, DB, P>>>
where
T: NodeTypes<ChainSpec = ChainSpec> + NodeTypesForProvider,
T: NodeTypesForProvider<ChainSpec = ChainSpec>,
P: FullProvider<NodeTypesWithDBAdapter<T, DB>>,
{
WithLaunchContext {
Expand Down
Loading