git.delta.rocks / unique-network / refs/commits / ff6d0176d1b5

difftreelog

Merge pull request #770 from UniqueNetwork/fix/disable-scheduler-v2-everywhere

ut-akuznetsov2022-12-14parents: #cfd2000 #d41c81b.patch.diff
in: master

4 files changed

modifiedruntime/common/construct_runtime/mod.rsdiffbeforeafterboth
57 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,57 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,
58 Unique: pallet_unique::{Pallet, Call, Storage} = 61,58 Unique: pallet_unique::{Pallet, Call, Storage} = 61,
5959
60 #[runtimes(opal)]60 // #[runtimes(opal)]
61 Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,61 // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,
6262
63 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,63 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,
6464
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
179limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']179limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
180opal-runtime = [180opal-runtime = [
181 'refungible',181 'refungible',
182 'scheduler',
183 'rmrk',182 'rmrk',
184 'app-promotion',183 'app-promotion',
185 'foreign-assets',184 'foreign-assets',
modifiedtest-pallets/utils/src/lib.rsdiffbeforeafterboth
29 };29 };
30 use frame_system::pallet_prelude::*;30 use frame_system::pallet_prelude::*;
31 use sp_std::vec::Vec;31 use sp_std::vec::Vec;
32 use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet};32 // use pallet_unique_scheduler_v2::{TaskName, Pallet as SchedulerPallet};
3333
34 #[pallet::config]34 #[pallet::config]
35 pub trait Config: frame_system::Config + pallet_unique_scheduler_v2::Config {35 pub trait Config: frame_system::Config /*+ pallet_unique_scheduler_v2::Config*/ {
36 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;36 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
3737
38 /// The overarching call type.38 /// The overarching call type.
108 Self::set_test_value(origin, <TestValue<T>>::get() + 1)108 Self::set_test_value(origin, <TestValue<T>>::get() + 1)
109 }109 }
110110
111 #[pallet::weight(10_000)]111 // #[pallet::weight(10_000)]
112 pub fn self_canceling_inc(112 // pub fn self_canceling_inc(
113 origin: OriginFor<T>,113 // origin: OriginFor<T>,
114 id: TaskName,114 // id: TaskName,
115 max_test_value: u32,115 // max_test_value: u32,
116 ) -> DispatchResult {116 // ) -> DispatchResult {
117 Self::ensure_origin_and_enabled(origin.clone())?;117 // Self::ensure_origin_and_enabled(origin.clone())?;
118 Self::inc_test_value(origin.clone())?;118 // Self::inc_test_value(origin.clone())?;
119119
120 if <TestValue<T>>::get() == max_test_value {120 // if <TestValue<T>>::get() == max_test_value {
121 SchedulerPallet::<T>::cancel_named(origin, id)?;121 // SchedulerPallet::<T>::cancel_named(origin, id)?;
122 }122 // }
123123
124 Ok(())124 // Ok(())
125 }125 // }
126126
127 #[pallet::weight(100_000_000)]127 #[pallet::weight(100_000_000)]
128 pub fn just_take_fee(origin: OriginFor<T>) -> DispatchResult {128 pub fn just_take_fee(origin: OriginFor<T>) -> DispatchResult {
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
63 const chain = await helper.callRpc('api.rpc.system.chain', []);63 const chain = await helper.callRpc('api.rpc.system.chain', []);
6464
65 const refungible = 'refungible';65 const refungible = 'refungible';
66 const scheduler = 'scheduler';
67 const foreignAssets = 'foreignassets';66 const foreignAssets = 'foreignassets';
68 const rmrkPallets = ['rmrkcore', 'rmrkequip'];67 const rmrkPallets = ['rmrkcore', 'rmrkequip'];
69 const appPromotion = 'apppromotion';68 const appPromotion = 'apppromotion';
72 if (chain.eq('OPAL by UNIQUE')) {71 if (chain.eq('OPAL by UNIQUE')) {
73 requiredPallets.push(72 requiredPallets.push(
74 refungible,73 refungible,
75 // scheduler,
76 foreignAssets,74 foreignAssets,
77 appPromotion,75 appPromotion,
78 testUtils,76 testUtils,
79 scheduler,
80 ...rmrkPallets,77 ...rmrkPallets,
81 );78 );
82 } else if (chain.eq('QUARTZ by UNIQUE')) {79 } else if (chain.eq('QUARTZ by UNIQUE')) {