sync: coreth PR #1303 style: Use require.ErrorIs whenever possible #1875
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alarso16
reviewed
Nov 25, 2025
| // "your custom test name": { | ||
| // Config: NewConfig(utils.NewUint64(3), {{- if .Contract.AllowList}} admins, enableds, managers{{- end}}), | ||
| // ExpectedError: ErrYourCustomError.Error(), | ||
| // WantError: ErrYourCustomError, |
Contributor
There was a problem hiding this comment.
Will this break dependent users?
|
|
||
| var ErrCannotAddManagersBeforeDurango = errors.New("cannot add managers before Durango") | ||
| var ( | ||
| ErrAdminAndEnabledAddress = errors.New("cannot set address as both admin and enabled") |
Contributor
There was a problem hiding this comment.
Do these all need exported?
Comment on lines
59
to
63
| if oldErr != nil { | ||
| require.ErrorContains(err, oldErr.Error()) | ||
| require.ErrorIs(err, oldErr) | ||
| } else { | ||
| require.NoError(err) | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if oldErr != nil { | |
| require.ErrorContains(err, oldErr.Error()) | |
| require.ErrorIs(err, oldErr) | |
| } else { | |
| require.NoError(err) | |
| } | |
| require.ErrorIs(err, oldErr) |
| _, err := allowListTest.DeployContract(unprivileged) | ||
| // The error returned is a JSON Error rather than the vm.ErrExecutionReverted error | ||
| require.ErrorContains(t, err, vm.ErrExecutionReverted.Error()) | ||
| // The error returned is actually a JSON Error |
Contributor
There was a problem hiding this comment.
The other comment was more informative, and more accurately describes why we need the nolint clause than "uses upstream code"
| unpacked, err := UnpackGetFeeConfigOutput(test.input, test.skipLenCheck) | ||
| if test.expectedErr != "" { | ||
| require.ErrorContains(t, err, test.expectedErr) | ||
| require.ErrorContains(t, err, test.expectedErr) //nolint:forbidigo // uses upstream code |
Contributor
There was a problem hiding this comment.
In my opinion, you should wrap the error returned by UnpackGetFeeConfigOutput and check for that error
| unpacked, err2 := UnpackSetFeeConfigInput(input, true) | ||
| if err != nil { | ||
| require.ErrorContains(t, err2, err.Error()) | ||
| require.Equal(t, err.Error(), err2.Error()) |
Comment on lines
337
to
341
| if err != nil { | ||
| require.ErrorContains(t, err2, err.Error()) | ||
| require.ErrorIs(t, err2, err) | ||
| return | ||
| } | ||
| require.NoError(t, err2) |
Contributor
There was a problem hiding this comment.
Suggested change
| if err != nil { | |
| require.ErrorContains(t, err2, err.Error()) | |
| require.ErrorIs(t, err2, err) | |
| return | |
| } | |
| require.NoError(t, err2) | |
| require.ErrorIs(t, err2, err) | |
| if err != nil { | |
| return | |
| } |
this applies to to whole file
| unpackedAddress, unpackedAmount, err := UnpackMintNativeCoinInput(test.input, test.strictMode) | ||
| if test.expectedErr != "" { | ||
| require.ErrorContains(t, err, test.expectedErr) | ||
| require.ErrorContains(t, err, test.expectedErr) //nolint:forbidigo // uses upstream code |
Contributor
There was a problem hiding this comment.
Again, you should be able to fix this
Comment on lines
146
to
150
| if err != nil { | ||
| require.ErrorContains(t, err2, err.Error()) | ||
| require.ErrorIs(t, err2, err) | ||
| return | ||
| } | ||
| require.NoError(t, err2) |
Contributor
There was a problem hiding this comment.
You can remove the NoError by moving the ErrorIs outside of the if statement
|
|
||
| var ( | ||
| _ Backend = (*backend)(nil) | ||
| ErrValidateBlock = errors.New("failed to validate block message") |
Contributor
There was a problem hiding this comment.
Why do these have to be exported?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Syncs ava-labs/coreth#1303