diff --git a/crates/handler/src/handler.rs b/crates/handler/src/handler.rs index d4634f4663..badbbf593c 100644 --- a/crates/handler/src/handler.rs +++ b/crates/handler/src/handler.rs @@ -13,7 +13,6 @@ use context_interface::{ use interpreter::interpreter_action::FrameInit; use interpreter::{Gas, InitialAndFloorGas, SharedMemory}; use primitives::U256; -use state::EvmState; /// Trait for errors that can occur during EVM execution. /// @@ -68,7 +67,7 @@ impl< pub trait Handler { /// The EVM type containing Context, Instruction, and Precompiles implementations. type Evm: EvmTr< - Context: ContextTr, Local: LocalContextTr>, + Context: ContextTr, Frame: FrameTr, >; /// The error type returned by this handler. diff --git a/crates/handler/src/post_execution.rs b/crates/handler/src/post_execution.rs index 71ded059ef..40002b2056 100644 --- a/crates/handler/src/post_execution.rs +++ b/crates/handler/src/post_execution.rs @@ -6,7 +6,6 @@ use context_interface::{ }; use interpreter::{Gas, InitialAndFloorGas, SuccessOrHalt}; use primitives::{hardfork::SpecId, U256}; -use state::EvmState; /// Ensures minimum gas floor is spent according to EIP-7623. pub fn eip7623_check_gas_floor(gas: &mut Gas, init_and_floor_gas: InitialAndFloorGas) { @@ -80,7 +79,7 @@ pub fn reward_beneficiary( /// Calculate last gas spent and transform internal reason to external. /// /// TODO make Journal FinalOutput more generic. -pub fn output>, HALTREASON: HaltReasonTr>( +pub fn output, HALTREASON: HaltReasonTr>( context: &mut CTX, // TODO, make this more generic and nice. // FrameResult should be a generic that returns gas and interpreter result.