Update cli to new sc-cli API (#935)

* Initial commit

Forked at: 9283855dba
Parent branch: origin/master

* Switch substrate to branch cecton-the-revenge-of-the-cli

* Adapting code

* Update Cargo.lock

* Adapting code

* Adapt more code

* Implement force_kusama parameter

* Revert dependency update

* Adapt code to use ref to SubstrateCli object

* Updated to latest version

* Updated with latest changes

* Bump spec vesion

* Fixed tests

* WIP

Forked at: 9283855dba
Parent branch: origin/master

* More fixes

* Cargo.lock

* Updated code

* Fixed and adapt

* Fixed dependency issue with wasm

* Adapted code

* Revert branch change

* Cargo.lock

* Cargo.lock

* Adapt code

* Clean-up

* More clean-up

* Cargo.lock

polkadot/parachain/test-parachains/adder/collator/src/main.rs

@@ -27,10 +27,10 @@ use primitives::{
 	parachain::{HeadData, BlockData, Id as ParaId, LocalValidationData, GlobalValidationSchedule},
 };
 use collator::{
-	InvalidHead, ParachainContext, Network, BuildParachainContext, load_spec, Configuration,
+	InvalidHead, ParachainContext, Network, BuildParachainContext, Cli, SubstrateCli,
 };
 use parking_lot::Mutex;
-use futures::future::{Ready, ok, err};
+use futures::future::{Ready, ok, err, TryFutureExt};
 
 const GENESIS: AdderHead = AdderHead {
 	number: 0,
@@ -111,7 +111,7 @@ impl BuildParachainContext for AdderContext {
 	}
 }
 
-fn main() {
+fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let key = Arc::new(Pair::from_seed(&[1; 32]));
 	let id: ParaId = 100.into();
 
@@ -133,17 +133,16 @@ fn main() {
 		_network: None,
 	};
 
-	let mut config = Configuration::default();
-	config.chain_spec = Some(load_spec("dev", false).unwrap());
+	let cli = Cli::from_iter(&["-dev"]);
+	let runner = cli.create_runner(&cli.run.base)?;
+	runner.async_run(|config| {
+		collator::start_collator(
+			context,
+			id,
+			key,
+			config,
+		).map_err(|e| e.into())
+	})?;
 
-	let res = collator::run_collator(
-		context,
-		id,
-		key,
-		config,
-	);
-
-	if let Err(e) = res {
-		println!("{}", e);
-	}
+	Ok(())
 }