From 2eecf75c35bcabb32e9ecda4a13cd1b03c343b8f Mon Sep 17 00:00:00 2001 From: Dan Cline <6798349+Rjected@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:57:13 +0200 Subject: [PATCH] chore: remove redundant Send bounds for BlockReader types (#13452) --- crates/exex/exex/src/backfill/stream.rs | 10 +++++----- crates/rpc/rpc/src/eth/core.rs | 4 ++-- crates/storage/storage-api/src/transactions.rs | 2 +- crates/transaction-pool/src/maintain.rs | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/exex/exex/src/backfill/stream.rs b/crates/exex/exex/src/backfill/stream.rs index 0e27954eb4..b368415407 100644 --- a/crates/exex/exex/src/backfill/stream.rs +++ b/crates/exex/exex/src/backfill/stream.rs @@ -8,7 +8,7 @@ use futures::{ use reth_evm::execute::{BlockExecutionError, BlockExecutionOutput, BlockExecutorProvider}; use reth_node_api::NodePrimitives; use reth_primitives::{BlockWithSenders, EthPrimitives}; -use reth_provider::{BlockReader, Chain, HeaderProvider, StateProviderFactory}; +use reth_provider::{BlockReader, Chain, StateProviderFactory}; use reth_prune_types::PruneModes; use reth_stages_api::ExecutionStageThresholds; use reth_tracing::tracing::debug; @@ -114,8 +114,8 @@ where impl Stream for StreamBackfillJob> where - E: BlockExecutorProvider> + Clone + Send + 'static, - P: HeaderProvider + BlockReader + StateProviderFactory + Clone + Send + Unpin + 'static, + E: BlockExecutorProvider> + Clone + 'static, + P: BlockReader + StateProviderFactory + Clone + Unpin + 'static, { type Item = BackfillJobResult>; @@ -147,8 +147,8 @@ where impl Stream for StreamBackfillJob> where - E: BlockExecutorProvider> + Clone + Send + 'static, - P: HeaderProvider + BlockReader + StateProviderFactory + Clone + Send + Unpin + 'static, + E: BlockExecutorProvider> + Clone + 'static, + P: BlockReader + StateProviderFactory + Clone + Unpin + 'static, { type Item = BackfillJobResult>; diff --git a/crates/rpc/rpc/src/eth/core.rs b/crates/rpc/rpc/src/eth/core.rs index 8341742e4d..48320de2b3 100644 --- a/crates/rpc/rpc/src/eth/core.rs +++ b/crates/rpc/rpc/src/eth/core.rs @@ -158,7 +158,7 @@ where impl RpcNodeCore for EthApi where - Provider: BlockReader + Send + Sync + Clone + Unpin, + Provider: BlockReader + Clone + Unpin, Pool: Send + Sync + Clone + Unpin, Network: Send + Sync + Clone, EvmConfig: Send + Sync + Clone + Unpin, @@ -193,7 +193,7 @@ where impl RpcNodeCoreExt for EthApi where - Provider: BlockReader + Send + Sync + Clone + Unpin, + Provider: BlockReader + Clone + Unpin, Pool: Send + Sync + Clone + Unpin, Network: Send + Sync + Clone, EvmConfig: Send + Sync + Clone + Unpin, diff --git a/crates/storage/storage-api/src/transactions.rs b/crates/storage/storage-api/src/transactions.rs index ca2bcaeb46..ed44b4dd13 100644 --- a/crates/storage/storage-api/src/transactions.rs +++ b/crates/storage/storage-api/src/transactions.rs @@ -86,7 +86,7 @@ pub type ProviderTx

=

::Transaction; /// Client trait for fetching additional transactions related data. #[auto_impl::auto_impl(&, Arc)] -pub trait TransactionsProviderExt: BlockReader + Send + Sync { +pub trait TransactionsProviderExt: BlockReader { /// Get transactions range by block range. fn transaction_range_by_block_range( &self, diff --git a/crates/transaction-pool/src/maintain.rs b/crates/transaction-pool/src/maintain.rs index a0c5571a4a..23bf75b01d 100644 --- a/crates/transaction-pool/src/maintain.rs +++ b/crates/transaction-pool/src/maintain.rs @@ -83,7 +83,7 @@ where BlockBody = reth_primitives::BlockBody, SignedTx = TransactionSigned, >, - Client: StateProviderFactory + BlockReaderIdExt + ChainSpecProvider + Clone + Send + 'static, + Client: StateProviderFactory + BlockReaderIdExt + ChainSpecProvider + Clone + 'static, P: TransactionPoolExt> + 'static, St: Stream> + Send + Unpin + 'static, Tasks: TaskSpawner + 'static, @@ -109,7 +109,7 @@ pub async fn maintain_transaction_pool( BlockBody = reth_primitives::BlockBody, SignedTx = TransactionSigned, >, - Client: StateProviderFactory + BlockReaderIdExt + ChainSpecProvider + Clone + Send + 'static, + Client: StateProviderFactory + BlockReaderIdExt + ChainSpecProvider + Clone + 'static, P: TransactionPoolExt> + 'static, St: Stream> + Send + Unpin + 'static, Tasks: TaskSpawner + 'static,