From 4d9c3a3b1dce2635ae5c28a7a90721b26dcf863e Mon Sep 17 00:00:00 2001
From: Javier Viola <363911+pepoviola@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:21:44 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20logic=20to=20build=20raw=20version=20fro?=
=?UTF-8?q?m=20a=20plain=20chain-spec=20provided=20in=20c=E2=80=A6=20(#226?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/network_spec/parachain.rs | 35 +++++++++----------
.../src/network_spec/relaychain.rs | 28 ++++++++-------
2 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/crates/orchestrator/src/network_spec/parachain.rs b/crates/orchestrator/src/network_spec/parachain.rs
index 7c6ec53..730e9e0 100644
--- a/crates/orchestrator/src/network_spec/parachain.rs
+++ b/crates/orchestrator/src/network_spec/parachain.rs
@@ -108,27 +108,24 @@ impl ParachainSpec {
};
let chain_spec_builder = chain_spec_builder.set_chain_name(chain_name);
+ let replacements = HashMap::from([
+ ("disableBootnodes", "--disable-default-bootnode"),
+ ("mainCommand", main_cmd.as_str()),
+ ]);
+ let tmpl = if let Some(tmpl) = config.chain_spec_command() {
+ apply_replacements(tmpl, &replacements)
+ } else {
+ apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
+ };
+
+ let chain_spec = chain_spec_builder
+ .command(tmpl.as_str(), config.chain_spec_command_is_local())
+ .image(main_image.clone());
+
if let Some(chain_spec_path) = config.chain_spec_path() {
- Some(chain_spec_builder.asset_location(chain_spec_path.clone()))
+ Some(chain_spec.asset_location(chain_spec_path.clone()))
} else {
- // TODO: Do we need to add the posibility to set the command to use?
- // Currently (v1) is possible but when is set is set to the default command.
-
- let replacements = HashMap::from([
- ("disableBootnodes", "--disable-default-bootnode"),
- ("mainCommand", main_cmd.as_str()),
- ]);
- let tmpl = if let Some(tmpl) = config.chain_spec_command() {
- apply_replacements(tmpl, &replacements)
- } else {
- apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
- };
-
- Some(
- chain_spec_builder
- .command(tmpl.as_str(), config.chain_spec_command_is_local())
- .image(main_image.clone()),
- )
+ Some(chain_spec)
}
} else {
None
diff --git a/crates/orchestrator/src/network_spec/relaychain.rs b/crates/orchestrator/src/network_spec/relaychain.rs
index 78d883b..a835244 100644
--- a/crates/orchestrator/src/network_spec/relaychain.rs
+++ b/crates/orchestrator/src/network_spec/relaychain.rs
@@ -73,24 +73,26 @@ impl RelaychainSpec {
.or(config.nodes().first().and_then(|node| node.image()))
.map(|image| image.as_str().to_string());
+ let replacements = HashMap::from([
+ ("disableBootnodes", "--disable-default-bootnode"),
+ ("mainCommand", main_cmd.as_str()),
+ ]);
+ let tmpl = if let Some(tmpl) = config.chain_spec_command() {
+ apply_replacements(tmpl, &replacements)
+ } else {
+ apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
+ };
+
let chain_spec = ChainSpec::new(config.chain().as_str(), Context::Relay)
- .set_chain_name(config.chain().as_str());
+ .set_chain_name(config.chain().as_str())
+ .command(tmpl.as_str(), config.chain_spec_command_is_local())
+ .image(main_image.clone());
+
+ // Add asset location if present
let chain_spec = if let Some(chain_spec_path) = config.chain_spec_path() {
chain_spec.asset_location(chain_spec_path.clone())
} else {
- let replacements = HashMap::from([
- ("disableBootnodes", "--disable-default-bootnode"),
- ("mainCommand", main_cmd.as_str()),
- ]);
- let tmpl = if let Some(tmpl) = config.chain_spec_command() {
- apply_replacements(tmpl, &replacements)
- } else {
- apply_replacements(DEFAULT_CHAIN_SPEC_TPL_COMMAND, &replacements)
- };
-
chain_spec
- .command(tmpl.as_str(), config.chain_spec_command_is_local())
- .image(main_image.clone())
};
// build the `node_specs`
--
GitLab