Skip to content

Strengthen scheduler tests against preexisting tasks in agenda #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rockbmb merged 14 commits into from
Dec 2, 2025
Merged

Strengthen scheduler tests against preexisting tasks in agenda #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
65c5413
Draft PoC of scheduler fix
rockbmb Nov 21, 2025
46d6855
Merge branch 'master' into scheduler-fix
rockbmb Nov 25, 2025
363b4fa
Avoid `agenda[0]` antipattern in some scheduler tests
rockbmb Nov 25, 2025
29e5636
Bump known good block numbers
rockbmb Nov 26, 2025
f672ed8
Add more tests to named task cancellation
rockbmb Nov 27, 2025
9985755
Remove unsafe agenda access from named delayed task test
rockbmb Nov 27, 2025
dd452db
Refactor more scheduler tests to avoid `agenda[0]` antipattern
rockbmb Nov 28, 2025
830e30d
Refactor missing scheduler tests: retry & its cancellation
rockbmb Nov 28, 2025
377364f
Add test to named task cancellation (anonymously)
rockbmb Nov 28, 2025
a74be7f
Test scheduling with full agenda
rockbmb Dec 1, 2025
8105071
Test rescheduling to full block
rockbmb Dec 1, 2025
d0a2398
test rescheduling of anonymous task to full agenda
rockbmb Dec 1, 2025
fb56040
Merge branch 'master' into scheduler-fix
rockbmb Dec 1, 2025
a685301
Add missing note to remaining `agenda[0]` accesses
rockbmb Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 54 additions & 44 deletions packages/kusama/src/__snapshots__/assetHubKusama.scheduler.e2e.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,50 +40,6 @@ exports[`Kusama Asset Hub Scheduler > cancel scheduled task with wrong origin >
]
`;

exports[`Kusama Asset Hub Scheduler > cancelling a named scheduled task is possible > events for scheduled task cancellation 1`] = `
[
{
"data": {
"index": 0,
"when": "(redacted)",
},
"method": "Canceled",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

exports[`Kusama Asset Hub Scheduler > cancelling a scheduled task is possible > events for scheduled task cancellation 1`] = `
[
{
"data": {
"index": 0,
"when": "(redacted)",
},
"method": "Canceled",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

exports[`Kusama Asset Hub Scheduler > execution of scheduled preimage lookup call works > events for scheduled lookup-task execution 1`] = `
[
{
Expand Down Expand Up @@ -206,6 +162,24 @@ exports[`Kusama Asset Hub Scheduler > scheduling a call is possible, and the cal
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down Expand Up @@ -253,6 +227,24 @@ exports[`Kusama Asset Hub Scheduler > scheduling a named call is possible, and t
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down Expand Up @@ -483,6 +475,24 @@ exports[`Kusama Asset Hub Scheduler > scheduling a task after a delay is possibl
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down
98 changes: 54 additions & 44 deletions packages/polkadot/src/__snapshots__/assetHubPolkadot.scheduler.e2e.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,50 +40,6 @@ exports[`Polkadot Asset Hub Scheduler > cancel scheduled task with wrong origin
]
`;

exports[`Polkadot Asset Hub Scheduler > cancelling a named scheduled task is possible > events for scheduled task cancellation 1`] = `
[
{
"data": {
"index": 0,
"when": "(redacted)",
},
"method": "Canceled",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

exports[`Polkadot Asset Hub Scheduler > cancelling a scheduled task is possible > events for scheduled task cancellation 1`] = `
[
{
"data": {
"index": 0,
"when": "(redacted)",
},
"method": "Canceled",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

exports[`Polkadot Asset Hub Scheduler > execution of scheduled preimage lookup call works > events for scheduled lookup-task execution 1`] = `
[
{
Expand Down Expand Up @@ -206,6 +162,24 @@ exports[`Polkadot Asset Hub Scheduler > scheduling a call is possible, and the c
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down Expand Up @@ -253,6 +227,24 @@ exports[`Polkadot Asset Hub Scheduler > scheduling a named call is possible, and
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down Expand Up @@ -483,6 +475,24 @@ exports[`Polkadot Asset Hub Scheduler > scheduling a task after a delay is possi
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down
98 changes: 54 additions & 44 deletions packages/polkadot/src/__snapshots__/collectivesPolkadot.scheduler.e2e.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,50 +40,6 @@ exports[`Collectives Polkadot Scheduler E2E tests > cancel scheduled task with w
]
`;

exports[`Collectives Polkadot Scheduler E2E tests > cancelling a named scheduled task is possible > events for scheduled task cancellation 1`] = `
[
{
"data": {
"index": 0,
"when": "(redacted)",
},
"method": "Canceled",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

exports[`Collectives Polkadot Scheduler E2E tests > cancelling a scheduled task is possible > events for scheduled task cancellation 1`] = `
[
{
"data": {
"index": 0,
"when": "(redacted)",
},
"method": "Canceled",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

exports[`Collectives Polkadot Scheduler E2E tests > execution of scheduled preimage lookup call works > events for scheduled lookup-task execution 1`] = `
[
{
Expand Down Expand Up @@ -206,6 +162,24 @@ exports[`Collectives Polkadot Scheduler E2E tests > scheduling a call is possibl
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down Expand Up @@ -253,6 +227,24 @@ exports[`Collectives Polkadot Scheduler E2E tests > scheduling a named call is p
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down Expand Up @@ -483,6 +475,24 @@ exports[`Collectives Polkadot Scheduler E2E tests > scheduling a task after a de
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
{
"data": {
"id": null,
"result": "Ok",
"task": "(redacted)",
},
"method": "Dispatched",
"section": "scheduler",
},
]
`;

Expand Down
12 changes: 1 addition & 11 deletions packages/shared/src/helpers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,19 +144,9 @@ export async function scheduleCallListWithOrigin(
)
.exhaustive()

const agenda = [
[
[scheduledBlock],
calls.map(({ call, origin }) => ({
call,
origin,
})),
],
]

await client.dev.setStorage({
Scheduler: {
agenda: agenda,
agenda: [[[scheduledBlock], calls]],
},
})
}
Expand Down
Loading