@@ -240,7 +240,9 @@ decl_module! {
240240 ) {
241241 T :: ScheduleOrigin :: ensure_origin( origin. clone( ) ) ?;
242242 let origin = <T as Trait >:: Origin :: from( origin) ;
243- Self :: do_schedule_named( id, DelayedDispatchTime :: At ( when) , maybe_periodic, priority, origin. caller( ) . clone( ) , * call) ?;
243+ Self :: do_schedule_named(
244+ id, DelayedDispatchTime :: At ( when) , maybe_periodic, priority, origin. caller( ) . clone( ) , * call
245+ ) ?;
244246 }
245247
246248 /// Cancel a named scheduled task.
@@ -279,7 +281,9 @@ decl_module! {
279281 ) {
280282 T :: ScheduleOrigin :: ensure_origin( origin. clone( ) ) ?;
281283 let origin = <T as Trait >:: Origin :: from( origin) ;
282- Self :: do_schedule( DelayedDispatchTime :: After ( after) , maybe_periodic, priority, origin. caller( ) . clone( ) , * call) ?;
284+ Self :: do_schedule(
285+ DelayedDispatchTime :: After ( after) , maybe_periodic, priority, origin. caller( ) . clone( ) , * call
286+ ) ?;
283287 }
284288
285289 /// Schedule a named task after a delay.
@@ -302,7 +306,9 @@ decl_module! {
302306 ) {
303307 T :: ScheduleOrigin :: ensure_origin( origin. clone( ) ) ?;
304308 let origin = <T as Trait >:: Origin :: from( origin) ;
305- Self :: do_schedule_named( id, DelayedDispatchTime :: After ( after) , maybe_periodic, priority, origin. caller( ) . clone( ) , * call) ?;
309+ Self :: do_schedule_named(
310+ id, DelayedDispatchTime :: After ( after) , maybe_periodic, priority, origin. caller( ) . clone( ) , * call
311+ ) ?;
306312 }
307313
308314 /// Execute the scheduled calls
@@ -835,11 +841,21 @@ mod tests {
835841 new_test_ext ( ) . execute_with ( || {
836842 // at #4, every 3 blocks, 3 times.
837843 Scheduler :: do_schedule_named (
838- 1u32 . encode ( ) , DelayedDispatchTime :: At ( 4 ) , Some ( ( 3 , 3 ) ) , 127 , root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , 1000 ) )
844+ 1u32 . encode ( ) ,
845+ DelayedDispatchTime :: At ( 4 ) ,
846+ Some ( ( 3 , 3 ) ) ,
847+ 127 ,
848+ root ( ) ,
849+ Call :: Logger ( logger:: Call :: log ( 42 , 1000 ) )
839850 ) . unwrap ( ) ;
840851 // same id results in error.
841852 assert ! ( Scheduler :: do_schedule_named(
842- 1u32 . encode( ) , DelayedDispatchTime :: At ( 4 ) , None , 127 , root( ) , Call :: Logger ( logger:: Call :: log( 69 , 1000 ) )
853+ 1u32 . encode( ) ,
854+ DelayedDispatchTime :: At ( 4 ) ,
855+ None ,
856+ 127 ,
857+ root( ) ,
858+ Call :: Logger ( logger:: Call :: log( 69 , 1000 ) )
843859 ) . is_err( ) ) ;
844860 // different id is ok.
845861 Scheduler :: do_schedule_named (
@@ -860,10 +876,17 @@ mod tests {
860876 fn scheduler_respects_weight_limits ( ) {
861877 new_test_ext ( ) . execute_with ( || {
862878 let _ = Scheduler :: do_schedule (
863- DelayedDispatchTime :: At ( 4 ) , None , 127 , root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 2 ) )
879+ DelayedDispatchTime :: At ( 4 ) ,
880+ None ,
881+ 127 ,
882+ root ( ) ,
883+ Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 2 ) )
864884 ) ;
865885 let _ = Scheduler :: do_schedule (
866- DelayedDispatchTime :: At ( 4 ) , None , 127 , root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
886+ DelayedDispatchTime :: At ( 4 ) ,
887+ None ,
888+ 127 ,
889+ root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
867890 ) ;
868891 // 69 and 42 do not fit together
869892 run_to_block ( 4 ) ;
@@ -877,10 +900,18 @@ mod tests {
877900 fn scheduler_respects_hard_deadlines_more ( ) {
878901 new_test_ext ( ) . execute_with ( || {
879902 let _ = Scheduler :: do_schedule (
880- DelayedDispatchTime :: At ( 4 ) , None , 0 , root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 2 ) )
903+ DelayedDispatchTime :: At ( 4 ) ,
904+ None ,
905+ 0 ,
906+ root ( ) ,
907+ Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 2 ) )
881908 ) ;
882909 let _ = Scheduler :: do_schedule (
883- DelayedDispatchTime :: At ( 4 ) , None , 0 , root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
910+ DelayedDispatchTime :: At ( 4 ) ,
911+ None ,
912+ 0 ,
913+ root ( ) ,
914+ Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
884915 ) ;
885916 // With base weights, 69 and 42 should not fit together, but do because of hard deadlines
886917 run_to_block ( 4 ) ;
@@ -892,10 +923,18 @@ mod tests {
892923 fn scheduler_respects_priority_ordering ( ) {
893924 new_test_ext ( ) . execute_with ( || {
894925 let _ = Scheduler :: do_schedule (
895- DelayedDispatchTime :: At ( 4 ) , None , 1 , root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 2 ) )
926+ DelayedDispatchTime :: At ( 4 ) ,
927+ None ,
928+ 1 ,
929+ root ( ) ,
930+ Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 2 ) )
896931 ) ;
897932 let _ = Scheduler :: do_schedule (
898- DelayedDispatchTime :: At ( 4 ) , None , 0 , root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
933+ DelayedDispatchTime :: At ( 4 ) ,
934+ None ,
935+ 0 ,
936+ root ( ) ,
937+ Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
899938 ) ;
900939 run_to_block ( 4 ) ;
901940 assert_eq ! ( logger:: log( ) , vec![ ( root( ) , 69u32 ) , ( root( ) , 42u32 ) ] ) ;
@@ -906,13 +945,22 @@ mod tests {
906945 fn scheduler_respects_priority_ordering_with_soft_deadlines ( ) {
907946 new_test_ext ( ) . execute_with ( || {
908947 let _ = Scheduler :: do_schedule (
909- DelayedDispatchTime :: At ( 4 ) , None , 255 , root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 3 ) )
948+ DelayedDispatchTime :: At ( 4 ) ,
949+ None ,
950+ 255 ,
951+ root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 3 ) )
910952 ) ;
911953 let _ = Scheduler :: do_schedule (
912- DelayedDispatchTime :: At ( 4 ) , None , 127 , root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
954+ DelayedDispatchTime :: At ( 4 ) ,
955+ None ,
956+ 127 ,
957+ root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
913958 ) ;
914959 let _ = Scheduler :: do_schedule (
915- DelayedDispatchTime :: At ( 4 ) , None , 126 , root ( ) , Call :: Logger ( logger:: Call :: log ( 2600 , MaximumSchedulerWeight :: get ( ) / 2 ) )
960+ DelayedDispatchTime :: At ( 4 ) ,
961+ None ,
962+ 126 ,
963+ root ( ) , Call :: Logger ( logger:: Call :: log ( 2600 , MaximumSchedulerWeight :: get ( ) / 2 ) )
916964 ) ;
917965
918966 // 2600 does not fit with 69 or 42, but has higher priority, so will go through
@@ -941,11 +989,19 @@ mod tests {
941989 ) ;
942990 // Anon Periodic
943991 let _ = Scheduler :: do_schedule (
944- DelayedDispatchTime :: At ( 1 ) , Some ( ( 1000 , 3 ) ) , 128 , root ( ) , Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 3 ) )
992+ DelayedDispatchTime :: At ( 1 ) ,
993+ Some ( ( 1000 , 3 ) ) ,
994+ 128 ,
995+ root ( ) ,
996+ Call :: Logger ( logger:: Call :: log ( 42 , MaximumSchedulerWeight :: get ( ) / 3 ) )
945997 ) ;
946998 // Anon
947999 let _ = Scheduler :: do_schedule (
948- DelayedDispatchTime :: At ( 1 ) , None , 127 , root ( ) , Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
1000+ DelayedDispatchTime :: At ( 1 ) ,
1001+ None ,
1002+ 127 ,
1003+ root ( ) ,
1004+ Call :: Logger ( logger:: Call :: log ( 69 , MaximumSchedulerWeight :: get ( ) / 2 ) )
9491005 ) ;
9501006 // Named Periodic
9511007 assert_ok ! ( Scheduler :: do_schedule_named(
0 commit comments