difftreelog
fix(scheduler-v2) fix benchmarks
in: master
5 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@
.PHONY: bench-scheduler
bench-scheduler:
- make _bench PALLET=unique-scheduler PALLET_DIR=scheduler
+ make _bench PALLET=unique-scheduler-v2 PALLET_DIR=scheduler-v2
.PHONY: bench-rmrk-core
bench-rmrk-core:
pallets/scheduler-v2/src/benchmarking.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license:18// This file is part of Substrate.1920// Copyright (C) 2020-2022 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435//! Scheduler pallet benchmarking.3637use super::*;38use frame_benchmarking::{account, benchmarks};39use frame_support::{40 ensure,41 traits::{schedule::Priority, PreimageRecipient},42};43use frame_system::RawOrigin;44use sp_std::{prelude::*, vec};45use sp_io::hashing::blake2_256;4647use crate::{Pallet as Scheduler, ScheduledCall, EncodedCall};48use frame_system::Call as SystemCall;4950const SEED: u32 = 0;5152const BLOCK_NUMBER: u32 = 2;5354type SystemOrigin<T> = <T as frame_system::Config>::Origin;5556/// Add `n` items to the schedule.57///58/// For `resolved`:59/// - `60/// - `None`: aborted (hash without preimage)61/// - `Some(true)`: hash resolves into call if possible, plain call otherwise62/// - `Some(false)`: plain call63fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {64 let t = DispatchTime::At(when);65 let origin: <T as Config>::PalletsOrigin = frame_system::RawOrigin::Root.into();66 for i in 0..n {67 let call = make_call::<T>(None);68 let period = Some(((i + 100).into(), 100));69 let name = u32_to_name(i);70 Scheduler::<T>::do_schedule_named(name, t, period, 0, origin.clone(), call)?;71 }72 ensure!(73 Agenda::<T>::get(when).len() == n as usize,74 "didn't fill schedule"75 );76 Ok(())77}7879fn u32_to_name(i: u32) -> TaskName {80 i.using_encoded(blake2_256)81}8283fn make_task<T: Config>(84 periodic: bool,85 named: bool,86 signed: bool,87 maybe_lookup_len: Option<u32>,88 priority: Priority,89) -> ScheduledOf<T> {90 let call = make_call::<T>(maybe_lookup_len);91 let maybe_periodic = match periodic {92 true => Some((100u32.into(), 100)),93 false => None,94 };95 let maybe_id = match named {96 true => Some(u32_to_name(0)),97 false => None,98 };99 let origin = make_origin::<T>(signed);100 Scheduled {101 maybe_id,102 priority,103 call,104 maybe_periodic,105 origin,106 _phantom: PhantomData,107 }108}109110fn bounded<T: Config>(len: u32) -> Option<ScheduledCall<T>> {111 let call = <<T as Config>::Call>::from(SystemCall::remark {112 remark: vec![0; len as usize],113 });114 ScheduledCall::new(call).ok()115}116117fn make_call<T: Config>(maybe_lookup_len: Option<u32>) -> ScheduledCall<T> {118 let bound = EncodedCall::bound() as u32;119 let mut len = match maybe_lookup_len {120 Some(len) => {121 len.min(<T::Preimages as PreimageRecipient<T::Hash>>::MaxSize::get() - 2)122 .max(bound) - 3123 }124 None => bound.saturating_sub(4),125 };126127 loop {128 let c = match bounded::<T>(len) {129 Some(x) => x,130 None => {131 len -= 1;132 continue;133 }134 };135 if c.lookup_needed() == maybe_lookup_len.is_some() {136 break c;137 }138 if maybe_lookup_len.is_some() {139 len += 1;140 } else {141 if len > 0 {142 len -= 1;143 } else {144 break c;145 }146 }147 }148}149150fn make_origin<T: Config>(signed: bool) -> <T as Config>::PalletsOrigin {151 match signed {152 true => frame_system::RawOrigin::Signed(account("origin", 0, SEED)).into(),153 false => frame_system::RawOrigin::Root.into(),154 }155}156157fn dummy_counter() -> WeightCounter {158 WeightCounter {159 used: Weight::zero(),160 limit: Weight::MAX,161 }162}163164benchmarks! {165 // `service_agendas` when no work is done.166 service_agendas_base {167 let now = T::BlockNumber::from(BLOCK_NUMBER);168 IncompleteSince::<T>::put(now - One::one());169 }: {170 Scheduler::<T>::service_agendas(&mut dummy_counter(), now, 0);171 } verify {172 assert_eq!(IncompleteSince::<T>::get(), Some(now - One::one()));173 }174175 // `service_agenda` when no work is done.176 service_agenda_base {177 let now = BLOCK_NUMBER.into();178 let s in 0 .. T::MaxScheduledPerBlock::get();179 fill_schedule::<T>(now, s)?;180 let mut executed = 0;181 }: {182 Scheduler::<T>::service_agenda(&mut dummy_counter(), &mut executed, now, now, 0);183 } verify {184 assert_eq!(executed, 0);185 }186187 // `service_task` when the task is a non-periodic, non-named, non-fetched call which is not188 // dispatched (e.g. due to being overweight).189 service_task_base {190 let now = BLOCK_NUMBER.into();191 let task = make_task::<T>(false, false, false, None, 0);192 // prevent any tasks from actually being executed as we only want the surrounding weight.193 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };194 }: {195 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);196 } verify {197 //assert_eq!(result, Ok(()));198 }199200 // `service_task` when the task is a non-periodic, non-named, fetched call (with a known201 // preimage length) and which is not dispatched (e.g. due to being overweight).202 service_task_fetched {203 let s in (EncodedCall::bound() as u32) .. (<T::Preimages as PreimageRecipient<T::Hash>>::MaxSize::get());204 let now = BLOCK_NUMBER.into();205 let task = make_task::<T>(false, false, false, Some(s), 0);206 // prevent any tasks from actually being executed as we only want the surrounding weight.207 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };208 }: {209 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);210 } verify {211 }212213 // `service_task` when the task is a non-periodic, named, non-fetched call which is not214 // dispatched (e.g. due to being overweight).215 service_task_named {216 let now = BLOCK_NUMBER.into();217 let task = make_task::<T>(false, true, false, None, 0);218 // prevent any tasks from actually being executed as we only want the surrounding weight.219 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };220 }: {221 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);222 } verify {223 }224225 // `service_task` when the task is a periodic, non-named, non-fetched call which is not226 // dispatched (e.g. due to being overweight).227 service_task_periodic {228 let now = BLOCK_NUMBER.into();229 let task = make_task::<T>(true, false, false, None, 0);230 // prevent any tasks from actually being executed as we only want the surrounding weight.231 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };232 }: {233 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);234 } verify {235 }236237 // `execute_dispatch` when the origin is `Signed`, not counting the dispatable's weight.238 execute_dispatch_signed {239 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::MAX };240 let origin = make_origin::<T>(true);241 let call = T::Preimages::realize(&make_call::<T>(None)).unwrap().0;242 }: {243 assert!(Scheduler::<T>::execute_dispatch(&mut counter, origin, call).is_ok());244 }245 verify {246 }247248 // `execute_dispatch` when the origin is not `Signed`, not counting the dispatable's weight.249 execute_dispatch_unsigned {250 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::MAX };251 let origin = make_origin::<T>(false);252 let call = T::Preimages::realize(&make_call::<T>(None)).unwrap().0;253 }: {254 assert!(Scheduler::<T>::execute_dispatch(&mut counter, origin, call).is_ok());255 }256 verify {257 }258259 schedule {260 let s in 0 .. (T::MaxScheduledPerBlock::get() - 1);261 let when = BLOCK_NUMBER.into();262 let periodic = Some((T::BlockNumber::one(), 100));263 let priority = Some(0);264 // Essentially a no-op call.265 let call = Box::new(SystemCall::set_storage { items: vec![] }.into());266267 fill_schedule::<T>(when, s)?;268 }: _(RawOrigin::Root, when, periodic, priority, call)269 verify {270 ensure!(271 Agenda::<T>::get(when).len() == (s + 1) as usize,272 "didn't add to schedule"273 );274 }275276 cancel {277 let s in 1 .. T::MaxScheduledPerBlock::get();278 let when = BLOCK_NUMBER.into();279280 fill_schedule::<T>(when, s)?;281 assert_eq!(Agenda::<T>::get(when).len(), s as usize);282 let schedule_origin = T::ScheduleOrigin::successful_origin();283 }: _<SystemOrigin<T>>(schedule_origin, when, 0)284 verify {285 ensure!(286 Lookup::<T>::get(u32_to_name(0)).is_none(),287 "didn't remove from lookup"288 );289 // Removed schedule is NONE290 ensure!(291 Agenda::<T>::get(when)[0].is_none(),292 "didn't remove from schedule"293 );294 }295296 schedule_named {297 let s in 0 .. (T::MaxScheduledPerBlock::get() - 1);298 let id = u32_to_name(s);299 let when = BLOCK_NUMBER.into();300 let periodic = Some((T::BlockNumber::one(), 100));301 let priority = Some(0);302 // Essentially a no-op call.303 let call = Box::new(SystemCall::set_storage { items: vec![] }.into());304305 fill_schedule::<T>(when, s)?;306 }: _(RawOrigin::Root, id, when, periodic, priority, call)307 verify {308 ensure!(309 Agenda::<T>::get(when).len() == (s + 1) as usize,310 "didn't add to schedule"311 );312 }313314 cancel_named {315 let s in 1 .. T::MaxScheduledPerBlock::get();316 let when = BLOCK_NUMBER.into();317318 fill_schedule::<T>(when, s)?;319 }: _(RawOrigin::Root, u32_to_name(0))320 verify {321 ensure!(322 Lookup::<T>::get(u32_to_name(0)).is_none(),323 "didn't remove from lookup"324 );325 // Removed schedule is NONE326 ensure!(327 Agenda::<T>::get(when)[0].is_none(),328 "didn't remove from schedule"329 );330 }331332 change_named_priority {333 let origin: RawOrigin<T::AccountId> = frame_system::RawOrigin::Root;334 let s in 1 .. T::MaxScheduledPerBlock::get();335 let when = BLOCK_NUMBER.into();336 let idx = s - 1;337 let id = u32_to_name(idx);338 let priority = 42;339 fill_schedule::<T>(when, s)?;340 }: _(origin, id, priority)341 verify {342 ensure!(343 Agenda::<T>::get(when)[idx as usize].clone().unwrap().priority == priority,344 "didn't change the priority"345 );346 }347348 impl_benchmark_test_suite!(Scheduler, crate::mock::new_test_ext(), crate::mock::Test);349}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license:18// This file is part of Substrate.1920// Copyright (C) 2020-2022 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435//! Scheduler pallet benchmarking.3637use super::*;38use frame_benchmarking::{account, benchmarks};39use frame_support::{40 ensure,41 traits::{schedule::Priority, PreimageRecipient},42};43use frame_system::RawOrigin;44use sp_std::{prelude::*, vec};45use sp_io::hashing::blake2_256;4647use crate::{Pallet as Scheduler, ScheduledCall, EncodedCall};48use frame_system::Call as SystemCall;4950const SEED: u32 = 0;5152const BLOCK_NUMBER: u32 = 2;5354type SystemOrigin<T> = <T as frame_system::Config>::RuntimeOrigin;5556/// Add `n` items to the schedule.57///58/// For `resolved`:59/// - `60/// - `None`: aborted (hash without preimage)61/// - `Some(true)`: hash resolves into call if possible, plain call otherwise62/// - `Some(false)`: plain call63fn fill_schedule<T: Config>(when: T::BlockNumber, n: u32) -> Result<(), &'static str> {64 let t = DispatchTime::At(when);65 let origin: <T as Config>::PalletsOrigin = frame_system::RawOrigin::Root.into();66 for i in 0..n {67 let call = make_call::<T>(None);68 let period = Some(((i + 100).into(), 100));69 let name = u32_to_name(i);70 Scheduler::<T>::do_schedule_named(name, t, period, 0, origin.clone(), call)?;71 }72 ensure!(73 Agenda::<T>::get(when).agenda.len() == n as usize,74 "didn't fill schedule"75 );76 Ok(())77}7879fn u32_to_name(i: u32) -> TaskName {80 i.using_encoded(blake2_256)81}8283fn make_task<T: Config>(84 periodic: bool,85 named: bool,86 signed: bool,87 maybe_lookup_len: Option<u32>,88 priority: Priority,89) -> ScheduledOf<T> {90 let call = make_call::<T>(maybe_lookup_len);91 let maybe_periodic = match periodic {92 true => Some((100u32.into(), 100)),93 false => None,94 };95 let maybe_id = match named {96 true => Some(u32_to_name(0)),97 false => None,98 };99 let origin = make_origin::<T>(signed);100 Scheduled {101 maybe_id,102 priority,103 call,104 maybe_periodic,105 origin,106 _phantom: PhantomData,107 }108}109110fn bounded<T: Config>(len: u32) -> Option<ScheduledCall<T>> {111 let call = <<T as Config>::RuntimeCall>::from(SystemCall::remark {112 remark: vec![0; len as usize],113 });114 ScheduledCall::new(call).ok()115}116117fn make_call<T: Config>(maybe_lookup_len: Option<u32>) -> ScheduledCall<T> {118 let bound = EncodedCall::bound() as u32;119 let mut len = match maybe_lookup_len {120 Some(len) => {121 len.min(<T::Preimages as PreimageRecipient<T::Hash>>::MaxSize::get() - 2)122 .max(bound) - 3123 }124 None => bound.saturating_sub(4),125 };126127 loop {128 let c = match bounded::<T>(len) {129 Some(x) => x,130 None => {131 len -= 1;132 continue;133 }134 };135 if c.lookup_needed() == maybe_lookup_len.is_some() {136 break c;137 }138 if maybe_lookup_len.is_some() {139 len += 1;140 } else {141 if len > 0 {142 len -= 1;143 } else {144 break c;145 }146 }147 }148}149150fn make_origin<T: Config>(signed: bool) -> <T as Config>::PalletsOrigin {151 match signed {152 true => frame_system::RawOrigin::Signed(account("origin", 0, SEED)).into(),153 false => frame_system::RawOrigin::Root.into(),154 }155}156157fn dummy_counter() -> WeightCounter {158 WeightCounter {159 used: Weight::zero(),160 limit: Weight::MAX,161 }162}163164benchmarks! {165 // `service_agendas` when no work is done.166 service_agendas_base {167 let now = T::BlockNumber::from(BLOCK_NUMBER);168 IncompleteSince::<T>::put(now - One::one());169 }: {170 Scheduler::<T>::service_agendas(&mut dummy_counter(), now, 0);171 } verify {172 assert_eq!(IncompleteSince::<T>::get(), Some(now - One::one()));173 }174175 // `service_agenda` when no work is done.176 service_agenda_base {177 let now = BLOCK_NUMBER.into();178 let s in 0 .. T::MaxScheduledPerBlock::get();179 fill_schedule::<T>(now, s)?;180 let mut executed = 0;181 }: {182 Scheduler::<T>::service_agenda(&mut dummy_counter(), &mut executed, now, now, 0);183 } verify {184 assert_eq!(executed, 0);185 }186187 // `service_task` when the task is a non-periodic, non-named, non-fetched call which is not188 // dispatched (e.g. due to being overweight).189 service_task_base {190 let now = BLOCK_NUMBER.into();191 let task = make_task::<T>(false, false, false, None, 0);192 // prevent any tasks from actually being executed as we only want the surrounding weight.193 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };194 }: {195 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);196 } verify {197 //assert_eq!(result, Ok(()));198 }199200 // TODO uncomment if we will use the Preimages201 // // `service_task` when the task is a non-periodic, non-named, fetched call (with a known202 // // preimage length) and which is not dispatched (e.g. due to being overweight).203 // service_task_fetched {204 // let s in (EncodedCall::bound() as u32) .. (<T::Preimages as PreimageRecipient<T::Hash>>::MaxSize::get());205 // let now = BLOCK_NUMBER.into();206 // let task = make_task::<T>(false, false, false, Some(s), 0);207 // // prevent any tasks from actually being executed as we only want the surrounding weight.208 // let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };209 // }: {210 // let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);211 // } verify {212 // }213214 // `service_task` when the task is a non-periodic, named, non-fetched call which is not215 // dispatched (e.g. due to being overweight).216 service_task_named {217 let now = BLOCK_NUMBER.into();218 let task = make_task::<T>(false, true, false, None, 0);219 // prevent any tasks from actually being executed as we only want the surrounding weight.220 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };221 }: {222 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);223 } verify {224 }225226 // `service_task` when the task is a periodic, non-named, non-fetched call which is not227 // dispatched (e.g. due to being overweight).228 service_task_periodic {229 let now = BLOCK_NUMBER.into();230 let task = make_task::<T>(true, false, false, None, 0);231 // prevent any tasks from actually being executed as we only want the surrounding weight.232 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::zero() };233 }: {234 let result = Scheduler::<T>::service_task(&mut counter, now, now, 0, true, task);235 } verify {236 }237238 // `execute_dispatch` when the origin is `Signed`, not counting the dispatable's weight.239 execute_dispatch_signed {240 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::MAX };241 let origin = make_origin::<T>(true);242 let call = T::Preimages::realize(&make_call::<T>(None)).unwrap().0;243 }: {244 assert!(Scheduler::<T>::execute_dispatch(&mut counter, origin, call).is_ok());245 }246 verify {247 }248249 // `execute_dispatch` when the origin is not `Signed`, not counting the dispatable's weight.250 execute_dispatch_unsigned {251 let mut counter = WeightCounter { used: Weight::zero(), limit: Weight::MAX };252 let origin = make_origin::<T>(false);253 let call = T::Preimages::realize(&make_call::<T>(None)).unwrap().0;254 }: {255 assert!(Scheduler::<T>::execute_dispatch(&mut counter, origin, call).is_ok());256 }257 verify {258 }259260 schedule {261 let s in 0 .. (T::MaxScheduledPerBlock::get() - 1);262 let when = BLOCK_NUMBER.into();263 let periodic = Some((T::BlockNumber::one(), 100));264 let priority = Some(0);265 // Essentially a no-op call.266 let call = Box::new(SystemCall::set_storage { items: vec![] }.into());267268 fill_schedule::<T>(when, s)?;269 }: _(RawOrigin::Root, when, periodic, priority, call)270 verify {271 ensure!(272 Agenda::<T>::get(when).agenda.len() == (s + 1) as usize,273 "didn't add to schedule"274 );275 }276277 cancel {278 let s in 1 .. T::MaxScheduledPerBlock::get();279 let when = BLOCK_NUMBER.into();280281 fill_schedule::<T>(when, s)?;282 assert_eq!(Agenda::<T>::get(when).agenda.len(), s as usize);283 let schedule_origin = T::ScheduleOrigin::successful_origin();284 }: _<SystemOrigin<T>>(schedule_origin, when, 0)285 verify {286 ensure!(287 Lookup::<T>::get(u32_to_name(0)).is_none(),288 "didn't remove from lookup"289 );290 // Removed schedule is NONE291 ensure!(292 Agenda::<T>::get(when).agenda[0].is_none(),293 "didn't remove from schedule"294 );295 }296297 schedule_named {298 let s in 0 .. (T::MaxScheduledPerBlock::get() - 1);299 let id = u32_to_name(s);300 let when = BLOCK_NUMBER.into();301 let periodic = Some((T::BlockNumber::one(), 100));302 let priority = Some(0);303 // Essentially a no-op call.304 let call = Box::new(SystemCall::set_storage { items: vec![] }.into());305306 fill_schedule::<T>(when, s)?;307 }: _(RawOrigin::Root, id, when, periodic, priority, call)308 verify {309 ensure!(310 Agenda::<T>::get(when).agenda.len() == (s + 1) as usize,311 "didn't add to schedule"312 );313 }314315 cancel_named {316 let s in 1 .. T::MaxScheduledPerBlock::get();317 let when = BLOCK_NUMBER.into();318319 fill_schedule::<T>(when, s)?;320 }: _(RawOrigin::Root, u32_to_name(0))321 verify {322 ensure!(323 Lookup::<T>::get(u32_to_name(0)).is_none(),324 "didn't remove from lookup"325 );326 // Removed schedule is NONE327 ensure!(328 Agenda::<T>::get(when).agenda[0].is_none(),329 "didn't remove from schedule"330 );331 }332333 change_named_priority {334 let origin: RawOrigin<T::AccountId> = frame_system::RawOrigin::Root;335 let s in 1 .. T::MaxScheduledPerBlock::get();336 let when = BLOCK_NUMBER.into();337 let idx = s - 1;338 let id = u32_to_name(idx);339 let priority = 42;340 fill_schedule::<T>(when, s)?;341 }: _(origin, id, priority)342 verify {343 ensure!(344 Agenda::<T>::get(when).agenda[idx as usize].clone().unwrap().priority == priority,345 "didn't change the priority"346 );347 }348349 impl_benchmark_test_suite!(Scheduler, crate::mock::new_test_ext(), crate::mock::Test);350}pallets/scheduler-v2/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler-v2/src/lib.rs
+++ b/pallets/scheduler-v2/src/lib.rs
@@ -347,7 +347,11 @@
let base = Self::service_task_base();
let mut total = match maybe_lookup_len {
None => base,
- Some(l) => Self::service_task_fetched(l as u32),
+ Some(_l) => {
+ // TODO uncomment if we will use the Preimages
+ // Self::service_task_fetched(l as u32)
+ base
+ },
};
if named {
total.saturating_accrue(Self::service_task_named().saturating_sub(base));
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -57,8 +57,8 @@
Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,
- // #[runtimes(opal)]
- // Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,
+ #[runtimes(opal)]
+ Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,
Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,
@@ -95,9 +95,6 @@
EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,
Maintenance: pallet_maintenance::{Pallet, Call, Storage, Event<T>} = 154,
-
- #[runtimes(opal)]
- Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 154,
#[runtimes(opal)]
TestUtils: pallet_test_utils = 255,
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -683,8 +683,8 @@
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
list_benchmark!(list, extra, pallet_refungible, Refungible);
- // #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
- // list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
+ #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+ list_benchmark!(list, extra, pallet_unique_scheduler_v2, Scheduler);
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);
@@ -743,8 +743,8 @@
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
add_benchmark!(params, batches, pallet_refungible, Refungible);
- // #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
- // add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
+ #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+ add_benchmark!(params, batches, pallet_unique_scheduler_v2, Scheduler);
#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);