diff --git a/crates/ethereum/evm/src/lib.rs b/crates/ethereum/evm/src/lib.rs index cd8398ebe..43f04119e 100644 --- a/crates/ethereum/evm/src/lib.rs +++ b/crates/ethereum/evm/src/lib.rs @@ -107,10 +107,10 @@ impl ConfigureEvmEnv for EthEvmConfig { impl ConfigureEvm for EthEvmConfig { type DefaultExternalContext<'a> = (); - fn evm<'a, DB: Database + 'a>( + fn evm( &self, db: DB, - ) -> reth_revm::Evm<'a, Self::DefaultExternalContext<'a>, DB> { + ) -> reth_revm::Evm<'_, Self::DefaultExternalContext<'_>, DB> { EvmBuilder::default().with_db(db).build() } } diff --git a/crates/evm/src/lib.rs b/crates/evm/src/lib.rs index 27eeb42ec..b2fbb91a8 100644 --- a/crates/evm/src/lib.rs +++ b/crates/evm/src/lib.rs @@ -42,17 +42,17 @@ pub trait ConfigureEvm: ConfigureEvmEnv { /// This does not automatically configure the EVM with [`ConfigureEvmEnv`] methods. It is up to /// the caller to call an appropriate method to fill the transaction and block environment /// before executing any transactions using the provided EVM. - fn evm<'a, DB: Database + 'a>(&self, db: DB) -> Evm<'a, Self::DefaultExternalContext<'a>, DB>; + fn evm(&self, db: DB) -> Evm<'_, Self::DefaultExternalContext<'_>, DB>; /// Returns a new EVM with the given database configured with the given environment settings, /// including the spec id. /// /// This will preserve any handler modifications - fn evm_with_env<'a, DB: Database + 'a>( + fn evm_with_env( &self, db: DB, env: EnvWithHandlerCfg, - ) -> Evm<'a, Self::DefaultExternalContext<'a>, DB> { + ) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> { let mut evm = self.evm(db); evm.modify_spec_id(env.spec_id()); evm.context.evm.env = env.env; @@ -65,12 +65,12 @@ pub trait ConfigureEvm: ConfigureEvmEnv { /// This will use the given external inspector as the EVM external context. /// /// This will preserve any handler modifications - fn evm_with_env_and_inspector<'a, DB, I>( + fn evm_with_env_and_inspector( &self, db: DB, env: EnvWithHandlerCfg, inspector: I, - ) -> Evm<'a, I, DB> + ) -> Evm<'_, I, DB> where DB: Database, I: GetInspector, @@ -86,9 +86,9 @@ pub trait ConfigureEvm: ConfigureEvmEnv { /// Caution: This does not automatically configure the EVM with [`ConfigureEvmEnv`] methods. It /// is up to the caller to call an appropriate method to fill the transaction and block /// environment before executing any transactions using the provided EVM. - fn evm_with_inspector<'a, DB, I>(&self, db: DB, inspector: I) -> Evm<'a, I, DB> + fn evm_with_inspector(&self, db: DB, inspector: I) -> Evm<'_, I, DB> where - DB: Database + 'a, + DB: Database, I: GetInspector, { EvmBuilder::default() diff --git a/crates/optimism/evm/src/lib.rs b/crates/optimism/evm/src/lib.rs index 8a56014c5..1d7f22f3c 100644 --- a/crates/optimism/evm/src/lib.rs +++ b/crates/optimism/evm/src/lib.rs @@ -113,13 +113,13 @@ impl ConfigureEvmEnv for OptimismEvmConfig { impl ConfigureEvm for OptimismEvmConfig { type DefaultExternalContext<'a> = (); - fn evm<'a, DB: Database + 'a>(&self, db: DB) -> Evm<'a, Self::DefaultExternalContext<'a>, DB> { + fn evm(&self, db: DB) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> { EvmBuilder::default().with_db(db).optimism().build() } - fn evm_with_inspector<'a, DB, I>(&self, db: DB, inspector: I) -> Evm<'a, I, DB> + fn evm_with_inspector(&self, db: DB, inspector: I) -> Evm<'_, I, DB> where - DB: Database + 'a, + DB: Database, I: GetInspector, { EvmBuilder::default() diff --git a/examples/custom-evm/src/main.rs b/examples/custom-evm/src/main.rs index 6e58acdca..4c2f3b712 100644 --- a/examples/custom-evm/src/main.rs +++ b/examples/custom-evm/src/main.rs @@ -109,7 +109,7 @@ impl ConfigureEvmEnv for MyEvmConfig { impl ConfigureEvm for MyEvmConfig { type DefaultExternalContext<'a> = (); - fn evm<'a, DB: Database + 'a>(&self, db: DB) -> Evm<'a, Self::DefaultExternalContext<'a>, DB> { + fn evm(&self, db: DB) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> { EvmBuilder::default() .with_db(db) // add additional precompiles @@ -117,9 +117,9 @@ impl ConfigureEvm for MyEvmConfig { .build() } - fn evm_with_inspector<'a, DB, I>(&self, db: DB, inspector: I) -> Evm<'a, I, DB> + fn evm_with_inspector(&self, db: DB, inspector: I) -> Evm<'_, I, DB> where - DB: Database + 'a, + DB: Database, I: GetInspector, { EvmBuilder::default() diff --git a/examples/stateful-precompile/src/main.rs b/examples/stateful-precompile/src/main.rs index d73e613d6..dd598a801 100644 --- a/examples/stateful-precompile/src/main.rs +++ b/examples/stateful-precompile/src/main.rs @@ -166,7 +166,7 @@ impl ConfigureEvmEnv for MyEvmConfig { impl ConfigureEvm for MyEvmConfig { type DefaultExternalContext<'a> = (); - fn evm<'a, DB: Database + 'a>(&self, db: DB) -> Evm<'a, Self::DefaultExternalContext<'a>, DB> { + fn evm(&self, db: DB) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> { let new_cache = self.precompile_cache.clone(); EvmBuilder::default() .with_db(db) @@ -177,9 +177,9 @@ impl ConfigureEvm for MyEvmConfig { .build() } - fn evm_with_inspector<'a, DB, I>(&self, db: DB, inspector: I) -> Evm<'a, I, DB> + fn evm_with_inspector(&self, db: DB, inspector: I) -> Evm<'_, I, DB> where - DB: Database + 'a, + DB: Database, I: GetInspector, { let new_cache = self.precompile_cache.clone();