merge queue: embarking unstable (b781227) and #9327 together#9392
Closed
mergify[bot] wants to merge 7 commits into
Closed
merge queue: embarking unstable (b781227) and #9327 together#9392mergify[bot] wants to merge 7 commits into
mergify[bot] wants to merge 7 commits into
Conversation
Reshape BlockProcessingResult from the AC-verdict-passthrough
Ok/Err/Ignored enum to Imported(info) | Error { penalty, reason }. The
producer (network_beacon_processor) translates beacon-chain
Result<AvailabilityProcessingStatus, BlockError> into this shape via a
new classify_processing_result(), so the consumer only has to resolve
the symbolic WhichPeerToPenalize against an in-scope PeerGroup.
- New WhichPeerToPenalize { BlockPeer, CustodyPeerForColumn(u64) } with
an `apply(action, &peer_group, reason, cx)` helper. Penalty policy
lives once in classify_processing_result instead of being duplicated
across consumer arms.
- Producer emits stable identifiers via two const modules
(processing_result_info, processing_result_reason) so producer and
consumer never trade ad-hoc string literals.
- Ignored becomes Error { penalty: None, reason: "processor_overloaded" }
with a producer-side warn!; the consumer drops the lookup as before.
- DuplicateFullyImported and GenesisBlock map to Imported (which makes
the consumer's "successfully imported" branch fall out naturally and
removes the per-BlockError policy block — net -88 lines in mod.rs).
- on_processing_result_inner now captures the downloaded block's
parent_root up-front, before borrowing request_state mutably, so the
parent_unknown branch keeps working for any R.
Test rig: three tests construct the new variants directly. Extracted
from #9155 (gloas-lookup-sync) onto bare sigp/unstable.
Conflict resolutions: - network_beacon_processor/mod.rs: keep BlockProcessingResult re-export; drop unused FixedBlobSidecarList import (removed upstream). - sync/block_lookups/mod.rs: keep PR's classified BlockProcessingResult handling (Imported/ParentUnknown/Error); discard old BlockError match. - sync/tests/lookups.rs: drop the two new blob crypto-failure tests; blob lookup sync was deprecated/removed upstream (#9383), deleting the corrupt_last_blob_* helpers they relied on. Column equivalents remain. - sync_methods.rs: drop BlockError::BlobNotRequired arm (variant removed upstream) from the exhaustive penalty match.
|
|
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 (b781227) and #9327 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #9327.
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