difftreelog
Merge pull request #770 from UniqueNetwork/fix/disable-scheduler-v2-everywhere
in: master
4 files changed
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} = 61,
- #[runtimes(opal)]
- Scheduler: pallet_unique_scheduler_v2::{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,
runtime/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.tsdiffbeforeafterboth1// 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/>.1617import {itSub, usingPlaygrounds, expect} from './util';1819// Pallets that must always be present20const requiredPallets = [21 'balances',22 'common',23 'randomnesscollectiveflip',24 'timestamp',25 'transactionpayment',26 'treasury',27 'structure',28 'system',29 'vesting',30 'parachainsystem',31 'parachaininfo',32 'evm',33 'evmcodersubstrate',34 'evmcontracthelpers',35 'evmmigration',36 'evmtransactionpayment',37 'ethereum',38 'fungible',39 'xcmpqueue',40 'polkadotxcm',41 'cumulusxcm',42 'dmpqueue',43 'inflation',44 'unique',45 'nonfungible',46 'charging',47 'configuration',48 'tokens',49 'xtokens',50 'maintenance',51];5253// Pallets that depend on consensus and governance configuration54const consensusPallets = [55 'sudo',56 'aura',57 'auraext',58];5960describe('Pallet presence', () => {61 before(async () => {62 await usingPlaygrounds(async helper => {63 const chain = await helper.callRpc('api.rpc.system.chain', []);6465 const refungible = 'refungible';66 const foreignAssets = 'foreignassets';67 const rmrkPallets = ['rmrkcore', 'rmrkequip'];68 const appPromotion = 'apppromotion';69 const testUtils = 'testutils';7071 if (chain.eq('OPAL by UNIQUE')) {72 requiredPallets.push(73 refungible,74 foreignAssets,75 appPromotion,76 testUtils,77 ...rmrkPallets,78 );79 } else if (chain.eq('QUARTZ by UNIQUE')) {80 requiredPallets.push(refungible);81 } else if (chain.eq('UNIQUE')) {82 // Insert Unique additional pallets here83 }84 });85 });8687 itSub('Required pallets are present', ({helper}) => {88 expect(helper.fetchAllPalletNames()).to.contain.members([...requiredPallets]);89 });9091 itSub('Governance and consensus pallets are present', ({helper}) => {92 expect(helper.fetchAllPalletNames()).to.contain.members([...consensusPallets]);93 });9495 itSub('No extra pallets are included', ({helper}) => {96 expect(helper.fetchAllPalletNames().sort()).to.be.deep.equal([...requiredPallets, ...consensusPallets].sort());97 });98});