diff --git a/crates/evm/src/lib.rs b/crates/evm/src/lib.rs index ce60e6586..3e4a227ff 100644 --- a/crates/evm/src/lib.rs +++ b/crates/evm/src/lib.rs @@ -47,6 +47,9 @@ pub mod test_utils; pub use alloy_evm::{Database, Evm, EvmEnv, EvmError, InvalidTxError}; +/// Alias for `EvmEnv<::Spec>` +pub type EvmEnvFor = EvmEnv<::Spec>; + /// Helper trait to bound [`Inspector`] for a [`ConfigureEvm`]. pub trait InspectorFor: Inspector<>>::Context> diff --git a/crates/rpc/rpc-eth-api/src/helpers/state.rs b/crates/rpc/rpc-eth-api/src/helpers/state.rs index d3c07c1a3..df794f800 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/state.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/state.rs @@ -10,7 +10,7 @@ use alloy_serde::JsonStorageKey; use futures::Future; use reth_chainspec::{EthChainSpec, EthereumHardforks}; use reth_errors::RethError; -use reth_evm::{ConfigureEvmEnv, EvmEnv}; +use reth_evm::{ConfigureEvmEnv, EvmEnvFor}; use reth_provider::{ BlockIdReader, BlockNumReader, ChainSpecProvider, StateProvider, StateProviderBox, StateProviderFactory, @@ -210,13 +210,10 @@ pub trait LoadState: /// for. /// If the [`BlockId`] is pending, this will return the "Pending" tag, otherwise this returns /// the hash of the exact block. - #[expect(clippy::type_complexity)] fn evm_env_at( &self, at: BlockId, - ) -> impl Future< - Output = Result<(EvmEnv<::Spec>, BlockId), Self::Error>, - > + Send + ) -> impl Future, BlockId), Self::Error>> + Send where Self: LoadPendingBlock + SpawnBlocking, {