diff --git a/substrate/core/cli/src/lib.rs b/substrate/core/cli/src/lib.rs index d0cef45585..15eebd5411 100644 --- a/substrate/core/cli/src/lib.rs +++ b/substrate/core/cli/src/lib.rs @@ -201,7 +201,7 @@ where CC: StructOpt + Clone + GetLogFilter, RP: StructOpt + Clone + AugmentClap, E: IntoExit, - RS: FnOnce(E, RP, FactoryFullConfiguration) -> Result<(), String>, + RS: FnOnce(E, RunCmd, RP, FactoryFullConfiguration) -> Result<(), String>, I: IntoIterator, T: Into + Clone, { @@ -516,11 +516,11 @@ where F: ServiceFactory, E: IntoExit, S: FnOnce(&str) -> Result>>, String>, - RS: FnOnce(E, RP, FactoryFullConfiguration) -> Result<(), String>, + RS: FnOnce(E, RunCmd, RP, FactoryFullConfiguration) -> Result<(), String>, { - let config = create_run_node_config::(cli.left, spec_factory, impl_name, version)?; + let config = create_run_node_config::(cli.left.clone(), spec_factory, impl_name, version)?; - run_service(exit, cli.right, config).map_err(Into::into) + run_service(exit, cli.left, cli.right, config).map_err(Into::into) } // diff --git a/substrate/node-template/src/cli.rs b/substrate/node-template/src/cli.rs index 258d2194a6..f41674631e 100644 --- a/substrate/node-template/src/cli.rs +++ b/substrate/node-template/src/cli.rs @@ -17,7 +17,7 @@ pub fn run(args: I, exit: E, version: VersionInfo) -> error::Result<()> { parse_and_execute::( load_spec, &version, "substrate-node", args, exit, - |exit, _custom_args, config| { + |exit, _cli_args, _custom_args, config| { info!("{}", version.name); info!(" version {}", config.full_version()); info!(" by {}, 2017, 2018", version.author); diff --git a/substrate/node/cli/src/lib.rs b/substrate/node/cli/src/lib.rs index f0c28133c2..f9adeba9b7 100644 --- a/substrate/node/cli/src/lib.rs +++ b/substrate/node/cli/src/lib.rs @@ -80,7 +80,7 @@ pub fn run(args: I, exit: E, version: cli::VersionInfo) -> error::Resul { cli::parse_and_execute::( load_spec, &version, "substrate-node", args, exit, - |exit, _custom_args, config| { + |exit, _cli_args, _custom_args, config| { info!("{}", version.name); info!(" version {}", config.full_version()); info!(" by Parity Technologies, 2017-2019");