merge queue: embarking unstable (c2ac519) and #9391 together#9403
Closed
mergify[bot] wants to merge 13 commits into
Closed
merge queue: embarking unstable (c2ac519) and #9391 together#9403mergify[bot] wants to merge 13 commits into
mergify[bot] wants to merge 13 commits into
Conversation
… classification Combine PR #9327's processing-result classification redesign (BlockProcessingResult becomes Imported/ParentUnknown/Error with producer-side penalty classification in network_beacon_processor) with PR #9155's RequestState trait removal (concrete BlockRequest/DataRequest state machine in single_block_lookup.rs, concrete download/ processing handlers in block_lookups/mod.rs). The common.rs RequestState trait is deleted. ParentUnknown remains reactive (surfaced from the processing result), as in unstable. All gloas constructs are stripped.
…move-request-state-trait # Conflicts: # beacon_node/network/src/network_beacon_processor/sync_methods.rs # beacon_node/network/src/sync/block_lookups/mod.rs # beacon_node/network/src/sync/manager.rs # beacon_node/network/src/sync/tests/lookups.rs
Brings #9391 up to the latest lookup-sync trait-removal work: concrete BlockRequest/DataRequest over the reused SingleLookupRequestState<T> state machine, DataRequestState { WaitingForBlock, Request, NoData } column gating, seen_timestamp forwarding, and diff minimization vs unstable.
Resolves conflicts from #9379 (Delete unnecessary SyncMessage variants): - adopt SyncMessage::UnknownParentSidecarHeader (drop UnknownParentDataColumn/ UnknownParentPartialDataColumn), keeping our unit BlockComponent::Sidecar (parent_root is routed separately to handle_unknown_parent) - keep concrete trait-removal BlockRequest/DataRequestState handlers Also: move DownloadResult back to its unstable position to minimize diff.
DataRequest no longer carries its own PeerSet clone; the column request reads self.peers (the lookup's pool) directly. Also fix the stale 'starts as None' comment on data_request and restore upstream's add_child_components comment.
- drop misleading 'Block request — always present' comment; reword data_request - add_child_components Sidecar: clearer comment (no stale 'blob request state') - drop stale '// None = waiting for block' - fix continue_requests doc state name (AwaitingProcess, not Downloaded) - on_data_processing_result doc: custody columns
Not needed: a zero-hash (genesis parent) search just creates a lookup that fails its download attempts and is dropped. Removes logic not present in unstable; tests pass without it.
|
|
1 similar comment
|
|
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch unstable (c2ac519) and #9391 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #9391.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:#approved-reviews-by >= 1[🛡 GitHub branch protection]check-success=local-testnet-successcheck-success=test-suite-successRequired conditions to stay in the queue:
#approved-reviews-by >= 1#approved-reviews-by >= 1[🛡 GitHub branch protection]check-success=license/clacheck-success=target-branch-checklabel!=do-not-merge