Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: relax halt reason bounds #2041

Merged
merged 1 commit into from
Jan 31, 2025
Merged

chore: relax halt reason bounds #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crates/context/interface/src/result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
{
Expand All @@ -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,
Expand All @@ -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.
Expand All @@ -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,
{
Expand Down
10 changes: 5 additions & 5 deletions crates/interpreter/src/instruction_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use context_interface::{
journaled_state::TransferError,
result::{HaltReason, HaltReasonTrait, OutOfGasError, SuccessReason},
result::{HaltReason, OutOfGasError, SuccessReason},
};
use core::fmt::Debug;

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
Loading