Client preparation for 0.2.1 release (#394)

* Use chain_id as default data folder name * Set zeitgeist/dev as default for parachain/standalone * Remove battery park
zeitgeistpm · Dec 5, 2021 · a9ff969 · a9ff969
1 parent 7037cb4
commit a9ff969
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 126 deletions.
diff --git a/node/res/bp.json b/node/res/bp.json
diff --git a/node/src/chain_spec/battery_park.rs b/node/src/chain_spec/battery_park.rs
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
@@ -1,13 +1,9 @@
 mod additional_chain_spec;
-#[cfg(not(feature = "parachain"))]
-mod battery_park;
 mod battery_station;
 mod dev;
 mod zeitgeist;
 
 pub use additional_chain_spec::AdditionalChainSpec;
-#[cfg(not(feature = "parachain"))]
-pub use battery_park::battery_park_staging_config;
 pub use battery_station::battery_station_staging_config;
 pub use dev::dev_config;
 use hex_literal::hex;

diff --git a/node/src/cli.rs b/node/src/cli.rs
@@ -128,27 +128,11 @@ pub fn load_spec(
     id: &str,
     #[cfg(feature = "parachain")] parachain_id: cumulus_primitives_core::ParaId,
 ) -> Result<Box<dyn sc_service::ChainSpec>, String> {
-    #[cfg(feature = "parachain")]
-    const BATTERY_PARK_PC: &str = "Battery park isn't supposed to be used for parachains";
     Ok(match id {
         "" | "dev" => Box::new(crate::chain_spec::dev_config(
             #[cfg(feature = "parachain")]
             parachain_id,
         )?),
-        "battery_park" => {
-            #[cfg(feature = "parachain")]
-            return Err(BATTERY_PARK_PC.into());
-            #[cfg(not(feature = "parachain"))]
-            Box::new(crate::chain_spec::ChainSpec::from_json_bytes(
-                &include_bytes!("../res/bp.json")[..],
-            )?)
-        }
-        "battery_park_staging" => {
-            #[cfg(feature = "parachain")]
-            return Err(BATTERY_PARK_PC.into());
-            #[cfg(not(feature = "parachain"))]
-            Box::new(crate::chain_spec::battery_park_staging_config()?)
-        }
         "battery_station" => Box::new(crate::chain_spec::ChainSpec::from_json_bytes(
             #[cfg(feature = "parachain")]
             &include_bytes!("../res/bs_parachain.json")[..],

diff --git a/node/src/cli/cli_parachain.rs b/node/src/cli/cli_parachain.rs
@@ -26,7 +26,10 @@ impl RelayChainCli {
     ) -> Self {
         let extension = crate::chain_spec::Extensions::try_get(&*para_config.chain_spec);
         let chain_id = extension.map(|e| e.relay_chain.clone());
-        let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot"));
+        let base_path = para_config
+            .base_path
+            .as_ref()
+            .map(|x| x.path().join(chain_id.clone().unwrap_or_else(|| "polkadot".into())));
         Self { base_path, chain_id, base: polkadot_cli::RunCmd::from_iter(relay_chain_args) }
     }
 }

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -8,7 +8,17 @@ use {
 };
 
 pub fn run() -> sc_cli::Result<()> {
-    let cli = <Cli as SubstrateCli>::from_args();
+    let mut cli = <Cli as SubstrateCli>::from_args();
+
+    // Set default chain on parachain to zeitgeist and on standalone to dev
+    #[cfg(feature = "parachain")]
+    if cli.run.base.shared_params.chain == None {
+        cli.run.base.shared_params.chain = Some("zeitgeist".to_string());
+    }
+    #[cfg(not(feature = "parachain"))]
+    if cli.run.shared_params.chain == None {
+        cli.run.shared_params.dev = true;
+    }
 
     match &cli.subcommand {
         #[cfg(feature = "runtime-benchmarks")]

diff --git a/scripts/runtime-upgrade/test_runtime_upgrade.sh b/scripts/runtime-upgrade/test_runtime_upgrade.sh
@@ -9,15 +9,15 @@ SUDO_KEY="0x5c0d1176a568c1f92944340dbfed9e9c530ebca703c85910e7164cb7d1c9e47b"
 ALICE_SUDO="0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"
 
 BLOCK=$1
-ID=battery_park_runtime_upgrade_test
+ID=battery_station_runtime_upgrade_test
 PRODUCTION_IMAGE=zeitgeistpm/zeitgeist-node:latest
 
 # Sync with live network
 #
 # Comment this whole section if `/tmp/migration` is already synced.
 
 mkdir -p /tmp/migration
-sudo docker run -d --name migration -v /tmp/migration:/zeitgeist/data $PRODUCTION_IMAGE --base-path /zeitgeist/data --chain battery_park --pruning archive
+sudo docker run -d --name migration -v /tmp/migration:/zeitgeist/data $PRODUCTION_IMAGE --base-path /zeitgeist/data --chain battery_station --pruning archive
 sleep 3m
 sudo docker container stop migration
 sudo docker container rm migration
@@ -27,7 +27,7 @@ sudo docker container rm migration
 rm -rf /tmp/migration-copy
 cp -r /tmp/migration /tmp/migration-copy
 cargo build --bin zeitgeist --release
-./target/release/zeitgeist export-state --base-path /tmp/migration-copy --chain battery_park --pruning archive $BLOCK > /tmp/test-upgrade.json
+./target/release/zeitgeist export-state --base-path /tmp/migration-copy --chain battery_station --pruning archive $BLOCK > /tmp/test-upgrade.json
 
 sed -i '/"bootNodes": \[/,/\]/c\ \ "bootNodes": [],' /tmp/test-upgrade.json
 sed -i "s/\"chainType\": \"Live\"/\"chainType\": \"Local\"/" /tmp/test-upgrade.json