[context] tolerate empty candidate name #4562
Merged
Conversation
This file contains 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
dustinxie
requested review from
CoderZhi,
Liuhaai and
envestcc
as code owners
dustinxie
force-pushed
the
emptycandname
branch
from
7b2b201 to
6365554
Compare
CoderZhi
reviewed
Feb 17, 2025
blockchain/block/validator.go
Outdated
Comment on lines
40
to
44
| fCtx := protocol.MustGetFeatureCtx(ctx) | ||
| for err := range errChan { | ||
| return errors.Wrap(err, "failed to validate action") | ||
| if !fCtx.Tolerate(err) { | ||
| return errors.Wrap(err, "failed to validate action") | ||
| } |
There was a problem hiding this comment.
it is inexplicit to handle the error here.
Comment on lines
+314
to
+319
| func (fCtx *FeatureCtx) Tolerate(err error) bool { | ||
| if fCtx.TolerateEmptyCandidateName && errors.Cause(err) == action.ErrInvalidCanName { | ||
| return true | ||
| } | ||
| return false | ||
| } |
There was a problem hiding this comment.
error type shouldn't not be included in a function which doesn't name it's functionality.
is a better place to handle the check
dustinxie
force-pushed
the
emptycandname
branch
from
6365554 to
08ca196
Compare
envestcc
approved these changes
Feb 18, 2025
dustinxie
force-pushed
the
emptycandname
branch
from
08ca196 to
326adf9
Compare
|
CoderZhi
approved these changes
Feb 24, 2025
| @@ -58,7 +58,8 @@ func (v *GenericValidator) Validate(ctx context.Context, selp *action.SealedEnve | |||
| if caller == nil { | |||
| return errors.New("failed to get address") | |||
| } | |||
| if err = selp.Envelope.SanityCheck(); err != nil { | |||
| featureCtx := MustGetFeatureCtx(ctx) | |||
| if err = selp.Envelope.SanityCheck(); err != nil && !featureCtx.Tolerate(err) { | |||
There was a problem hiding this comment.
featureCtx.TolerateEmptyCandidateName && errors.Cause(err) == action.ErrInvalidCanName shouldn't be hidden in a function of FeatureCtx.
There was a problem hiding this comment.
I see, I was thinking in the future may have similar case again, so add a Tolerate for this kind of special case
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.
Description
as title, fix the following bug.
Fixes #4561
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: