difftreelog
build(collator-selection) switch to quartz
in: master
5 files changed
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -143,7 +143,7 @@
AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
}
-#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+#[cfg(feature = "quartz-runtime")]
macro_rules! testnet_genesis {
(
$runtime:path,
@@ -207,7 +207,7 @@
}};
}
-#[cfg(any(feature = "unique-runtime", feature = "quartz-runtime"))]
+#[cfg(not(feature = "quartz-runtime"))]
macro_rules! testnet_genesis {
(
$runtime:path,
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -32,13 +32,13 @@
ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
- #[runtimes(opal)]
+ #[runtimes(quartz)]
Authorship: pallet_authorship::{Pallet, Call, Storage} = 22,
- #[runtimes(opal)]
+ #[runtimes(quartz)]
CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 23,
- #[runtimes(opal)]
+ #[runtimes(quartz)]
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 24,
Aura: pallet_aura::{Pallet, Config<T>} = 25,
@@ -56,7 +56,7 @@
Tokens: orml_tokens = 39,
// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,
- #[runtimes(opal)]
+ #[runtimes(quartz)]
Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 40,
// XCM helpers.
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -193,7 +193,6 @@
'refungible',
'rmrk',
'app-promotion',
- 'collator-selection',
'foreign-assets',
'pallet-test-utils',
]
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -181,7 +181,7 @@
"pallet-maintenance/std",
]
limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
-quartz-runtime = ['refungible', 'app-promotion', 'foreign-assets']
+quartz-runtime = ['refungible', 'app-promotion', 'collator-selection', 'foreign-assets']
pov-estimate = []
refungible = []
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 collatorSelection = ['authorship', 'session', 'collatorselection', 'identity'];70 const testUtils = 'testutils';7172 if (chain.eq('OPAL by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {73 requiredPallets.push(74 refungible,75 foreignAssets,76 appPromotion,77 testUtils,78 ...rmrkPallets,79 ...collatorSelection,80 );81 } else if (chain.eq('QUARTZ by UNIQUE')) {82 requiredPallets.push(83 refungible,84 appPromotion,85 foreignAssets,86 );87 } else if (chain.eq('UNIQUE')) {88 // Insert Unique additional pallets here89 requiredPallets.push(foreignAssets);90 }91 });92 });9394 itSub('Required pallets are present', ({helper}) => {95 expect(helper.fetchAllPalletNames()).to.contain.members([...requiredPallets]);96 });9798 itSub('Governance and consensus pallets are present', ({helper}) => {99 expect(helper.fetchAllPalletNames()).to.contain.members([...consensusPallets]);100 });101102 itSub('No extra pallets are included', ({helper}) => {103 expect(helper.fetchAllPalletNames().sort()).to.be.deep.equal([...requiredPallets, ...consensusPallets].sort());104 });105});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/>.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 collatorSelection = ['authorship', 'session', 'collatorselection', 'identity'];70 const testUtils = 'testutils';7172 if (chain.eq('OPAL by UNIQUE') || chain.eq('SAPPHIRE by UNIQUE')) {73 requiredPallets.push(74 refungible,75 foreignAssets,76 appPromotion,77 testUtils,78 ...rmrkPallets,79 );80 } else if (chain.eq('QUARTZ by UNIQUE')) {81 requiredPallets.push(82 refungible,83 appPromotion,84 foreignAssets,85 ...collatorSelection,86 );87 } else if (chain.eq('UNIQUE')) {88 // Insert Unique additional pallets here89 requiredPallets.push(foreignAssets);90 }91 });92 });9394 itSub('Required pallets are present', ({helper}) => {95 expect(helper.fetchAllPalletNames()).to.contain.members([...requiredPallets]);96 });9798 itSub('Governance and consensus pallets are present', ({helper}) => {99 expect(helper.fetchAllPalletNames()).to.contain.members([...consensusPallets]);100 });101102 itSub('No extra pallets are included', ({helper}) => {103 expect(helper.fetchAllPalletNames().sort()).to.be.deep.equal([...requiredPallets, ...consensusPallets].sort());104 });105});