refactor: use EVMResultGeneric

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

@@ -28,13 +28,9 @@ pub type OutputHandle<'a, ChainSpecT, EXT, DB> = Arc<
     dyn Fn(
             &mut Context<ChainSpecT, EXT, DB>,
             FrameResult,
-        ) -> Result<
-            ResultAndState<ChainSpecT>,
-            EVMError<
-                <DB as Database>::Error,
-                <<ChainSpecT as ChainSpec>::Transaction as TransactionValidation>::ValidationError,
-            >,
-        > + 'a,
+        )
+            -> EVMResultGeneric<ResultAndState<ChainSpecT>, ChainSpecT, <DB as Database>::Error>
+        + 'a,
 >;
 
 /// End handle, takes result and state and returns final result.

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

@@ -1,9 +1,7 @@
 // Includes.
 use crate::{
     handler::mainnet,
-    primitives::{
-        db::Database, ChainSpec, EVMError, EVMResultGeneric, Spec, TransactionValidation,
-    },
+    primitives::{db::Database, ChainSpec, EVMResultGeneric, Spec},
     Context, ContextPrecompiles,
 };
 use std::sync::Arc;
@@ -18,13 +16,8 @@ pub type LoadPrecompilesHandle<'a, ChainSpecT, DB> =
 pub type LoadAccountsHandle<'a, ChainSpecT, EXT, DB> = Arc<
     dyn Fn(
             &mut Context<ChainSpecT, EXT, DB>,
-        ) -> Result<
-            (),
-            EVMError<
-                <DB as Database>::Error,
-                <<ChainSpecT as ChainSpec>::Transaction as TransactionValidation>::ValidationError,
-            >,
-        > + 'a,
+        ) -> EVMResultGeneric<(), ChainSpecT, <DB as Database>::Error>
+        + 'a,
 >;
 
 /// Deduct the caller to its limit.

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

@@ -1,51 +1,29 @@
 use crate::{
     handler::mainnet,
     primitives::{
-        db::Database, ChainSpec, EVMError, EVMResultGeneric, Env, InvalidTransaction, Spec,
+        db::Database, ChainSpec, EVMResultGeneric, Env, InvalidTransaction, Spec,
         TransactionValidation,
     },
     Context,
 };
 use std::sync::Arc;
 
 /// Handle that validates env.
-pub type ValidateEnvHandle<'a, ChainSpecT, DB> = Arc<
-    dyn Fn(
-            &Env<ChainSpecT>,
-        ) -> Result<
-            (),
-            EVMError<
-                <DB as Database>::Error,
-                <<ChainSpecT as ChainSpec>::Transaction as TransactionValidation>::ValidationError,
-            >,
-        > + 'a,
->;
+pub type ValidateEnvHandle<'a, ChainSpecT, DB> =
+    Arc<dyn Fn(&Env<ChainSpecT>) -> EVMResultGeneric<(), ChainSpecT, <DB as Database>::Error> + 'a>;
 
 /// Handle that validates transaction environment against the state.
 /// Second parametar is initial gas.
 pub type ValidateTxEnvAgainstState<'a, ChainSpecT, EXT, DB> = Arc<
     dyn Fn(
             &mut Context<ChainSpecT, EXT, DB>,
-        ) -> Result<
-            (),
-            EVMError<
-                <DB as Database>::Error,
-                <<ChainSpecT as ChainSpec>::Transaction as TransactionValidation>::ValidationError,
-            >,
-        > + 'a,
+        ) -> EVMResultGeneric<(), ChainSpecT, <DB as Database>::Error>
+        + 'a,
 >;
 
 /// Initial gas calculation handle
 pub type ValidateInitialTxGasHandle<'a, ChainSpecT, DB> = Arc<
-    dyn Fn(
-            &Env<ChainSpecT>,
-        ) -> Result<
-            u64,
-            EVMError<
-                <DB as Database>::Error,
-                <<ChainSpecT as ChainSpec>::Transaction as TransactionValidation>::ValidationError,
-            >,
-        > + 'a,
+    dyn Fn(&Env<ChainSpecT>) -> EVMResultGeneric<u64, ChainSpecT, <DB as Database>::Error> + 'a,
 >;
 
 /// Handles related to validation.