pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 16:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chain spec handling (#438)

Browse Source 
Before when loading a chain spec from a file it was always using the
rococo parachains runtime genesis config. This leaded to problems when
trying to convert a shell chain spec json file to a raw chain spec.
This commit is contained in:
Bastian Köcher
2021-05-13 23:35:15 +02:00
committed by GitHub
parent c515f165e9
commit 5245525bb2
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot-parachains/src/command.rs
+15 -7
View File
@@ -49,9 +49,17 @@ fn load_spec(
)?)), )?)),
"shell" => Ok(Box::new(chain_spec::get_shell_chain_spec(para_id))), "shell" => Ok(Box::new(chain_spec::get_shell_chain_spec(para_id))),
"" => Ok(Box::new(chain_spec::get_chain_spec(para_id))), "" => Ok(Box::new(chain_spec::get_chain_spec(para_id))),
path => Ok(Box::new(chain_spec::ChainSpec::from_json_file( path => Ok({
let chain_spec = chain_spec::ChainSpec::from_json_file(
path.into(), path.into(),
)?)), )?;
if use_shell_runtime(&chain_spec) {
Box::new(chain_spec::ShellChainSpec::from_json_file(path.into())?)
} else {
Box::new(chain_spec)
}
}),
} }
} }
@@ -91,7 +99,7 @@ impl SubstrateCli for Cli {
} }
fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion { fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
if use_shell_runtime(chain_spec) { if use_shell_runtime(&**chain_spec) {
&shell_runtime::VERSION &shell_runtime::VERSION
} else { } else {
&rococo_parachain_runtime::VERSION &rococo_parachain_runtime::VERSION
@@ -149,8 +157,8 @@ fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<V
.ok_or_else(|| "Could not find wasm file in genesis state!".into()) .ok_or_else(|| "Could not find wasm file in genesis state!".into())
} }
fn use_shell_runtime(chain_spec: &Box<dyn ChainSpec>) -> bool { fn use_shell_runtime(chain_spec: &dyn ChainSpec) -> bool {
chain_spec.id().starts_with("track") || chain_spec.id().starts_with("shell") chain_spec.id().starts_with("shell")
} }
use crate::service::{new_partial, RococoParachainRuntimeExecutor, ShellRuntimeExecutor}; use crate::service::{new_partial, RococoParachainRuntimeExecutor, ShellRuntimeExecutor};
@@ -158,7 +166,7 @@ use crate::service::{new_partial, RococoParachainRuntimeExecutor, ShellRuntimeEx
macro_rules! construct_async_run { macro_rules! construct_async_run {
(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{ (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{
let runner = $cli.create_runner($cmd)?; let runner = $cli.create_runner($cmd)?;
if use_shell_runtime(&runner.config().chain_spec) { if use_shell_runtime(&*runner.config().chain_spec) {
runner.async_run(|$config| { runner.async_run(|$config| {
let $components = new_partial::<shell_runtime::RuntimeApi, ShellRuntimeExecutor, _>( let $components = new_partial::<shell_runtime::RuntimeApi, ShellRuntimeExecutor, _>(
&$config, &$config,
@@ -284,7 +292,7 @@ pub fn run() -> Result<()> {
} }
None => { None => {
let runner = cli.create_runner(&cli.run.normalize())?; let runner = cli.create_runner(&cli.run.normalize())?;
let use_shell = use_shell_runtime(&runner.config().chain_spec); let use_shell = use_shell_runtime(&*runner.config().chain_spec);
runner.run_node_until_exit(|config| async move { runner.run_node_until_exit(|config| async move {
// TODO // TODO