Companion for Substrate#14511 (#2821)

* Companion for Substrate#14511

https://github.com/paritytech/substrate/pull/14511

* update lockfile for {"substrate", "polkadot"}

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Bastian Köcher
2023-07-05 10:39:48 +02:00
committed by GitHub
parent 8dae85f5f8
commit fdd2e5221e
11 changed files with 314 additions and 390 deletions
+1 -9
View File
@@ -19,7 +19,7 @@ use std::{net::SocketAddr, path::PathBuf};
use polkadot_service::{ChainSpec, ParaId, PrometheusConfig};
use sc_cli::{
CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams,
Result as CliResult, RuntimeVersion, SharedParams, SubstrateCli,
Result as CliResult, SharedParams, SubstrateCli,
};
use sc_service::BasePath;
@@ -296,10 +296,6 @@ impl SubstrateCli for TestCollatorCli {
},
})
}
fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
&cumulus_test_service::runtime::VERSION
}
}
impl SubstrateCli for RelayChainCli {
@@ -337,8 +333,4 @@ impl SubstrateCli for RelayChainCli {
<polkadot_cli::Cli as SubstrateCli>::from_iter([RelayChainCli::executable_name()].iter())
.load_spec(id)
}
fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
polkadot_cli::Cli::native_runtime_version(chain_spec)
}
}
-9
View File
@@ -103,14 +103,6 @@ fn main() -> Result<(), sc_cli::Error> {
&parachain_id,
);
let state_version =
RelayChainCli::native_runtime_version(&config.chain_spec).state_version();
let block: parachains_common::Block =
generate_genesis_block(&*config.chain_spec, state_version)
.map_err(|e| format!("{:?}", e))?;
let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
let tokio_handle = config.tokio_handle.clone();
let polkadot_config =
SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle)
@@ -118,7 +110,6 @@ fn main() -> Result<(), sc_cli::Error> {
tracing::info!("Parachain id: {:?}", parachain_id);
tracing::info!("Parachain Account: {}", parachain_account);
tracing::info!("Parachain genesis state: {}", genesis_state);
tracing::info!(
"Is collating: {}",
if config.role.is_authority() { "yes" } else { "no" }