chore: relax halt reason bounds (#2041)

bluealloy · Jan 31, 2025 · 83a3087 · 83a3087
1 parent 5407d7a
commit 83a3087
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/crates/context/interface/src/result.rs b/crates/context/interface/src/result.rs
@@ -14,16 +14,16 @@ impl<HaltReasonT> HaltReasonTrait for HaltReasonT where
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct ResultAndState<HaltReasonT: HaltReasonTrait = HaltReason> {
+pub struct ResultAndState<HaltReasonT = HaltReason> {
     /// Status of execution
     pub result: ExecutionResult<HaltReasonT>,
     /// State that got updated
     pub state: EvmState,
 }
 
-impl<HaltReasonT: HaltReasonTrait> ResultAndState<HaltReasonT> {
+impl<HaltReasonT> ResultAndState<HaltReasonT> {
     /// Maps a `DBError` to a new error type using the provided closure, leaving other variants unchanged.
-    pub fn map_haltreason<F, OHR: HaltReasonTrait>(self, op: F) -> ResultAndState<OHR>
+    pub fn map_haltreason<F, OHR>(self, op: F) -> ResultAndState<OHR>
     where
         F: FnOnce(HaltReasonT) -> OHR,
     {
@@ -37,7 +37,7 @@ impl<HaltReasonT: HaltReasonTrait> ResultAndState<HaltReasonT> {
 /// Result of a transaction execution
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub enum ExecutionResult<HaltReasonT: HaltReasonTrait = HaltReason> {
+pub enum ExecutionResult<HaltReasonT = HaltReason> {
     /// Returned successfully
     Success {
         reason: SuccessReason,
@@ -56,7 +56,7 @@ pub enum ExecutionResult<HaltReasonT: HaltReasonTrait = HaltReason> {
     },
 }
 
-impl<HaltReasonT: HaltReasonTrait> ExecutionResult<HaltReasonT> {
+impl<HaltReasonT> ExecutionResult<HaltReasonT> {
     /// Returns if transaction execution is successful.
     ///
     /// 1 indicates success, 0 indicates revert.
@@ -67,7 +67,7 @@ impl<HaltReasonT: HaltReasonTrait> ExecutionResult<HaltReasonT> {
     }
 
     /// Maps a `DBError` to a new error type using the provided closure, leaving other variants unchanged.
-    pub fn map_haltreason<F, OHR: HaltReasonTrait>(self, op: F) -> ExecutionResult<OHR>
+    pub fn map_haltreason<F, OHR>(self, op: F) -> ExecutionResult<OHR>
     where
         F: FnOnce(HaltReasonT) -> OHR,
     {

diff --git 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,15 +262,15 @@ pub enum InternalResult {
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum SuccessOrHalt<HaltReasonT: HaltReasonTrait> {
+pub enum SuccessOrHalt<HaltReasonT> {
     Success(SuccessReason),
     Revert,
     Halt(HaltReasonT),
     FatalExternalError,
     Internal(InternalResult),
 }
 
-impl<HaltReasonT: HaltReasonTrait> SuccessOrHalt<HaltReasonT> {
+impl<HaltReasonT> SuccessOrHalt<HaltReasonT> {
     /// Returns true if the transaction returned successfully without halts.
     #[inline]
     pub fn is_success(self) -> bool {
@@ -308,13 +308,13 @@ impl<HaltReasonT: HaltReasonTrait> SuccessOrHalt<HaltReasonT> {
     }
 }
 
-impl<HALT: HaltReasonTrait> From<HaltReason> for SuccessOrHalt<HALT> {
+impl<HALT: From<HaltReason>> From<HaltReason> for SuccessOrHalt<HALT> {
     fn from(reason: HaltReason) -> Self {
         SuccessOrHalt::Halt(reason.into())
     }
 }
 
-impl<HaltReasonT: HaltReasonTrait> From<InstructionResult> for SuccessOrHalt<HaltReasonT> {
+impl<HaltReasonT: From<HaltReason>> From<InstructionResult> for SuccessOrHalt<HaltReasonT> {
     fn from(result: InstructionResult) -> Self {
         match result {
             InstructionResult::Continue => Self::Internal(InternalResult::InternalContinue), // used only in interpreter loop