difftreelog
Merge pull request #770 from UniqueNetwork/fix/disable-scheduler-v2-everywhere
in: master
4 files changed
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth57 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,595960 #[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,626263 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,63 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,6464runtime/opal/Cargo.tomldiffbeforeafterboth--- 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',
test-pallets/utils/src/lib.rsdiffbeforeafterboth--- 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<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
/// The overarching call type.
@@ -108,21 +108,21 @@
Self::set_test_value(origin, <TestValue<T>>::get() + 1)
}
- #[pallet::weight(10_000)]
- pub fn self_canceling_inc(
- origin: OriginFor<T>,
- 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<T>,
+ // id: TaskName,
+ // max_test_value: u32,
+ // ) -> DispatchResult {
+ // Self::ensure_origin_and_enabled(origin.clone())?;
+ // Self::inc_test_value(origin.clone())?;
- if <TestValue<T>>::get() == max_test_value {
- SchedulerPallet::<T>::cancel_named(origin, id)?;
- }
+ // if <TestValue<T>>::get() == max_test_value {
+ // SchedulerPallet::<T>::cancel_named(origin, id)?;
+ // }
- Ok(())
- }
+ // Ok(())
+ // }
#[pallet::weight(100_000_000)]
pub fn just_take_fee(origin: OriginFor<T>) -> DispatchResult {
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- 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')) {