CLI API refactoring and improvement

bin/node-template/Cargo.toml

@@ -11,9 +11,7 @@ path = "src/main.rs"
 
 [dependencies]
 futures = "0.3.1"
-ctrlc = { version = "3.1.3", features = ["termination"] }
 log = "0.4.8"
-tokio = { version = "0.2", features = ["rt-threaded"] }
 sc-cli = { version = "0.8.0", path = "../../client/cli" }
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sc-executor = { version = "0.8", path = "../../client/executor" }
@@ -30,7 +28,7 @@ grandpa-primitives = { version = "2.0.0", package = "sp-finality-grandpa", path
 sc-client = { version = "0.8", path = "../../client/" }
 node-template-runtime = { version = "2.0.0", path = "runtime" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
-sc-basic-authorship = { path  = "../../client/basic-authorship" }
+sc-basic-authorship = { path = "../../client/basic-authorship" }
 
 [build-dependencies]
 vergen = "3.0.4"

bin/node-template/src/cli.rs

@@ -1,62 +1,30 @@
 use crate::service;
-use futures::{future::{select, Map, Either}, FutureExt, channel::oneshot};
-use std::cell::RefCell;
-use tokio::runtime::Runtime;
-pub use sc_cli::{VersionInfo, IntoExit, error};
-use sc_cli::{display_role, informant, parse_and_prepare, ParseAndPrepare, NoCustom};
-use sc_service::{AbstractService, Roles as ServiceRoles, Configuration};
+pub use sc_cli::{VersionInfo, error};
+use sc_cli::CoreParams;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
 use crate::chain_spec;
-use log::info;
 
 /// Parse command line arguments into service configuration.
-pub fn run<I, T, E>(args: I, exit: E, version: VersionInfo) -> error::Result<()> where
-	I: IntoIterator<Item = T>,
+pub fn run<I, T>(args: I, version: VersionInfo) -> error::Result<()>
+where
+	I: Iterator<Item = T>,
 	T: Into<std::ffi::OsString> + Clone,
-	E: IntoExit,
 {
-	type Config<T> = Configuration<(), T>;
-	match parse_and_prepare::<NoCustom, NoCustom, _>(&version, "substrate-node", args) {
-		ParseAndPrepare::Run(cmd) => cmd.run(load_spec, exit,
-		|exit, _cli_args, _custom_args, mut config: Config<_>| {
-			info!("{}", version.name);
-			info!("  version {}", config.full_version());
-			info!("  by {}, 2017, 2018", version.author);
-			info!("Chain specification: {}", config.chain_spec.name());
-			info!("Node name: {}", config.name);
-			info!("Roles: {}", display_role(&config));
-			let runtime = Runtime::new().map_err(|e| format!("{:?}", e))?;
-			config.tasks_executor = {
-				let runtime_handle = runtime.handle().clone();
-				Some(Box::new(move |fut| { runtime_handle.spawn(fut); }))
-			};
-			match config.roles {
-				ServiceRoles::LIGHT => run_until_exit(
-					runtime,
-					service::new_light(config)?,
-					exit
-				),
-				_ => run_until_exit(
-					runtime,
-					service::new_full(config)?,
-					exit
-				),
-			}
-		}),
-		ParseAndPrepare::BuildSpec(cmd) => cmd.run::<NoCustom, _, _, _>(load_spec),
-		ParseAndPrepare::ExportBlocks(cmd) => cmd.run_with_builder(|config: Config<_>|
-			Ok(new_full_start!(config).0), load_spec, exit),
-		ParseAndPrepare::ImportBlocks(cmd) => cmd.run_with_builder(|config: Config<_>|
-			Ok(new_full_start!(config).0), load_spec, exit),
-		ParseAndPrepare::CheckBlock(cmd) => cmd.run_with_builder(|config: Config<_>|
-			Ok(new_full_start!(config).0), load_spec, exit),
-		ParseAndPrepare::PurgeChain(cmd) => cmd.run(load_spec),
-		ParseAndPrepare::RevertChain(cmd) => cmd.run_with_builder(|config: Config<_>|
-			Ok(new_full_start!(config).0), load_spec),
-		ParseAndPrepare::CustomCommand(_) => Ok(())
-	}?;
-
-	Ok(())
+	let args: Vec<_> = args.collect();
+	let core_params = sc_cli::from_iter::<CoreParams, _>(args.clone(), &version);
+
+	let mut config = sc_service::Configuration::default();
+	config.impl_name = "node-template";
+
+	sc_cli::run(
+		config,
+		core_params,
+		service::new_light,
+		service::new_full,
+		load_spec,
+		|config: _| Ok(new_full_start!(config).0),
+		&version,
+	)
 }
 
 fn load_spec(id: &str) -> Result<Option<chain_spec::ChainSpec>, String> {
@@ -65,55 +33,3 @@ fn load_spec(id: &str) -> Result<Option<chain_spec::ChainSpec>, String> {
 		None => None,
 	})
 }
-
-fn run_until_exit<T, E>(
-	mut runtime: Runtime,
-	service: T,
-	e: E,
-) -> error::Result<()>
-where
-	T: AbstractService,
-	E: IntoExit,
-{
-	let (exit_send, exit) = oneshot::channel();
-
-	let informant = informant::build(&service);
-
-	let handle = runtime.spawn(select(exit, informant));
-
-	// we eagerly drop the service so that the internal exit future is fired,
-	// but we need to keep holding a reference to the global telemetry guard
-	let _telemetry = service.telemetry();
-
-	let exit = e.into_exit();
-	let service_res = runtime.block_on(select(service, exit));
-
-	let _ = exit_send.send(());
-
-	runtime.block_on(handle);
-
-	match service_res {
-		Either::Left((res, _)) => res.map_err(error::Error::Service),
-		Either::Right((_, _)) => Ok(())
-	}
-}
-
-// handles ctrl-c
-pub struct Exit;
-impl IntoExit for Exit {
-	type Exit = Map<oneshot::Receiver<()>, fn(Result<(), oneshot::Canceled>) -> ()>;
-	fn into_exit(self) -> Self::Exit {
-		// can't use signal directly here because CtrlC takes only `Fn`.
-		let (exit_send, exit) = oneshot::channel();
-
-		let exit_send_cell = RefCell::new(Some(exit_send));
-		ctrlc::set_handler(move || {
-			let exit_send = exit_send_cell.try_borrow_mut().expect("signal handler not reentrant; qed").take();
-			if let Some(exit_send) = exit_send {
-				exit_send.send(()).expect("Error sending exit notification");
-			}
-		}).expect("Error setting Ctrl-C handler");
-
-		exit.map(drop)
-	}
-}