Remove deprecated collator-related code in cumulus#9662
Merged
bkchr merged 30 commits intoparitytech:masterfrom Sep 12, 2025
Merged
Remove deprecated collator-related code in cumulus#9662bkchr merged 30 commits intoparitytech:masterfrom
bkchr merged 30 commits intoparitytech:masterfrom
Conversation
bkchr
reviewed
Sep 8, 2025
bkchr
approved these changes
Sep 9, 2025
skunert
reviewed
Sep 9, 2025
auto-merge was automatically disabled
September 9, 2025 15:51
Head branch was pushed to by a user without write access
Contributor
Author
|
Once #9695 gets merged, will merge the changes here. |
Contributor
Author
|
@lrubasze since you fixed the flakiness and enabled the |
skunert
reviewed
Sep 12, 2025
skunert
approved these changes
Sep 12, 2025
bkchr
approved these changes
Sep 12, 2025
lrubasze
reviewed
Sep 12, 2025
Merged
via the queue into
paritytech:master
with commit Sep 12, 2025
136b4cb
258 of 262 checks passed
alvicsam
pushed a commit
that referenced
this pull request
Oct 17, 2025
Removes collator-related code in cumulus, which has been deprecated for a long time. Removes an old test, which was adapted in paritytech/cumulus#480 and duplicated by https://github.com/paritytech/polkadot-sdk/blob/acac0127168dac1d603e4d996cb210ceeddeb5de/substrate/client/block-builder/src/lib.rs#L389-L415 ## PoV Recovery Test Updates Updates the PoV recovery test (`cumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs`) to use a more realistic consensus mechanism: ### Changes Made - **Removed**: `--use-null-consensus` flag from test configuration ### Rationale **Previous behavior** (with null consensus): - Nodes operated without real block production - PoV recovery mechanisms triggered more frequently - Created artificial test conditions that don't reflect production scenarios **New behavior** (with actual consensus): - Nodes produce blocks normally but don't announce them to peers - PoV recovery occurs at a more realistic frequency - Better simulates real-world network conditions where blocks may be missed ### Impact This change makes the test **more representative** of actual network conditions while maintaining the core functionality being tested. ## Follow-up Remove the following lines: https://github.com/paritytech/polkadot-sdk/blob/4acb964059a218be9bac954b4e3803b78b5526bf/cumulus/pallets/parachain-system/src/lib.rs#L993-L994 ## Review notes I recommend enabling `Hide whitespace` option when reviewing the changes: <img width="300" alt="image" src="https://github.com/user-attachments/assets/41f137af-c0b9-435e-af1e-84e51cbdfa23" />
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
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.
Removes collator-related code in cumulus, which has been deprecated for a long time.
Removes an old test, which was adapted in paritytech/cumulus#480 and duplicated by
polkadot-sdk/substrate/client/block-builder/src/lib.rs
Lines 389 to 415 in acac012
PoV Recovery Test Updates
Updates the PoV recovery test (
cumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs) to use a more realistic consensus mechanism:Changes Made
--use-null-consensusflag from test configurationRationale
Previous behavior (with null consensus):
New behavior (with actual consensus):
Impact
This change makes the test more representative of actual network conditions while maintaining the core functionality being tested.
Follow-up
Remove the following lines:
polkadot-sdk/cumulus/pallets/parachain-system/src/lib.rs
Lines 993 to 994 in 4acb964
Review notes
I recommend enabling
Hide whitespaceoption when reviewing the changes: