difftreelog
feat move sapphire to quartz
in: master
5 files changed
node/cli/Cargo.tomldiffbeforeafterboth340 'opal-runtime?/try-runtime',340 'opal-runtime?/try-runtime',341 'try-runtime-cli/try-runtime',341 'try-runtime-cli/try-runtime',342]342]343sapphire-runtime = ['opal-runtime', 'opal-runtime/become-sapphire']343sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']344pov-estimate = [344pov-estimate = [345 'unique-runtime?/pov-estimate',345 'unique-runtime?/pov-estimate',346 'quartz-runtime?/pov-estimate',346 'quartz-runtime?/pov-estimate',runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -44,7 +44,7 @@
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
'pallet-maintenance/runtime-benchmarks',
- 'cumulus-pallet-parachain-system/runtime-benchmarks'
+ 'cumulus-pallet-parachain-system/runtime-benchmarks',
]
try-runtime = [
'frame-try-runtime',
@@ -185,7 +185,6 @@
'foreign-assets',
'pallet-test-utils',
]
-become-sapphire = []
pov-estimate = []
refungible = []
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -44,14 +44,7 @@
pub use runtime_common::*;
-#[cfg(feature = "become-sapphire")]
-pub const RUNTIME_NAME: &str = "sapphire";
-#[cfg(feature = "become-sapphire")]
-pub const TOKEN_SYMBOL: &str = "QTZ";
-
-#[cfg(not(feature = "become-sapphire"))]
pub const RUNTIME_NAME: &str = "opal";
-#[cfg(not(feature = "become-sapphire"))]
pub const TOKEN_SYMBOL: &str = "OPL";
/// This runtime version.
@@ -68,15 +61,6 @@
parameter_types! {
pub const Version: RuntimeVersion = VERSION;
-}
-#[cfg(feature = "become-sapphire")]
-parameter_types! {
- pub const SS58Prefix: u16 = 8883;
- pub const ChainId: u64 = 8883;
-}
-
-#[cfg(not(feature = "become-sapphire"))]
-parameter_types! {
pub const SS58Prefix: u16 = 42;
pub const ChainId: u64 = 8882;
}
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -171,6 +171,7 @@
]
limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
quartz-runtime = ['refungible', 'app-promotion', 'foreign-assets']
+become-sapphire = []
pov-estimate = []
refungible = []
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -44,6 +44,9 @@
pub use runtime_common::*;
+#[cfg(feature = "become-sapphire")]
+pub const RUNTIME_NAME: &str = "sapphire";
+#[cfg(not(feature = "become-sapphire"))]
pub const RUNTIME_NAME: &str = "quartz";
pub const TOKEN_SYMBOL: &str = "QTZ";
@@ -61,6 +64,15 @@
parameter_types! {
pub const Version: RuntimeVersion = VERSION;
+}
+#[cfg(feature = "become-sapphire")]
+parameter_types! {
+ pub const SS58Prefix: u16 = 8883;
+ pub const ChainId: u64 = 8883;
+}
+
+#[cfg(not(feature = "become-sapphire"))]
+parameter_types! {
pub const SS58Prefix: u8 = 255;
pub const ChainId: u64 = 8881;
}