reuse code from stategen in the justified balance cache #11961
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
potuz
added
Ready For Review
saolyn
reviewed
Feb 2, 2023
Comment on lines
-41
to
-60
| justifiedState, err := c.stateGen.StateByRoot(ctx, justifiedRoot) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if justifiedState == nil || justifiedState.IsNil() { | ||
| return nil, errNilStateFromStategen | ||
| } | ||
| epoch := time.CurrentEpoch(justifiedState) | ||
|
|
||
| justifiedBalances := make([]uint64, justifiedState.NumValidators()) | ||
| var balanceAccumulator = func(idx int, val state.ReadOnlyValidator) error { | ||
| if helpers.IsActiveValidatorUsingTrie(val, epoch) { | ||
| justifiedBalances[idx] = val.EffectiveBalance() | ||
| } else { | ||
| justifiedBalances[idx] = 0 | ||
| } | ||
| return nil | ||
| } | ||
| if err := justifiedState.ReadFromEveryValidator(balanceAccumulator); err != nil { | ||
| return nil, err |
There was a problem hiding this comment.
I am not too familiar with any of this code. Are none of these checks necessary anymore?
There was a problem hiding this comment.
all of that code is duplicated in the function BalanceByRoot, that's the cleanup in this PR
potuz
force-pushed
the
use_stategen_on_justified_balance_cache
branch
from
b57a453 to
895935e
Compare
saolyn
reviewed
Feb 2, 2023
Comment on lines
-144
to
-152
| stateGen: &mockStateByRooter{ | ||
| err: sentinelCacheMiss, | ||
| }, | ||
| root: bytesutil.ToBytes32([]byte{'B'}), | ||
| }, | ||
| err: sentinelCacheMiss, | ||
| root: bytesutil.ToBytes32([]byte{'A'}), | ||
| name: "cache miss", | ||
| }, |
There was a problem hiding this comment.
Did you intend to remove these tests as well?
saolyn
approved these changes
Feb 2, 2023
delete-merged-branch
bot
deleted the
use_stategen_on_justified_balance_cache
branch
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.
Avoid code duplication, this is useful in starting to get rid of the justified balance cache and move to tracking this on forkchoice.