git.delta.rocks / unique-network / refs/commits / 38a61c0f34aa

difftreelog

fix use runner's runtime

Yaroslav Bolyukin2021-10-20parent: #b96d6cf.patch.diff
in: master

1 file changed

modifiednode/cli/src/command.rsdiffbeforeafterboth
28use polkadot_parachain::primitives::AccountIdConversion;28use polkadot_parachain::primitives::AccountIdConversion;
29use sc_cli::{29use sc_cli::{
30 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,30 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
31 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, build_runtime,31 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
32};32};
33use sc_service::{33use sc_service::{
34 config::{BasePath, PrometheusConfig},34 config::{BasePath, PrometheusConfig},
160/// Parse command line arguments into service configuration.160/// Parse command line arguments into service configuration.
161pub fn run() -> Result<()> {161pub fn run() -> Result<()> {
162 let cli = Cli::from_args();162 let cli = Cli::from_args();
163 let tokio_runtime = build_runtime()?;
164163
165 match &cli.subcommand {164 match &cli.subcommand {
166 Some(Subcommand::BuildSpec(cmd)) => {165 Some(Subcommand::BuildSpec(cmd)) => {
201 let polkadot_config = SubstrateCli::create_configuration(200 let polkadot_config = SubstrateCli::create_configuration(
202 &polkadot_cli,201 &polkadot_cli,
203 &polkadot_cli,202 &polkadot_cli,
204 tokio_runtime.handle().clone(),203 config.tokio_handle.clone(),
205 )204 )
206 .map_err(|err| format!("Relay chain argument error: {}", err))?;205 .map_err(|err| format!("Relay chain argument error: {}", err))?;
207206
293 let polkadot_config = SubstrateCli::create_configuration(292 let polkadot_config = SubstrateCli::create_configuration(
294 &polkadot_cli,293 &polkadot_cli,
295 &polkadot_cli,294 &polkadot_cli,
296 tokio_runtime.handle().clone(),295 config.tokio_handle.clone(),
297 )296 )
298 .map_err(|err| format!("Relay chain argument error: {}", err))?;297 .map_err(|err| format!("Relay chain argument error: {}", err))?;
299298