Skip to content

Commit

Permalink
Merge pull request sigp#6 from paulhauner/opt-cond-merge
Browse files Browse the repository at this point in the history
Fix merge conflict
  • Loading branch information
ethDreamer authored Mar 1, 2022
2 parents 8a6c32b + 2440614 commit 760e69a
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions consensus/proto_array/src/proto_array_fork_choice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ pub enum ExecutionStatus {
}

impl ExecutionStatus {
pub fn is_valid(&self) -> bool {
matches!(self, ExecutionStatus::Valid(_))
}

pub fn is_execution_enabled(&self) -> bool {
!matches!(self, ExecutionStatus::Irrelevant(_))
}
Expand Down

0 comments on commit 760e69a

Please sign in to comment.