chore: rm evmenvprovider trait (#13503)

This commit is contained in:
Matthias Seitz
2024-12-23 11:46:09 +01:00
committed by GitHub
parent a0dcb0c522
commit ec21e895c1
25 changed files with 53 additions and 215 deletions

View File

@ -1,6 +1,6 @@
use reth_evm::ConfigureEvm;
use reth_primitives::NodePrimitives;
use reth_provider::{BlockReader, CanonStateSubscriptions, EvmEnvProvider, StateProviderFactory};
use reth_provider::{BlockReader, CanonStateSubscriptions, StateProviderFactory};
use reth_rpc::{EthFilter, EthPubSub};
use reth_rpc_eth_api::EthApiTypes;
use reth_rpc_eth_types::{
@ -31,8 +31,7 @@ where
+ BlockReader<
Block = <Events::Primitives as NodePrimitives>::Block,
Receipt = <Events::Primitives as NodePrimitives>::Receipt,
> + EvmEnvProvider
+ Clone
> + Clone
+ Unpin
+ 'static,
Events: CanonStateSubscriptions + Clone + 'static,

View File

@ -233,8 +233,7 @@ use reth_network_api::{noop::NoopNetwork, NetworkInfo, Peers};
use reth_primitives::NodePrimitives;
use reth_provider::{
AccountReader, BlockReader, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader,
EvmEnvProvider, FullRpcProvider, ProviderBlock, ProviderHeader, ProviderReceipt,
StateProviderFactory,
FullRpcProvider, ProviderBlock, ProviderHeader, ProviderReceipt, StateProviderFactory,
};
use reth_rpc::{
AdminApi, DebugApi, EngineEthApi, EthBundle, MinerApi, NetApi, OtterscanApi, RPCApi, RethApi,
@ -403,7 +402,7 @@ impl<Provider, Pool, Network, Tasks, Events, EvmConfig, BlockExecutor, Consensus
provider: P,
) -> RpcModuleBuilder<P, Pool, Network, Tasks, Events, EvmConfig, BlockExecutor, Consensus>
where
P: BlockReader + StateProviderFactory + EvmEnvProvider + 'static,
P: BlockReader + StateProviderFactory + 'static,
{
let Self { pool, network, executor, events, evm_config, block_executor, consensus, .. } =
self;
@ -1004,8 +1003,7 @@ where
+ BlockReader<
Block = <Events::Primitives as NodePrimitives>::Block,
Receipt = <Events::Primitives as NodePrimitives>::Receipt,
> + EvmEnvProvider
+ Clone
> + Clone
+ Unpin
+ 'static,
Pool: Send + Sync + Clone + 'static,