WIP

Forked at: 461b971
Parent branch: origin/master

test/parachain/src/command.rs

@@ -160,22 +160,24 @@ pub fn run() -> Result<()> {
 			*/
 
 			// TODO
-			//let key = Arc::new(sp_core::Pair::from_seed(&[10; 32]));
+			let key = Arc::new(sp_core::Pair::from_seed(&[10; 32]));
 
 			//polkadot_config.config_dir = config.in_chain_config_dir("polkadot");
 
 			let polkadot_cli = PolkadotCli::from_iter(
 				[PolkadotCli::executable_name().to_string()].iter().chain(cli.relaychain_args.iter()),
 			);
 
-			let polkadot_runner = polkadot_cli.create_runner(&polkadot_cli)?;
+			runner.async_run(|config| {
+				let task_executor = config.task_executor.clone();
+				let polkadot_config = <PolkadotCli as SubstrateCli>::create_configuration(&polkadot_cli, &polkadot_cli, task_executor).expect("TODO");
+
+				match config.role {
+					ServiceRole::Light => unimplemented!("Light client not supported!"),
+					_ => crate::service::run_collator(config, key, polkadot_config),
+				}
+			});
 
-			/*
-			match config.role {
-				ServiceRole::Light => unimplemented!("Light client not supported!"),
-				_ => crate::service::run_collator(config, key, polkadot_config),
-			}
-			*/
 			Ok(())
 		},
 	}
@@ -286,8 +288,7 @@ impl CliConfiguration for PolkadotCli {
 	}
 
 	fn init<C: SubstrateCli>(&self) -> Result<()> {
-		// NOTE: already initialized so, skipping...
-		Ok(())
+		unreachable!("PolkadotCli is never initialized; qed");
 	}
 }
 

test/parachain/src/service.rs

@@ -71,53 +71,46 @@ macro_rules! new_full_start {
 /// Run a collator node with the given parachain `Configuration` and relaychain `Configuration`
 ///
 /// This function blocks until done.
-pub fn run_collator(
+pub async fn run_collator(
 	parachain_config: Configuration,
 	key: Arc<CollatorPair>,
-	mut polkadot_config: polkadot_collator::Configuration,
+	polkadot_config: polkadot_collator::Configuration,
 ) -> sc_cli::Result<()> {
-	todo!();
-	/*
-	sc_cli::run_service_until_exit(parachain_config, move |parachain_config| {
-		polkadot_config.task_executor = parachain_config.task_executor.clone();
-
-		let (builder, inherent_data_providers) = new_full_start!(parachain_config);
-		inherent_data_providers
-			.register_provider(sp_timestamp::InherentDataProvider)
-			.unwrap();
-
-		let service = builder
-			.with_finality_proof_provider(|client, backend| {
-				// GenesisAuthoritySetProvider is implemented for StorageAndProofProvider
-				let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
-				Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
-			})?
-			.build()?;
-
-		let proposer_factory = sc_basic_authorship::ProposerFactory::new(
-			service.client(),
-			service.transaction_pool(),
-		);
-
-		let block_import = service.client();
-		let client = service.client();
-		let builder = CollatorBuilder::new(
-			proposer_factory,
-			inherent_data_providers,
-			block_import,
-			crate::PARA_ID,
-			client,
-		);
-
-		let polkadot_future = polkadot_collator::start_collator(
-			builder,
-			crate::PARA_ID,
-			key,
-			polkadot_config,
-		).map(|_| ());
-		service.spawn_essential_task("polkadot", polkadot_future);
-
-		Ok(service)
-	})
-	*/
+	let (builder, inherent_data_providers) = new_full_start!(parachain_config);
+	inherent_data_providers
+		.register_provider(sp_timestamp::InherentDataProvider)
+		.unwrap();
+
+	let service = builder
+		.with_finality_proof_provider(|client, backend| {
+			// GenesisAuthoritySetProvider is implemented for StorageAndProofProvider
+			let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
+			Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
+		})?
+		.build()?;
+
+	let proposer_factory = sc_basic_authorship::ProposerFactory::new(
+		service.client(),
+		service.transaction_pool(),
+	);
+
+	let block_import = service.client();
+	let client = service.client();
+	let builder = CollatorBuilder::new(
+		proposer_factory,
+		inherent_data_providers,
+		block_import,
+		crate::PARA_ID,
+		client,
+	);
+
+	let polkadot_future = polkadot_collator::start_collator(
+		builder,
+		crate::PARA_ID,
+		key,
+		polkadot_config,
+	).map(|_| ());
+	service.spawn_essential_task("polkadot", polkadot_future);
+
+	service.await.map_err(Into::into)
 }