git.delta.rocks / unique-network / refs/commits / 18cb512768e7

difftreelog

build(collator-selection) switch to quartz

Fahrrader2022-12-28parent: #5409665.patch.diff
in: master

5 files changed

modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
143 AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()143 AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
144}144}
145145
146#[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]146#[cfg(feature = "quartz-runtime")]
147macro_rules! testnet_genesis {147macro_rules! testnet_genesis {
148 (148 (
149 $runtime:path,149 $runtime:path,
207 }};207 }};
208}208}
209209
210#[cfg(any(feature = "unique-runtime", feature = "quartz-runtime"))]210#[cfg(not(feature = "quartz-runtime"))]
211macro_rules! testnet_genesis {211macro_rules! testnet_genesis {
212 (212 (
213 $runtime:path,213 $runtime:path,
modifiedruntime/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.
modifiedruntime/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',
 ]
modifiedruntime/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 = []
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -76,13 +76,13 @@
           appPromotion,
           testUtils,
           ...rmrkPallets,
-          ...collatorSelection,
         );
       } else if (chain.eq('QUARTZ by UNIQUE')) {
         requiredPallets.push(
           refungible,
           appPromotion,
           foreignAssets,
+          ...collatorSelection,
         );
       } else if (chain.eq('UNIQUE')) {
         // Insert Unique additional pallets here