This repository was archived by the owner on Jan 22, 2025. It is now read-only.
Various clean-ups before assert adjustment#13006
Merged
ryoqun merged 2 commits intosolana-labs:masterfrom Oct 21, 2020
Merged
Conversation
ryoqun
commented
Oct 20, 2020
|
|
||
| // return immediately if votes are empty... | ||
| if self.lockouts.votes.is_empty() { | ||
| return Ok(self); |
Contributor
Author
There was a problem hiding this comment.
I didn't like my previous coding (especially regarding the branched-off early bail-out code flow with Ok(_))... Well, I found out that I can steamline these a bit.
ryoqun
commented
Oct 20, 2020
| // Unless we're voting since genesis, slots_in_tower must always be older than last checked_slot | ||
| // including all vote slot and the root slot. | ||
| assert!(*slot_in_tower < checked_slot) | ||
| assert!( |
Contributor
Author
There was a problem hiding this comment.
I'm adding tests before adjusting this assert!.
There was a problem hiding this comment.
Hi! I'm catching this assertion when I'm running a new validator: #13128
ryoqun
commented
Oct 20, 2020
| ); | ||
| } | ||
|
|
||
| #[test] |
Contributor
Author
There was a problem hiding this comment.
I'm adding tests before adjusting this assert!.
ryoqun
commented
Oct 20, 2020
| ); | ||
|
|
||
| blockstore.set_roots(&new_roots)? | ||
| blockstore.set_roots(&new_roots)?; |
Contributor
Author
There was a problem hiding this comment.
oddly enough, clippy and rustfmt doesn't seem to complain this. ;)
Codecov Report
@@ Coverage Diff @@
## master #13006 +/- ##
=======================================
Coverage 81.9% 81.9%
=======================================
Files 361 361
Lines 85272 85308 +36
=======================================
+ Hits 69895 69928 +33
- Misses 15377 15380 +3 |
Contributor
Author
|
@carllin Could you review this? Thanks! |
carllin
reviewed
Oct 20, 2020
| )); | ||
| } | ||
| self.adjust_lockouts_with_slot_history(slot_history)?; | ||
| self.initialize_root(replayed_root); |
Contributor
There was a problem hiding this comment.
cool, I think this looks equivalent to me, much easier to read 😄
carllin
approved these changes
Oct 20, 2020
mergify Bot
pushed a commit
that referenced
this pull request
Oct 21, 2020
* Various clean-ups before assert adjustment * oops (cherry picked from commit efdb560)
CriesofCarrots
pushed a commit
to CriesofCarrots/solana
that referenced
this pull request
Dec 4, 2020
* Various clean-ups before assert adjustment * oops
CriesofCarrots
pushed a commit
to CriesofCarrots/solana
that referenced
this pull request
Dec 4, 2020
* Various clean-ups before assert adjustment * oops
CriesofCarrots
pushed a commit
to CriesofCarrots/solana
that referenced
this pull request
Dec 4, 2020
* Various clean-ups before assert adjustment * oops
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Problem
Well, I've ended up collecting some cleanups I'd like to settle down before #12671.
Summary of Changes
Flush out various cleanups before really introducing assert adjustments for easier review.
This pr should be no functional change.