Simplify startEvaluator()
#2812
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
Codecov Report
@@ Coverage Diff @@
## master #2812 +/- ##
=======================================
Coverage 47.11% 47.11%
=======================================
Files 349 349
Lines 56424 56424
=======================================
+ Hits 26582 26583 +1
- Misses 26865 26868 +3
+ Partials 2977 2973 -4
Continue to review full report at Codecov.
|
ledger/eval.go
Outdated
| @@ -383,20 +383,32 @@ func (l *Ledger) StartEvaluator(hdr bookkeeping.BlockHeader, paysetHint int) (*B | |||
| } | |||
|
|
|||
| func startEvaluator(l ledgerForEvaluator, hdr bookkeeping.BlockHeader, proto config.ConsensusParams, paysetHint int, validate bool, generate bool) (*BlockEvaluator, error) { | |||
| if hdr.Round == 0 { | |||
| return nil, fmt.Errorf("cannot start evaluator for round 0") | |||
There was a problem hiding this comment.
create global constant error using errors.New(), and use it here.
ledger/eval.go
Outdated
Comment on lines
429
to
432
| prevProto, ok := config.Consensus[prevHeader.CurrentProtocol] | ||
| if !ok { | ||
| return nil, protocol.Error(prevHeader.CurrentProtocol) | ||
| } |
There was a problem hiding this comment.
move this section right after
prevHeader, err := l.BlockHdr(hdr.Round - 1)
if err != nil {
return nil, fmt.Errorf(
"can't evaluate block %v without previous header: %v", hdr.Round, err)
}for further clarity. also, fix %v -> %d for the round number.
tsachiherman
suggested changes
Aug 30, 2021
|
I personally do not see any value in this change. |
winder
reviewed
Aug 30, 2021
|
I tried using it for Indexer for round 0, I got an error. It's probably in
|
tsachiherman
approved these changes
Aug 30, 2021
Merged
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.
Summary
The current code creates an impression that the evaluator can be used for round 0 which is not true. This PR simplifies the code, so this is more evident.
Test Plan
Relying on existing tests.