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

--- 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,

--- 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.

193    'refungible',193    'refungible',
194    'rmrk',194    'rmrk',
195    'app-promotion',195    'app-promotion',
196    'collator-selection',
197    'foreign-assets',196    'foreign-assets',
198    'pallet-test-utils',197    'pallet-test-utils',
199]198]

--- 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 = []

--- 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