PR 736: suggestions pt4 #774
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
added 4 commits
June 1, 2021 15:50
• renamed method `AggregatedSignatures.CollectChunksWithMissingApprovals` to `ChunksWithoutAggregatedSignature()` • shifted the location of a few lines of code
• renamed internal variable
…ve crypto verifications
…ls are required; • ApprovalCollector: using consistently uint64 to refer to chunk indices and related quantities; • sealing.Engine: separated logic for creating inbound queues for trusted inputs from message handler for untrusted inputs;
AlexHentschel
commented
Jun 2, 2021
Comment on lines
+68
to
+72
| // pre-select all authorized verifiers at the block that is being sealed | ||
| authorizedApprovers, err := authorizedVerifiersAtBlock(state, result.BlockID) | ||
| if err != nil { | ||
| return nil, engine.NewInvalidInputErrorf("could not determine authorized verifiers for sealing candidate: %w", err) | ||
| } |
There was a problem hiding this comment.
I just shifted this code up. Thereby, we are initializing the dependencies of AssignmentCollector first and subsequently the struct itself.
AlexHentschel
commented
Jun 2, 2021
| // * have the Verification role and | ||
| // * have _positive_ weight and | ||
| // * are not ejected | ||
| func (ac *AssignmentCollector) authorizedVerifiersAtBlock(blockID flow.Identifier) (map[flow.Identifier]*flow.Identity, error) { |
There was a problem hiding this comment.
- I removed the pointer receiver, which allows to compute
authorizedVerifiersAtBlockbefore initializing theAssignmentCollector. - As this method is now not part of
AssignmentCollector, I moved it to the end of the file
AlexHentschel
commented
Jun 2, 2021
Comment on lines
+269
to
+274
| // we have this approval cached already, no need to process it again | ||
| approvalCacheID := approval.Body.PartialID() | ||
| if cached := ac.verifiedApprovalsCache.Get(approvalCacheID); cached != nil { | ||
| return nil | ||
| } | ||
|
|
There was a problem hiding this comment.
checks first whether an approval is already cached and drops duplicates, before doing expensive crypto verifications
AlexHentschel
commented
Jun 2, 2021
| pendingIncorporatedResults *fifoqueue.FifoQueue | ||
| notifier engine.Notifier | ||
| messageHandler *engine.MessageHandler | ||
| requiredApprovalsForSealConstruction uint |
There was a problem hiding this comment.
removed struct field requiredApprovalsForSealConstruction as the value is only needed at construction time
AlexHentschel
commented
Jun 2, 2021
Comment on lines
+96
to
+101
| err = e.setupTrustedInboundQueues() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not initialize message handler: %w", err) | ||
| return nil, fmt.Errorf("initialization of inbound queues for trusted inputs failed: %w", err) | ||
| } | ||
|
|
||
| err = e.setupMessageHandler(options.RequiredApprovalsForSealConstruction) |
There was a problem hiding this comment.
separated logic for creating inbound queues for trusted inputs from message handler for untrusted inputs
durkmurder
deleted the
alex/5417-approval-processing-engine_-_suggestions_pt4
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.
AggregatedSignatures.CollectChunksWithMissingApprovalstoChunksWithoutAggregatedSignature()matching.Coreto be more specific: the executed block is now calledexecutedBlockAssignmentCollectornow checks first whether an approval is already cached and drops duplicates, before doing expensive crypto verificationsApprovalCollectoruint64to refer to chunk indices and related quantities;sealing.Engine:requiredApprovalsForSealConstructionas the value is only needed at construction time