pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 03:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scheduler: remove empty agenda on cancel (#12989)

Browse Source 
* Scheduler: remove empty agenda on cancel

* use iter any

* fix benches

* remove trailing None

* Add CleanupAgendas migration

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* fix ci

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Count non-empty agendas in migration

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Muharem Ismailov
2022-12-21 16:25:46 +01:00
committed by GitHub
parent 9cdb920462
commit 4dc62d7e71
4 changed files with 353 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/scheduler/src/tests.rs
+146 -73
View File
@@ -1291,40 +1291,6 @@ fn scheduler_v3_anon_reschedule_works() {
});
}
/// Cancelling a call and then scheduling a second call for the same
/// block results in different addresses.
#[test]
fn scheduler_v3_anon_schedule_does_not_resuse_addr() {
use frame_support::traits::schedule::v3::Anon;
new_test_ext().execute_with(|| {
let call =
RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
// Schedule both calls.
let addr_1 = <Scheduler as Anon<_, _, _>>::schedule(
DispatchTime::At(4),
None,
127,
root(),
Preimage::bound(call.clone()).unwrap(),
)
.unwrap();
// Cancel the call.
assert_ok!(<Scheduler as Anon<_, _, _>>::cancel(addr_1));
let addr_2 = <Scheduler as Anon<_, _, _>>::schedule(
DispatchTime::At(4),
None,
127,
root(),
Preimage::bound(call).unwrap(),
)
.unwrap();
// Should not re-use the address.
assert!(addr_1 != addr_2);
});
}
#[test]
fn scheduler_v3_anon_next_schedule_time_works() {
use frame_support::traits::schedule::v3::Anon;
@@ -1531,45 +1497,6 @@ fn scheduler_v3_anon_reschedule_fills_holes() {
});
}
/// Re-scheduling into the same block produces a different address
/// if there is still space in the agenda.
#[test]
fn scheduler_v3_anon_reschedule_does_not_resuse_addr_if_agenda_not_full() {
use frame_support::traits::schedule::v3::Anon;
let max: u32 = <Test as Config>::MaxScheduledPerBlock::get();
assert!(max > 1, "This test only makes sense for MaxScheduledPerBlock > 1");
new_test_ext().execute_with(|| {
let call =
RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
// Schedule both calls.
let addr_1 = <Scheduler as Anon<_, _, _>>::schedule(
DispatchTime::At(4),
None,
127,
root(),
Preimage::bound(call.clone()).unwrap(),
)
.unwrap();
// Cancel the call.
assert_ok!(<Scheduler as Anon<_, _, _>>::cancel(addr_1));
let addr_2 = <Scheduler as Anon<_, _, _>>::schedule(
DispatchTime::At(5),
None,
127,
root(),
Preimage::bound(call).unwrap(),
)
.unwrap();
// Re-schedule `call` to block 4.
let addr_3 = <Scheduler as Anon<_, _, _>>::reschedule(addr_2, DispatchTime::At(4)).unwrap();
// Should not re-use the address.
assert!(addr_1 != addr_3);
});
}
/// The scheduler can be used as `v3::Named` trait.
#[test]
fn scheduler_v3_named_basic_works() {
@@ -1767,3 +1694,149 @@ fn scheduler_v3_named_next_schedule_time_works() {
);
});
}
#[test]
fn cancel_last_task_removes_agenda() {
new_test_ext().execute_with(|| {
let when = 4;
let call =
RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
let address = Scheduler::do_schedule(
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call.clone()).unwrap(),
)
.unwrap();
let address2 = Scheduler::do_schedule(
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call).unwrap(),
)
.unwrap();
// two tasks at agenda.
assert!(Agenda::<Test>::get(when).len() == 2);
assert_ok!(Scheduler::do_cancel(None, address));
// still two tasks at agenda, `None` and `Some`.
assert!(Agenda::<Test>::get(when).len() == 2);
// cancel last task from `when` agenda.
assert_ok!(Scheduler::do_cancel(None, address2));
// if all tasks `None`, agenda fully removed.
assert!(Agenda::<Test>::get(when).len() == 0);
});
}
#[test]
fn cancel_named_last_task_removes_agenda() {
new_test_ext().execute_with(|| {
let when = 4;
let call =
RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
Scheduler::do_schedule_named(
[1u8; 32],
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call.clone()).unwrap(),
)
.unwrap();
Scheduler::do_schedule_named(
[2u8; 32],
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call).unwrap(),
)
.unwrap();
// two tasks at agenda.
assert!(Agenda::<Test>::get(when).len() == 2);
assert_ok!(Scheduler::do_cancel_named(None, [2u8; 32]));
// removes trailing `None` and leaves one task.
assert!(Agenda::<Test>::get(when).len() == 1);
// cancel last task from `when` agenda.
assert_ok!(Scheduler::do_cancel_named(None, [1u8; 32]));
// if all tasks `None`, agenda fully removed.
assert!(Agenda::<Test>::get(when).len() == 0);
});
}
#[test]
fn reschedule_last_task_removes_agenda() {
new_test_ext().execute_with(|| {
let when = 4;
let call =
RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
let address = Scheduler::do_schedule(
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call.clone()).unwrap(),
)
.unwrap();
let address2 = Scheduler::do_schedule(
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call).unwrap(),
)
.unwrap();
// two tasks at agenda.
assert!(Agenda::<Test>::get(when).len() == 2);
assert_ok!(Scheduler::do_cancel(None, address));
// still two tasks at agenda, `None` and `Some`.
assert!(Agenda::<Test>::get(when).len() == 2);
// reschedule last task from `when` agenda.
assert_eq!(
Scheduler::do_reschedule(address2, DispatchTime::At(when + 1)).unwrap(),
(when + 1, 0)
);
// if all tasks `None`, agenda fully removed.
assert!(Agenda::<Test>::get(when).len() == 0);
});
}
#[test]
fn reschedule_named_last_task_removes_agenda() {
new_test_ext().execute_with(|| {
let when = 4;
let call =
RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
Scheduler::do_schedule_named(
[1u8; 32],
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call.clone()).unwrap(),
)
.unwrap();
Scheduler::do_schedule_named(
[2u8; 32],
DispatchTime::At(when),
None,
127,
root(),
Preimage::bound(call).unwrap(),
)
.unwrap();
// two tasks at agenda.
assert!(Agenda::<Test>::get(when).len() == 2);
assert_ok!(Scheduler::do_cancel_named(None, [1u8; 32]));
// still two tasks at agenda, `None` and `Some`.
assert!(Agenda::<Test>::get(when).len() == 2);
// reschedule last task from `when` agenda.
assert_eq!(
Scheduler::do_reschedule_named([2u8; 32], DispatchTime::At(when + 1)).unwrap(),
(when + 1, 0)
);
// if all tasks `None`, agenda fully removed.
assert!(Agenda::<Test>::get(when).len() == 0);
});
}