Fix stall on unwind in handleForkChoice #3536
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
yperbasis
changed the title
yperbasis
changed the title
Giulio2002
approved these changes
Feb 17, 2022
Giulio2002
reviewed
Feb 17, 2022
| @@ -224,7 +224,7 @@ func (ff *Filters) subscribeToPendingBlocks(ctx context.Context, mining txpool.M | |||
|
|
|||
| func (ff *Filters) HandlePendingBlock(reply *txpool.OnPendingBlockReply) { | |||
| b := &types.Block{} | |||
| if len(reply.RplBlock) == 0 { | |||
| if reply == nil || len(reply.RplBlock) == 0 { | |||
There was a problem hiding this comment.
why not just reply == nil?
There was a problem hiding this comment.
len(reply.RplBlock) == 0 was the previous check, I left it as is. But on my Erigon instance reply was nil during shutdown, thus this 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.
+misc small fixes