Delete unnecessary SyncMessage variants#9379
Merged
Merged
Conversation
Replace the two separate sidecar parent-unknown variants
(UnknownParentDataColumn and UnknownParentPartialDataColumn) with a
single header-based variant UnknownParentHeader { peer_id, block_root,
parent_root, slot }. This carries only the header info needed to trigger
a parent lookup, decoupled from the concrete sidecar type.
The two gossip senders (data-column and partial-data-column
ParentUnknown handlers) now emit UnknownParentHeader, and the manager
collapses both handler arms into one. The now-dead
BlockComponent::PartialDataColumn variant (functionally identical to
DataColumn) is removed.
…:Sidecar Use `SyncMessage::UnknownParentSidecarHeader` (was `UnknownParentHeader`) and `BlockComponent::Sidecar` (was `BlockComponent::DataColumn`) for naming consistency with PR 9155. The parent-unknown path is type-agnostic (header-based), so `Sidecar` is the accurate name; `get_type` label updated to "sidecar".
The sidecar parent-unknown path only ever reads the parent root (the
`DownloadResult`'s block_root/seen_timestamp/peer_group were never used, and
`add_child_components` ignores the payload). Replace
`Sidecar(DownloadResult<Hash256>)` with a named-field `Sidecar { parent_root: Hash256 }`.
eserilev
approved these changes
Jun 1, 2026
Merge Queue Status
This pull request spent 2 minutes 26 seconds in the queue, with no time running CI. ReasonThe pull request #9379 has been manually updated HintIf you want to requeue this pull request, you can post a |
Merge Queue Status
This pull request spent 1 hour 22 minutes 5 seconds in the queue, including 45 minutes 18 seconds running CI. Required conditions to merge
|
This was referenced Jun 2, 2026
Open
8 tasks
dapplion
added a commit
to dapplion/lighthouse
that referenced
this pull request
Jun 3, 2026
Resolves conflicts from sigp#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.
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
2 participants
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.
Issue Addressed
Lookup sync does not cache sidecars, so sending the full network object adds unnecessary complexity. Sync only needs to know: We have received a header that has an unknown parent.
Proposed Changes
Replace
UnknownParentDataColumnandUnknownParentPartialDataColumnforUnknownParentSidecarHeader