Perform nextpin calculations for both confirmed and rejected messages #1326
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
Fixes hyperledger#1324 Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
awrichar
commented
May 30, 2023
| @@ -481,7 +481,7 @@ func (ag *aggregator) processMessage(ctx context.Context, manifest *core.BatchMa | |||
| default: | |||
| // Check the pin signer is valid for the message | |||
| action, err = ag.checkOnchainConsistency(ctx, msg, pin) | |||
| if action != core.ActionConfirm { | |||
| if action == core.ActionWait || action == core.ActionRetry { | |||
| break | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
This change means that everything from line 487 to line 525 will now run when the action is "reject". The bug was caused by skipping too much of this code in the rejection case.
Codecov Report
@@ Coverage Diff @@
## main #1326 +/- ##
=======================================
Coverage 99.98% 99.98%
=======================================
Files 314 314
Lines 21418 21419 +1
=======================================
+ Hits 21415 21416 +1
Misses 3 3
|
peterbroadhurst
approved these changes
May 31, 2023
There was a problem hiding this comment.
Change looks great. I see where we introduced this in #1251 👍 so this only affects mainline (wanted to double check as it's an important bug fix).
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.
Fixes #1324