Return Pending rather than loop around if no new finalized hash in submit_transaction #1378
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
lexnv
approved these changes
Jan 18, 2024
niklasad1
reviewed
Jan 18, 2024
niklasad1
approved these changes
Jan 18, 2024
Co-authored-by: Niklas Adolfsson <[email protected]>
lexnv
reviewed
Jan 18, 2024
| // Keep waiting for more finalized blocks until we find it (get rid of any other block refs | ||
| // now, since none of them were what we were looking for anyway). | ||
| // Not found it! If follow ev is pending, then return pending here and wait for | ||
| // a new one to come in, else loop around and see if we get another one immediately. |
There was a problem hiding this comment.
nit: We could probably remove the else blocks to get rid of some extra indentation; up to you 👍
There was a problem hiding this comment.
I did actually think abotu this, but you'd end up with a bit much for my liking in the new else thing eg
let Some((SeenBlockMarker::Finalized, block_ref)) = seen_blocks.remove(hash) else {
seen_blocks.clear();
if follow_ev_is_pending {
return Poll::Pending;
} else {
continue;
}
};
// ..Unless you had another idea? :)
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.
I also brazenly decided to remove the debug logging (though kept the timeout), so that it can run a bit faster again. I'm hoping that it won't pose an issue any more, but ifg it does then we can add more logging back again :)
I had a go at reworkign the code a little to simplify it, but it turned out about the same in the end! I thought about a more state-machine like approach, but it would become very verbose or end up being split across multiple functions etc, so I didn't for now.