From ff6d0176d1b5ba0bcac7da8ffbbcbebbe219a7de Mon Sep 17 00:00:00 2001 From: ut-akuznetsov <59873862+ut-akuznetsov@users.noreply.github.com> Date: Wed, 14 Dec 2022 09:07:50 +0000 Subject: [PATCH] Merge pull request #770 from UniqueNetwork/fix/disable-scheduler-v2-everywhere --- --- 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} = 61, - #[runtimes(opal)] - Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event} = 62, + // #[runtimes(opal)] + // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event} = 62, Configuration: pallet_configuration::{Pallet, Call, Storage} = 63, --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -179,7 +179,6 @@ limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing'] opal-runtime = [ 'refungible', - 'scheduler', 'rmrk', 'app-promotion', 'foreign-assets', --- a/test-pallets/utils/src/lib.rs +++ b/test-pallets/utils/src/lib.rs @@ -29,10 +29,10 @@ }; use frame_system::pallet_prelude::*; use sp_std::vec::Vec; - use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet}; + // use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet}; #[pallet::config] - pub trait Config: frame_system::Config + pallet_unique_scheduler_v2::Config { + pub trait Config: frame_system::Config /*+ pallet_unique_scheduler_v2::Config*/ { type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The overarching call type. @@ -108,21 +108,21 @@ Self::set_test_value(origin, >::get() + 1) } - #[pallet::weight(10_000)] - pub fn self_canceling_inc( - origin: OriginFor, - id: TaskName, - max_test_value: u32, - ) -> DispatchResult { - Self::ensure_origin_and_enabled(origin.clone())?; - Self::inc_test_value(origin.clone())?; + // #[pallet::weight(10_000)] + // pub fn self_canceling_inc( + // origin: OriginFor, + // id: TaskName, + // max_test_value: u32, + // ) -> DispatchResult { + // Self::ensure_origin_and_enabled(origin.clone())?; + // Self::inc_test_value(origin.clone())?; - if >::get() == max_test_value { - SchedulerPallet::::cancel_named(origin, id)?; - } + // if >::get() == max_test_value { + // SchedulerPallet::::cancel_named(origin, id)?; + // } - Ok(()) - } + // Ok(()) + // } #[pallet::weight(100_000_000)] pub fn just_take_fee(origin: OriginFor) -> DispatchResult { --- a/tests/src/pallet-presence.test.ts +++ b/tests/src/pallet-presence.test.ts @@ -63,7 +63,6 @@ const chain = await helper.callRpc('api.rpc.system.chain', []); const refungible = 'refungible'; - const scheduler = 'scheduler'; const foreignAssets = 'foreignassets'; const rmrkPallets = ['rmrkcore', 'rmrkequip']; const appPromotion = 'apppromotion'; @@ -72,11 +71,9 @@ if (chain.eq('OPAL by UNIQUE')) { requiredPallets.push( refungible, - // scheduler, foreignAssets, appPromotion, testUtils, - scheduler, ...rmrkPallets, ); } else if (chain.eq('QUARTZ by UNIQUE')) { -- gitstuff