From f8812e2aa5ad0b950e62dbcdd98a3043d4e7143a Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Fri, 19 Jul 2024 15:44:44 +0200 Subject: [PATCH] chore: require enginetypes 'static (#9645) --- crates/consensus/auto-seal/src/task.rs | 2 +- crates/consensus/beacon/src/engine/mod.rs | 4 ++-- crates/e2e-test-utils/src/engine_api.rs | 2 +- crates/e2e-test-utils/src/payload.rs | 4 ++-- crates/engine/primitives/src/lib.rs | 1 + crates/engine/tree/src/tree/mod.rs | 4 ++-- crates/node/api/src/node.rs | 2 +- crates/rpc/rpc-builder/src/auth.rs | 2 +- crates/rpc/rpc-builder/src/lib.rs | 6 +++--- crates/rpc/rpc-engine-api/src/engine_api.rs | 4 ++-- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/crates/consensus/auto-seal/src/task.rs b/crates/consensus/auto-seal/src/task.rs index 856d02631c..93bb3df737 100644 --- a/crates/consensus/auto-seal/src/task.rs +++ b/crates/consensus/auto-seal/src/task.rs @@ -85,7 +85,7 @@ where Client: StateProviderFactory + CanonChainTracker + Clone + Unpin + 'static, Pool: TransactionPool + Unpin + 'static, ::Transaction: IntoRecoveredTransaction, - Engine: EngineTypes + 'static, + Engine: EngineTypes, Executor: BlockExecutorProvider, { type Output = (); diff --git a/crates/consensus/beacon/src/engine/mod.rs b/crates/consensus/beacon/src/engine/mod.rs index 9673f6205d..0e9f91ac65 100644 --- a/crates/consensus/beacon/src/engine/mod.rs +++ b/crates/consensus/beacon/src/engine/mod.rs @@ -235,7 +235,7 @@ where + ChainSpecProvider + 'static, Client: HeadersClient + BodiesClient + Clone + Unpin + 'static, - EngineT: EngineTypes + Unpin + 'static, + EngineT: EngineTypes + Unpin, { /// Create a new instance of the [`BeaconConsensusEngine`]. #[allow(clippy::too_many_arguments)] @@ -1801,7 +1801,7 @@ where + ChainSpecProvider + Unpin + 'static, - EngineT: EngineTypes + Unpin + 'static, + EngineT: EngineTypes + Unpin, { type Output = Result<(), BeaconConsensusEngineError>; diff --git a/crates/e2e-test-utils/src/engine_api.rs b/crates/e2e-test-utils/src/engine_api.rs index 66e8900323..d66bd6135a 100644 --- a/crates/e2e-test-utils/src/engine_api.rs +++ b/crates/e2e-test-utils/src/engine_api.rs @@ -23,7 +23,7 @@ pub struct EngineApiTestContext { pub _marker: PhantomData, } -impl EngineApiTestContext { +impl EngineApiTestContext { /// Retrieves a v3 payload from the engine api pub async fn get_payload_v3( &self, diff --git a/crates/e2e-test-utils/src/payload.rs b/crates/e2e-test-utils/src/payload.rs index 828bc5f32c..c29eccef92 100644 --- a/crates/e2e-test-utils/src/payload.rs +++ b/crates/e2e-test-utils/src/payload.rs @@ -4,13 +4,13 @@ use reth_payload_builder::{Events, PayloadBuilderHandle, PayloadId}; use tokio_stream::wrappers::BroadcastStream; /// Helper for payload operations -pub struct PayloadTestContext { +pub struct PayloadTestContext { pub payload_event_stream: BroadcastStream>, payload_builder: PayloadBuilderHandle, pub timestamp: u64, } -impl PayloadTestContext { +impl PayloadTestContext { /// Creates a new payload helper pub async fn new(payload_builder: PayloadBuilderHandle) -> eyre::Result { let payload_events = payload_builder.subscribe().await?; diff --git a/crates/engine/primitives/src/lib.rs b/crates/engine/primitives/src/lib.rs index b83abc39e6..4b0db7c0a1 100644 --- a/crates/engine/primitives/src/lib.rs +++ b/crates/engine/primitives/src/lib.rs @@ -27,6 +27,7 @@ pub trait EngineTypes: + TryInto, > + DeserializeOwned + Serialize + + 'static { /// Execution Payload V1 type. type ExecutionPayloadV1: DeserializeOwned + Serialize + Clone + Unpin + Send + Sync + 'static; diff --git a/crates/engine/tree/src/tree/mod.rs b/crates/engine/tree/src/tree/mod.rs index ee27fb124f..69e14bf7b8 100644 --- a/crates/engine/tree/src/tree/mod.rs +++ b/crates/engine/tree/src/tree/mod.rs @@ -294,7 +294,7 @@ impl EngineApiTreeHandlerImpl where P: BlockReader + StateProviderFactory + Clone + 'static, E: BlockExecutorProvider, - T: EngineTypes + 'static, + T: EngineTypes, { #[allow(clippy::too_many_arguments)] pub fn new( @@ -765,7 +765,7 @@ impl EngineApiTreeHandler for EngineApiTreeHandlerImpl where P: BlockReader + StateProviderFactory + Clone + 'static, E: BlockExecutorProvider, - T: EngineTypes + 'static, + T: EngineTypes, { type Engine = T; diff --git a/crates/node/api/src/node.rs b/crates/node/api/src/node.rs index 22db838c8a..f0d9eef1be 100644 --- a/crates/node/api/src/node.rs +++ b/crates/node/api/src/node.rs @@ -47,7 +47,7 @@ impl AnyNodeTypes { impl NodeTypes for AnyNodeTypes where P: NodePrimitives + Send + Sync + Unpin + 'static, - E: EngineTypes + Send + Sync + Unpin + 'static, + E: EngineTypes + Send + Sync + Unpin, { type Primitives = P; diff --git a/crates/rpc/rpc-builder/src/auth.rs b/crates/rpc/rpc-builder/src/auth.rs index be904f6efc..25626e4f12 100644 --- a/crates/rpc/rpc-builder/src/auth.rs +++ b/crates/rpc/rpc-builder/src/auth.rs @@ -198,7 +198,7 @@ impl AuthRpcModule { /// Create a new `AuthRpcModule` with the given `engine_api`. pub fn new(engine: EngineApi) -> Self where - EngineT: EngineTypes + 'static, + EngineT: EngineTypes, EngineApi: EngineApiServer, { let mut module = RpcModule::new(()); diff --git a/crates/rpc/rpc-builder/src/lib.rs b/crates/rpc/rpc-builder/src/lib.rs index 592a435e19..48163069be 100644 --- a/crates/rpc/rpc-builder/src/lib.rs +++ b/crates/rpc/rpc-builder/src/lib.rs @@ -93,7 +93,7 @@ //! Network: NetworkInfo + Peers + Clone + 'static, //! Events: CanonStateSubscriptions + Clone + 'static, //! EngineApi: EngineApiServer, -//! EngineT: EngineTypes + 'static, +//! EngineT: EngineTypes, //! EvmConfig: ConfigureEvm, //! { //! // configure the rpc module per transport @@ -436,7 +436,7 @@ where RpcRegistryInner, ) where - EngineT: EngineTypes + 'static, + EngineT: EngineTypes, EngineApi: EngineApiServer, EthApi: FullEthApiServer, { @@ -976,7 +976,7 @@ where /// Note: This does _not_ register the `engine_` in this registry. pub fn create_auth_module(&self, engine_api: EngineApi) -> AuthRpcModule where - EngineT: EngineTypes + 'static, + EngineT: EngineTypes, EngineApi: EngineApiServer, { let mut module = RpcModule::new(()); diff --git a/crates/rpc/rpc-engine-api/src/engine_api.rs b/crates/rpc/rpc-engine-api/src/engine_api.rs index 881413210a..862a8ca02c 100644 --- a/crates/rpc/rpc-engine-api/src/engine_api.rs +++ b/crates/rpc/rpc-engine-api/src/engine_api.rs @@ -65,7 +65,7 @@ struct EngineApiInner { impl EngineApi where Provider: HeaderProvider + BlockReader + StateProviderFactory + EvmEnvProvider + 'static, - EngineT: EngineTypes + 'static, + EngineT: EngineTypes, { /// Create new instance of [`EngineApi`]. pub fn new( @@ -612,7 +612,7 @@ where impl EngineApiServer for EngineApi where Provider: HeaderProvider + BlockReader + StateProviderFactory + EvmEnvProvider + 'static, - EngineT: EngineTypes + 'static, + EngineT: EngineTypes, { /// Handler for `engine_newPayloadV1` /// See also