diff --git a/crates/context/interface/src/result.rs b/crates/context/interface/src/result.rs index c444fe3bad..f0b36662c1 100644 --- a/crates/context/interface/src/result.rs +++ b/crates/context/interface/src/result.rs @@ -14,16 +14,16 @@ impl HaltReasonTrait for HaltReasonT where #[derive(Debug, Clone, PartialEq, Eq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -pub struct ResultAndState { +pub struct ResultAndState { /// Status of execution pub result: ExecutionResult, /// State that got updated pub state: EvmState, } -impl ResultAndState { +impl ResultAndState { /// Maps a `DBError` to a new error type using the provided closure, leaving other variants unchanged. - pub fn map_haltreason(self, op: F) -> ResultAndState + pub fn map_haltreason(self, op: F) -> ResultAndState where F: FnOnce(HaltReasonT) -> OHR, { @@ -37,7 +37,7 @@ impl ResultAndState { /// Result of a transaction execution #[derive(Clone, Debug, PartialEq, Eq, Hash)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -pub enum ExecutionResult { +pub enum ExecutionResult { /// Returned successfully Success { reason: SuccessReason, @@ -56,7 +56,7 @@ pub enum ExecutionResult { }, } -impl ExecutionResult { +impl ExecutionResult { /// Returns if transaction execution is successful. /// /// 1 indicates success, 0 indicates revert. @@ -67,7 +67,7 @@ impl ExecutionResult { } /// Maps a `DBError` to a new error type using the provided closure, leaving other variants unchanged. - pub fn map_haltreason(self, op: F) -> ExecutionResult + pub fn map_haltreason(self, op: F) -> ExecutionResult where F: FnOnce(HaltReasonT) -> OHR, { diff --git a/crates/interpreter/src/instruction_result.rs b/crates/interpreter/src/instruction_result.rs index 8e4b02dfdf..0da3ad5305 100644 --- a/crates/interpreter/src/instruction_result.rs +++ b/crates/interpreter/src/instruction_result.rs @@ -1,6 +1,6 @@ use context_interface::{ journaled_state::TransferError, - result::{HaltReason, HaltReasonTrait, OutOfGasError, SuccessReason}, + result::{HaltReason, OutOfGasError, SuccessReason}, }; use core::fmt::Debug; @@ -262,7 +262,7 @@ pub enum InternalResult { } #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] -pub enum SuccessOrHalt { +pub enum SuccessOrHalt { Success(SuccessReason), Revert, Halt(HaltReasonT), @@ -270,7 +270,7 @@ pub enum SuccessOrHalt { Internal(InternalResult), } -impl SuccessOrHalt { +impl SuccessOrHalt { /// Returns true if the transaction returned successfully without halts. #[inline] pub fn is_success(self) -> bool { @@ -308,13 +308,13 @@ impl SuccessOrHalt { } } -impl From for SuccessOrHalt { +impl> From for SuccessOrHalt { fn from(reason: HaltReason) -> Self { SuccessOrHalt::Halt(reason.into()) } } -impl From for SuccessOrHalt { +impl> From for SuccessOrHalt { fn from(result: InstructionResult) -> Self { match result { InstructionResult::Continue => Self::Internal(InternalResult::InternalContinue), // used only in interpreter loop