difftreelog
fix cargo fmt
in: master
4 files changed
pallets/scheduler-v2/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler-v2/src/lib.rs
+++ b/pallets/scheduler-v2/src/lib.rs
@@ -77,13 +77,16 @@
use codec::{Codec, Decode, Encode, MaxEncodedLen};
use frame_support::{
- dispatch::{DispatchError, DispatchResult, Dispatchable, GetDispatchInfo, Parameter, PostDispatchInfo},
+ dispatch::{
+ DispatchError, DispatchResult, Dispatchable, GetDispatchInfo, Parameter, PostDispatchInfo,
+ },
traits::{
schedule::{self, DispatchTime, LOWEST_PRIORITY},
EnsureOrigin, Get, IsType, OriginTrait, PrivilegeCmp, StorageVersion, PreimageRecipient,
ConstU32, UnfilteredDispatchable,
},
- weights::Weight, unsigned::TransactionValidityError,
+ weights::Weight,
+ unsigned::TransactionValidityError,
};
use frame_system::{self as system};
@@ -318,8 +321,10 @@
/// The aggregated call type.
type RuntimeCall: Parameter
- + Dispatchable<RuntimeOrigin = <Self as Config>::RuntimeOrigin, PostInfo = PostDispatchInfo>
- + UnfilteredDispatchable<RuntimeOrigin = <Self as system::Config>::RuntimeOrigin>
+ + Dispatchable<
+ RuntimeOrigin = <Self as Config>::RuntimeOrigin,
+ PostInfo = PostDispatchInfo,
+ > + UnfilteredDispatchable<RuntimeOrigin = <Self as system::Config>::RuntimeOrigin>
+ GetDispatchInfo
+ From<system::Call<Self>>;
@@ -940,7 +945,7 @@
}
return Err((Unavailable, Some(task)));
- },
+ }
};
weight.check_accrue(T::WeightInfo::service_task(
@@ -979,7 +984,7 @@
Err(Overweight) => {
// Preserve Lookup -- the task will be postponed.
Err((Overweight, Some(task)))
- },
+ }
Ok(result) => {
Self::deposit_event(Event::Dispatched {
task: (when, agenda_index),
@@ -987,7 +992,9 @@
result,
});
- let is_canceled = task.maybe_id.as_ref()
+ let is_canceled = task
+ .maybe_id
+ .as_ref()
.map(|id| !Lookup::<T>::contains_key(id))
.unwrap_or(false);
@@ -1011,14 +1018,14 @@
});
}
}
- },
+ }
_ => {
if let Some(ref id) = task.maybe_id {
Lookup::<T>::remove(id);
}
T::Preimages::drop(&task.call)
- },
+ }
}
Ok(())
}
@@ -1056,12 +1063,12 @@
let r = match ensured_origin {
Ok(ScheduledEnsureOriginSuccess::Root) => {
Ok(call.dispatch_bypass_filter(frame_system::RawOrigin::Root.into()))
- },
+ }
Ok(ScheduledEnsureOriginSuccess::Signed(sender)) => {
// Execute transaction via chain default pipeline
// That means dispatch will be processed like any user's extrinsic e.g. transaction fees will be taken
T::CallExecutor::dispatch_call(Some(sender), call.clone())
- },
+ }
Ok(ScheduledEnsureOriginSuccess::Unsigned) => {
// Unsigned version of the above
T::CallExecutor::dispatch_call(None, call.clone())
pallets/scheduler-v2/src/mock.rsdiffbeforeafterboth40use frame_support::{40use frame_support::{41 ord_parameter_types, parameter_types,41 ord_parameter_types, parameter_types,42 traits::{42 traits::{ConstU32, ConstU64, Contains, EqualPrivilegeOnly, OnFinalize, OnInitialize},43 ConstU32, ConstU64, Contains, EqualPrivilegeOnly, OnFinalize, OnInitialize,44 },45 weights::constants::RocksDbWeight,43 weights::constants::RocksDbWeight,46};44};pallets/scheduler-v2/src/tests.rsdiffbeforeafterboth--- a/pallets/scheduler-v2/src/tests.rs
+++ b/pallets/scheduler-v2/src/tests.rs
@@ -46,15 +46,19 @@
#[test]
fn basic_scheduling_works() {
new_test_ext().execute_with(|| {
- let call =
- RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
- assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: Weight::from_ref_time(10),
+ });
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(
+ &call
+ ));
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
127,
root(),
- <ScheduledCall<Test>>::new(call).unwrap(),
+ <ScheduledCall<Test>>::new(call).unwrap(),
));
run_to_block(3);
assert!(logger::log().is_empty());
@@ -69,9 +73,13 @@
fn schedule_after_works() {
new_test_ext().execute_with(|| {
run_to_block(2);
- let call =
- RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
- assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: Weight::from_ref_time(10),
+ });
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(
+ &call
+ ));
// This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
assert_ok!(Scheduler::do_schedule(
DispatchTime::After(3),
@@ -93,9 +101,13 @@
fn schedule_after_zero_works() {
new_test_ext().execute_with(|| {
run_to_block(2);
- let call =
- RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
- assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(&call));
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: Weight::from_ref_time(10),
+ });
+ assert!(!<Test as frame_system::Config>::BaseCallFilter::contains(
+ &call
+ ));
assert_ok!(Scheduler::do_schedule(
DispatchTime::After(0),
None,
@@ -120,7 +132,7 @@
Some((3, 3)),
127,
root(),
- <ScheduledCall<Test>>::new(RuntimeCall::Logger(logger::Call::log {
+ <ScheduledCall<Test>>::new(RuntimeCall::Logger(logger::Call::log {
i: 42,
weight: Weight::from_ref_time(10)
}))
@@ -137,9 +149,15 @@
run_to_block(9);
assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
run_to_block(10);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+ );
run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
+ );
});
}
@@ -241,7 +259,10 @@
fn scheduler_respects_weight_limits() {
let max_weight: Weight = <Test as Config>::MaximumWeight::get();
new_test_ext().execute_with(|| {
- let call = RuntimeCall::Logger(LoggerCall::log { i: 42, weight: max_weight / 3 * 2 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: max_weight / 3 * 2,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -249,7 +270,10 @@
root(),
<ScheduledCall<Test>>::new(call).unwrap(),
));
- let call = RuntimeCall::Logger(LoggerCall::log { i: 69, weight: max_weight / 3 * 2 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 69,
+ weight: max_weight / 3 * 2,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -270,7 +294,10 @@
fn scheduler_does_not_delete_permanently_overweight_call() {
let max_weight: Weight = <Test as Config>::MaximumWeight::get();
new_test_ext().execute_with(|| {
- let call = RuntimeCall::Logger(LoggerCall::log { i: 42, weight: max_weight });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: max_weight,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -285,7 +312,11 @@
// Assert the `PermanentlyOverweight` event.
assert_eq!(
System::events().last().unwrap().event,
- crate::Event::PermanentlyOverweight { task: (4, 0), id: None }.into(),
+ crate::Event::PermanentlyOverweight {
+ task: (4, 0),
+ id: None
+ }
+ .into(),
);
// The call is still in the agenda.
assert!(Agenda::<Test>::get(4)[0].is_some());
@@ -298,7 +329,10 @@
let max_per_block = <Test as Config>::MaxScheduledPerBlock::get();
new_test_ext().execute_with(|| {
- let call = RuntimeCall::Logger(LoggerCall::log { i: 42, weight: (max_weight / 3) * 2 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: (max_weight / 3) * 2,
+ });
let call = <ScheduledCall<Test>>::new(call).unwrap();
assert_ok!(Scheduler::do_schedule(
@@ -329,7 +363,11 @@
assert_eq!(
System::events().last().unwrap().event,
- crate::Event::PeriodicFailed { task: (24, 0), id: None }.into(),
+ crate::Event::PeriodicFailed {
+ task: (24, 0),
+ id: None
+ }
+ .into(),
);
});
}
@@ -338,7 +376,10 @@
fn scheduler_respects_priority_ordering() {
let max_weight: Weight = <Test as Config>::MaximumWeight::get();
new_test_ext().execute_with(|| {
- let call = RuntimeCall::Logger(LoggerCall::log { i: 42, weight: max_weight / 3 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: max_weight / 3,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -346,7 +387,10 @@
root(),
<ScheduledCall<Test>>::new(call).unwrap(),
));
- let call = RuntimeCall::Logger(LoggerCall::log { i: 69, weight: max_weight / 3 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 69,
+ weight: max_weight / 3,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -363,7 +407,10 @@
fn scheduler_respects_priority_ordering_with_soft_deadlines() {
new_test_ext().execute_with(|| {
let max_weight: Weight = <Test as Config>::MaximumWeight::get();
- let call = RuntimeCall::Logger(LoggerCall::log { i: 42, weight: max_weight / 5 * 2 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: max_weight / 5 * 2,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -371,7 +418,10 @@
root(),
<ScheduledCall<Test>>::new(call).unwrap(),
));
- let call = RuntimeCall::Logger(LoggerCall::log { i: 69, weight: max_weight / 5 * 2 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 69,
+ weight: max_weight / 5 * 2,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -379,7 +429,10 @@
root(),
<ScheduledCall<Test>>::new(call).unwrap(),
));
- let call = RuntimeCall::Logger(LoggerCall::log { i: 2600, weight: max_weight / 5 * 4 });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 2600,
+ weight: max_weight / 5 * 4,
+ });
assert_ok!(Scheduler::do_schedule(
DispatchTime::At(4),
None,
@@ -393,7 +446,10 @@
assert_eq!(logger::log(), vec![(root(), 2600u32)]);
// 69 and 42 fit together
run_to_block(5);
- assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
+ );
});
}
@@ -456,11 +512,11 @@
// Will include the named periodic only
assert_eq!(
Scheduler::on_initialize(1),
- TestWeightInfo::service_agendas_base() +
- TestWeightInfo::service_agenda_base(1) +
- <TestWeightInfo as MarginalWeightInfo>::service_task(None, true, true) +
- TestWeightInfo::execute_dispatch_unsigned() +
- call_weight + Weight::from_ref_time(4)
+ TestWeightInfo::service_agendas_base()
+ + TestWeightInfo::service_agenda_base(1)
+ + <TestWeightInfo as MarginalWeightInfo>::service_task(None, true, true)
+ + TestWeightInfo::execute_dispatch_unsigned()
+ + call_weight + Weight::from_ref_time(4)
);
assert_eq!(IncompleteSince::<Test>::get(), None);
assert_eq!(logger::log(), vec![(root(), 2600u32)]);
@@ -468,31 +524,39 @@
// Will include anon and anon periodic
assert_eq!(
Scheduler::on_initialize(2),
- TestWeightInfo::service_agendas_base() +
- TestWeightInfo::service_agenda_base(2) +
- <TestWeightInfo as MarginalWeightInfo>::service_task(None, false, true) +
- TestWeightInfo::execute_dispatch_unsigned() +
- call_weight + Weight::from_ref_time(3) +
- <TestWeightInfo as MarginalWeightInfo>::service_task(None, false, false) +
- TestWeightInfo::execute_dispatch_unsigned() +
- call_weight + Weight::from_ref_time(2)
+ TestWeightInfo::service_agendas_base()
+ + TestWeightInfo::service_agenda_base(2)
+ + <TestWeightInfo as MarginalWeightInfo>::service_task(None, false, true)
+ + TestWeightInfo::execute_dispatch_unsigned()
+ + call_weight + Weight::from_ref_time(3)
+ + <TestWeightInfo as MarginalWeightInfo>::service_task(None, false, false)
+ + TestWeightInfo::execute_dispatch_unsigned()
+ + call_weight + Weight::from_ref_time(2)
);
assert_eq!(IncompleteSince::<Test>::get(), None);
- assert_eq!(logger::log(), vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]);
+ assert_eq!(
+ logger::log(),
+ vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
+ );
// Will include named only
assert_eq!(
Scheduler::on_initialize(3),
- TestWeightInfo::service_agendas_base() +
- TestWeightInfo::service_agenda_base(1) +
- <TestWeightInfo as MarginalWeightInfo>::service_task(None, true, false) +
- TestWeightInfo::execute_dispatch_unsigned() +
- call_weight + Weight::from_ref_time(1)
+ TestWeightInfo::service_agendas_base()
+ + TestWeightInfo::service_agenda_base(1)
+ + <TestWeightInfo as MarginalWeightInfo>::service_task(None, true, false)
+ + TestWeightInfo::execute_dispatch_unsigned()
+ + call_weight + Weight::from_ref_time(1)
);
assert_eq!(IncompleteSince::<Test>::get(), None);
assert_eq!(
logger::log(),
- vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32), (root(), 3u32)]
+ vec![
+ (root(), 2600u32),
+ (root(), 69u32),
+ (root(), 42u32),
+ (root(), 3u32)
+ ]
);
// Will contain none
@@ -515,10 +579,21 @@
i: 42,
weight: Weight::from_ref_time(10),
}));
- assert_ok!(
- Scheduler::schedule_named(RuntimeOrigin::root(), [1u8; 32], 4, None, Some(127), call,)
- );
- assert_ok!(Scheduler::schedule(RuntimeOrigin::root(), 4, None, Some(127), call2));
+ assert_ok!(Scheduler::schedule_named(
+ RuntimeOrigin::root(),
+ [1u8; 32],
+ 4,
+ None,
+ Some(127),
+ call,
+ ));
+ assert_ok!(Scheduler::schedule(
+ RuntimeOrigin::root(),
+ 4,
+ None,
+ Some(127),
+ call2
+ ));
run_to_block(3);
// Scheduled calls are in the agenda.
assert_eq!(Agenda::<Test>::get(4).len(), 2);
@@ -585,12 +660,21 @@
None,
call,
));
- assert_ok!(Scheduler::schedule(system::RawOrigin::Signed(1).into(), 4, None, None, call2,));
+ assert_ok!(Scheduler::schedule(
+ system::RawOrigin::Signed(1).into(),
+ 4,
+ None,
+ None,
+ call2,
+ ));
run_to_block(3);
// Scheduled calls are in the agenda.
assert_eq!(Agenda::<Test>::get(4).len(), 2);
assert!(logger::log().is_empty());
- assert_ok!(Scheduler::cancel_named(system::RawOrigin::Signed(1).into(), [1u8; 32]));
+ assert_ok!(Scheduler::cancel_named(
+ system::RawOrigin::Signed(1).into(),
+ [1u8; 32]
+ ));
assert_ok!(Scheduler::cancel(system::RawOrigin::Signed(1).into(), 4, 1));
// Scheduled calls are made NONE, so should not effect state
run_to_block(100);
@@ -646,7 +730,13 @@
None,
call,
));
- assert_ok!(Scheduler::schedule(system::RawOrigin::Signed(1).into(), 4, None, None, call2,));
+ assert_ok!(Scheduler::schedule(
+ system::RawOrigin::Signed(1).into(),
+ 4,
+ None,
+ None,
+ call2,
+ ));
run_to_block(3);
// Scheduled calls are in the agenda.
assert_eq!(Agenda::<Test>::get(4).len(), 2);
@@ -655,9 +745,18 @@
Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), [1u8; 32]),
BadOrigin
);
- assert_noop!(Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1), BadOrigin);
- assert_noop!(Scheduler::cancel_named(system::RawOrigin::Root.into(), [1u8; 32]), BadOrigin);
- assert_noop!(Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1), BadOrigin);
+ assert_noop!(
+ Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1),
+ BadOrigin
+ );
+ assert_noop!(
+ Scheduler::cancel_named(system::RawOrigin::Root.into(), [1u8; 32]),
+ BadOrigin
+ );
+ assert_noop!(
+ Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1),
+ BadOrigin
+ );
run_to_block(5);
assert_eq!(
logger::log(),
@@ -674,8 +773,10 @@
#[test]
fn schedule_does_not_resuse_addr() {
new_test_ext().execute_with(|| {
- let call =
- RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: Weight::from_ref_time(10),
+ });
// Schedule both calls.
let addr_1 = Scheduler::do_schedule(
@@ -707,20 +808,15 @@
let max: u32 = <Test as Config>::MaxScheduledPerBlock::get();
new_test_ext().execute_with(|| {
- let call =
- RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: Weight::from_ref_time(10),
+ });
let call = <ScheduledCall<Test>>::new(call).unwrap();
// Schedule the maximal number allowed per block.
for _ in 0..max {
- Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- call.clone(),
- )
- .unwrap();
+ Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call.clone()).unwrap();
}
// One more time and it errors.
@@ -739,25 +835,24 @@
#[test]
fn cancel_and_schedule_fills_holes() {
let max: u32 = <Test as Config>::MaxScheduledPerBlock::get();
- assert!(max > 3, "This test only makes sense for MaxScheduledPerBlock > 3");
+ assert!(
+ max > 3,
+ "This test only makes sense for MaxScheduledPerBlock > 3"
+ );
new_test_ext().execute_with(|| {
- let call =
- RuntimeCall::Logger(LoggerCall::log { i: 42, weight: Weight::from_ref_time(10) });
+ let call = RuntimeCall::Logger(LoggerCall::log {
+ i: 42,
+ weight: Weight::from_ref_time(10),
+ });
let call = <ScheduledCall<Test>>::new(call).unwrap();
let mut addrs = Vec::<_>::default();
// Schedule the maximal number allowed per block.
for _ in 0..max {
addrs.push(
- Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- call.clone(),
- )
- .unwrap(),
+ Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call.clone())
+ .unwrap(),
);
}
// Cancel three of them.
@@ -766,14 +861,9 @@
}
// Schedule three new ones.
for i in 0..3 {
- let (_block, index) = Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- call.clone(),
- )
- .unwrap();
+ let (_block, index) =
+ Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call.clone())
+ .unwrap();
assert_eq!(i, index);
}
runtime/common/scheduler.rsdiffbeforeafterboth--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -105,7 +105,6 @@
}
}
-
// impl<T: frame_system::Config + pallet_unique_scheduler::Config, SelfContainedSignedInfo>
// DispatchCall<T, SelfContainedSignedInfo> for SchedulerPaymentExecutor
// where