refactor: remove EVMErrorForChain

crates/primitives/src/result.rs

@@ -175,11 +175,6 @@ impl<DBError, TransactionValidationErrorT> EVMError<DBError, TransactionValidati
     }
 }
 
-pub type EVMErrorForChain<DBError, ChainSpecT> = EVMError<
-    DBError,
-    <<ChainSpecT as ChainSpec>::Transaction as TransactionValidation>::ValidationError,
->;
-
 #[cfg(feature = "std")]
 impl<DBError, TransactionValidationErrorT> std::error::Error
     for EVMError<DBError, TransactionValidationErrorT>

crates/revm/src/context/evm_context.rs

@@ -9,7 +9,7 @@ use crate::{
         return_ok, CallInputs, Contract, Gas, InstructionResult, Interpreter, InterpreterResult,
     },
     primitives::{
-        Address, Bytes, ChainSpec, EVMError, EVMErrorForChain, Env, TransactionValidation, U256,
+        Address, Bytes, ChainSpec, EVMError, result::EVMResultGeneric, Env, TransactionValidation, U256,
     },
     ContextPrecompiles, FrameOrResult, CALL_STACK_LIMIT,
 };
@@ -89,7 +89,7 @@ impl<ChainSpecT: ChainSpec, DB: Database> EvmContext<ChainSpecT, DB> {
         address: &Address,
         input_data: &Bytes,
         gas: Gas,
-    ) -> Result<Option<InterpreterResult>, EVMErrorForChain<DB::Error, ChainSpecT>> {
+    ) -> EVMResultGeneric<Option<InterpreterResult>, ChainSpecT, DB::Error> {
         let Some(outcome) =
             self.precompiles
                 .call(address, input_data, gas.limit(), &mut self.inner)

crates/revm/src/evm.rs

@@ -6,8 +6,8 @@ use crate::{
     handler::{EnvWithChainSpec, Handler},
     interpreter::{CallInputs, CreateInputs, EOFCreateInputs, InterpreterAction, SharedMemory},
     primitives::{
-        CfgEnv, ChainSpec, EVMError, EVMErrorForChain, EVMResult, EthChainSpec, ExecutionResult,
-        ResultAndState, SpecId, Transaction as _, TransactionValidation, TxKind,
+        result::EVMResultGeneric, CfgEnv, ChainSpec, EVMError, EVMResult, EthChainSpec,
+        ExecutionResult, ResultAndState, SpecId, Transaction as _, TransactionValidation, TxKind,
     },
     Context, ContextWithChainSpec, Frame, FrameOrResult, FrameResult,
 };
@@ -44,7 +44,7 @@ impl<EXT, ChainSpecT: ChainSpec, DB: Database + DatabaseCommit> Evm<'_, ChainSpe
     /// Commit the changes to the database.
     pub fn transact_commit(
         &mut self,
-    ) -> Result<ExecutionResult<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>> {
+    ) -> EVMResultGeneric<ExecutionResult<ChainSpecT>, ChainSpecT, DB::Error> {
         let ResultAndState { result, state } = self.transact()?;
         self.context.evm.db.commit(state);
         Ok(result)

crates/revm/src/handler/handle_types/post_execution.rs

@@ -3,7 +3,7 @@ use crate::{
     handler::mainnet,
     interpreter::Gas,
     primitives::{
-        db::Database, ChainSpec, EVMError, EVMErrorForChain, EVMResultGeneric, ResultAndState,
+        db::Database, ChainSpec, EVMError, EVMResultGeneric, ResultAndState,
         Spec, TransactionValidation,
     },
     Context, FrameResult,
@@ -121,16 +121,16 @@ impl<'a, ChainSpecT: ChainSpec, EXT, DB: Database> PostExecutionHandler<'a, Chai
         &self,
         context: &mut Context<ChainSpecT, EXT, DB>,
         result: FrameResult,
-    ) -> Result<ResultAndState<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>> {
+    ) -> EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, DB::Error> {
         (self.output)(context, result)
     }
 
     /// End handler.
     pub fn end(
         &self,
         context: &mut Context<ChainSpecT, EXT, DB>,
-        end_output: Result<ResultAndState<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>>,
-    ) -> Result<ResultAndState<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>> {
+        end_output: EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, DB::Error>,
+    ) -> EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, DB::Error> {
         (self.end)(context, end_output)
     }
 

crates/revm/src/handler/mainnet/post_execution.rs

@@ -1,7 +1,7 @@
 use crate::{
     interpreter::{Gas, SuccessOrHalt},
     primitives::{
-        db::Database, Block, ChainSpec, EVMError, EVMErrorForChain, ExecutionResult,
+        db::Database, result::EVMResultGeneric, Block, ChainSpec, EVMError, ExecutionResult,
         ResultAndState, Spec, SpecId::LONDON, Transaction, TransactionValidation, U256,
     },
     Context, FrameResult,
@@ -11,8 +11,8 @@ use crate::{
 #[inline]
 pub fn end<ChainSpecT: ChainSpec, EXT, DB: Database>(
     _context: &mut Context<ChainSpecT, EXT, DB>,
-    evm_output: Result<ResultAndState<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>>,
-) -> Result<ResultAndState<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>> {
+    evm_output: EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, DB::Error>,
+) -> EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, DB::Error> {
     evm_output
 }
 
@@ -67,7 +67,7 @@ pub fn reward_beneficiary<ChainSpecT: ChainSpec, SPEC: Spec, EXT, DB: Database>(
 pub fn reimburse_caller<ChainSpecT: ChainSpec, EXT, DB: Database>(
     context: &mut Context<ChainSpecT, EXT, DB>,
     gas: &Gas,
-) -> Result<(), EVMErrorForChain<DB::Error, ChainSpecT>> {
+) -> EVMResultGeneric<(), ChainSpecT, DB::Error> {
     let caller = context.evm.env.tx.caller();
     let effective_gas_price = context.evm.env.effective_gas_price();
 
@@ -92,7 +92,7 @@ pub fn reimburse_caller<ChainSpecT: ChainSpec, EXT, DB: Database>(
 pub fn output<ChainSpecT: ChainSpec, EXT, DB: Database>(
     context: &mut Context<ChainSpecT, EXT, DB>,
     result: FrameResult,
-) -> Result<ResultAndState<ChainSpecT>, EVMErrorForChain<DB::Error, ChainSpecT>> {
+) -> EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, DB::Error> {
     context.evm.take_error().map_err(EVMError::Database)?;
 
     // used gas with refund calculated.