Move cumulus zombienet tests to aura & async backing by skunert · Pull Request #3568 · paritytech/polkadot-sdk

skunert · 2024-03-04T18:15:52Z

Cumulus test-parachain node and test runtime were still using relay chain consensus and 12s blocktimes. With async backing around the corner on the major chains we should switch our tests too.

Also needed to nicely test the changes coming to collators in #3168.

Changes Overview

Followed the migration guide for async backing for the cumulus-test-runtime
Adjusted the cumulus-test-service to use the correct import-queue, lookahead collator etc.
The block validation function now uses the Aura Ext Executor so that the seal of the block is validated
Previous point requires that we seal block before calling into validate_block, I introduced a helper function for that
Test client adjusted to provide a slot to the relay chain proof and the aura pre-digest

paritytech-cicd-pr · 2024-03-20T10:03:40Z

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: cargo-clippy
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/5582639

lexnv · 2024-04-02T15:12:33Z

cumulus/client/consensus/common/src/tests.rs


 #[test]
 fn restore_limit_monitor() {
+	sp_tracing::try_init_simple();


dq: Was this used for debugging?

lexnv

LGTM based on my limited knowledge of cumulus testing 👍

cumulus/test/client/src/block_builder.rs

cumulus/test/service/src/lib.rs

cumulus/pallets/parachain-system/src/validate_block/tests.rs

bkchr

Some small nitpicks, otherwise looks good.

cumulus/test/service/src/lib.rs

cumulus/test/runtime/src/lib.rs

cumulus/test/runtime/Cargo.toml

skunert · 2024-04-09T13:56:50Z

Hmm this breaks our warpsync zombienet test, I will generate new snapshots.

Part of #3168 On top of #3568 ### Changes Overview - Introduces a new collator variant in `cumulus/client/consensus/aura/src/collators/slot_based/mod.rs` - Two tasks are part of that module, one for block building and one for collation building and submission. - Introduces a new variant of `cumulus-test-runtime` which has 2s slot duration, used for zombienet testing - Zombienet tests for the new collator **Note:** This collator is considered experimental and should only be used for testing and exploration for now. ### Comparison with `lookahead` collator - The new variant is slot based, meaning it waits for the next slot of the parachain, then starts authoring - The search for potential parents remains mostly unchanged from lookahead - As anchor, we use the current best relay parent - In general, the new collator tends to be anchored to one relay parent earlier. `lookahead` generally waits for a new relay block to arrive before it attempts to build a block. This means the actual timing of parachain blocks depends on when the relay block has been authored and imported. With the slot-triggered approach we are authoring directly on the slot boundary, were a new relay chain block has probably not yet arrived. ### Limitations - Overall, the current implementation focuses on the "happy path" - We assume that we want to collate close to the tip of the relay chain. It would be useful however to have some kind of configurable drift, so that we could lag behind a bit. #3965 - The collation task is pretty dumb currently. It checks if we have cores scheduled and if yes, submits all the messages we have received from the block builder until we have something submitted for every core. Ideally we should do some extra checks, i.e. we do not need to submit if the built block is already too old (build on a out of range relay parent) or was authored with a relay parent that is not an ancestor of the relay block we are submitting at. #3966 - There is no throttling, we assume that we can submit _velocity_ blocks every relay chain block. There should be communication between the collator task and block-builder task. - The parent search and ConsensusHook are not yet properly adjusted. The parent search makes assumptions about the pending candidate which no longer hold. #3967 - Custom triggers for block building not implemented. --------- Co-authored-by: Davide Galassi <davxy@datawok.net> Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Javier Viola <363911+pepoviola@users.noreply.github.com> Co-authored-by: command-bot <>

Part of paritytech#3168 On top of paritytech#3568 ### Changes Overview - Introduces a new collator variant in `cumulus/client/consensus/aura/src/collators/slot_based/mod.rs` - Two tasks are part of that module, one for block building and one for collation building and submission. - Introduces a new variant of `cumulus-test-runtime` which has 2s slot duration, used for zombienet testing - Zombienet tests for the new collator **Note:** This collator is considered experimental and should only be used for testing and exploration for now. ### Comparison with `lookahead` collator - The new variant is slot based, meaning it waits for the next slot of the parachain, then starts authoring - The search for potential parents remains mostly unchanged from lookahead - As anchor, we use the current best relay parent - In general, the new collator tends to be anchored to one relay parent earlier. `lookahead` generally waits for a new relay block to arrive before it attempts to build a block. This means the actual timing of parachain blocks depends on when the relay block has been authored and imported. With the slot-triggered approach we are authoring directly on the slot boundary, were a new relay chain block has probably not yet arrived. ### Limitations - Overall, the current implementation focuses on the "happy path" - We assume that we want to collate close to the tip of the relay chain. It would be useful however to have some kind of configurable drift, so that we could lag behind a bit. paritytech#3965 - The collation task is pretty dumb currently. It checks if we have cores scheduled and if yes, submits all the messages we have received from the block builder until we have something submitted for every core. Ideally we should do some extra checks, i.e. we do not need to submit if the built block is already too old (build on a out of range relay parent) or was authored with a relay parent that is not an ancestor of the relay block we are submitting at. paritytech#3966 - There is no throttling, we assume that we can submit _velocity_ blocks every relay chain block. There should be communication between the collator task and block-builder task. - The parent search and ConsensusHook are not yet properly adjusted. The parent search makes assumptions about the pending candidate which no longer hold. paritytech#3967 - Custom triggers for block building not implemented. --------- Co-authored-by: Davide Galassi <davxy@datawok.net> Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Javier Viola <363911+pepoviola@users.noreply.github.com> Co-authored-by: command-bot <>

skunert added 2 commits March 4, 2024 19:06

Make cumulus test runtime async

9ec508f

Format cargo.toml

f53bbf6

skunert added R0-no-crate-publish-required The change does not require any crates to be re-published. T9-cumulus This PR/Issue is related to cumulus. T10-tests This PR/Issue is related to tests. labels Mar 4, 2024

skunert added 8 commits March 4, 2024 23:44

Adjust "experimental" feature

50112c4

Once more

70e0115

Adjust cumulus test client to aura

774bae5

Introduce seal to test

c6ac52e

Fix consensus-common tests

56b8a63

Merge branch 'master' into skunert/test-runtime-async

422ee2e

Move sealing to test client

7881598

Benches

c44cf26

Clippy

aed676e

skunert requested a review from a team March 20, 2024 13:59

skunert marked this pull request as ready for review March 20, 2024 13:59

skunert added 4 commits March 20, 2024 23:18

Remove unused dep

bfeaec6

Merge branch 'master' into skunert/test-runtime-async

3f8ce25

Merge branch 'master' into skunert/test-runtime-async

c9102e0

Merge branch 'master' into skunert/test-runtime-async

4544183

lexnv reviewed Apr 2, 2024

View reviewed changes

lexnv approved these changes Apr 2, 2024

View reviewed changes

Merge branch 'master' into skunert/test-runtime-async

aa96d90

skunert mentioned this pull request Apr 3, 2024

Introduce basic slot-based collator #3963

Closed

1 task

michalkucharczyk reviewed Apr 3, 2024

View reviewed changes

cumulus/test/client/src/block_builder.rs Outdated Show resolved Hide resolved

michalkucharczyk reviewed Apr 3, 2024

View reviewed changes

cumulus/test/service/src/lib.rs Show resolved Hide resolved

michalkucharczyk reviewed Apr 3, 2024

View reviewed changes

cumulus/pallets/parachain-system/src/validate_block/tests.rs Outdated Show resolved Hide resolved

michalkucharczyk approved these changes Apr 3, 2024

View reviewed changes

michalkucharczyk requested a review from a team April 3, 2024 14:21

bkchr approved these changes Apr 3, 2024

View reviewed changes

cumulus/test/service/src/lib.rs Outdated Show resolved Hide resolved

cumulus/test/runtime/src/lib.rs Outdated Show resolved Hide resolved

cumulus/test/runtime/src/lib.rs Outdated Show resolved Hide resolved

cumulus/test/runtime/Cargo.toml Outdated Show resolved Hide resolved

skunert added 3 commits April 8, 2024 16:14

Introduce struct as block builder return value

6bfe7a1

Remove unused pallets/remove aura "experimental"

407ba58

Merge branch 'master' into skunert/test-runtime-async

2fe9eb6

skunert requested a review from a team as a code owner April 8, 2024 14:50

skunert added 2 commits April 8, 2024 17:11

fmt

d3869f1

Merge branch 'master' into skunert/test-runtime-async

1b6155e

Use new snapshots for warp sync test

7295e00

skunert added this pull request to the merge queue Apr 9, 2024

Merged via the queue into paritytech:master with commit df818d2 Apr 9, 2024

skunert deleted the skunert/test-runtime-async branch April 9, 2024 20:18

skunert restored the skunert/test-runtime-async branch April 10, 2024 07:20

skunert mentioned this pull request Apr 12, 2024

Introduce basic slot-based collator #4097

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move cumulus zombienet tests to aura & async backing#3568

Move cumulus zombienet tests to aura & async backing#3568
skunert merged 22 commits intoparitytech:masterfrom
skunert:skunert/test-runtime-async

skunert commented Mar 4, 2024 •

edited

Loading

Uh oh!

paritytech-cicd-pr commented Mar 20, 2024

Uh oh!

lexnv Apr 2, 2024

Uh oh!

lexnv left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkchr left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

skunert commented Apr 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

skunert commented Mar 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Overview

Uh oh!

paritytech-cicd-pr commented Mar 20, 2024

Uh oh!

lexnv Apr 2, 2024

Choose a reason for hiding this comment

Uh oh!

lexnv left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkchr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

skunert commented Apr 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

skunert commented Mar 4, 2024 •

edited

Loading