Skip to content

Commit

Permalink
fix merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
poopoothegorilla committed Feb 27, 2024
1 parent a971f4f commit f0dd523
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/chains/evm/client/erroring_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (e *erroringNode) CallContract(ctx context.Context, msg ethereum.CallMsg, b
}

func (e *erroringNode) PendingCallContract(ctx context.Context, msg ethereum.CallMsg) ([]byte, error) {
return nil, errors.New(e.errMsg)
return nil, pkgerrors.New(e.errMsg)
}

func (e *erroringNode) CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/client/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func (s *SendError) IsCanceled() bool {
if s.err == nil {
return false
}
return errors.Is(s.err, context.Canceled)
return pkgerrors.Is(s.err, context.Canceled)
}

func NewFatalSendError(e error) *SendError {
Expand Down

0 comments on commit f0dd523

Please sign in to comment.