WIP

Forked at: ea65c31
Parent branch: origin/master

test/parachain/src/service.rs

@@ -86,11 +86,12 @@ macro_rules! new_full_start {
 ///
 /// This function blocks until done.
 pub fn run_collator<E: sc_service::ChainSpecExtension>(
-	mut parachain_config: Configuration<GenesisConfig, E>,
+	parachain_config: Configuration<GenesisConfig, E>,
 	key: Arc<CollatorPair>,
-	polkadot_config: polkadot_collator::Configuration,
+	mut polkadot_config: polkadot_collator::Configuration,
 ) -> sc_cli::error::Result<()> {
-	sc_cli::run_service_until_exit(parachain_config, |parachain_config| {
+	sc_cli::run_service_until_exit(parachain_config, move |parachain_config| {
+		let task_executor = parachain_config.task_executor.clone().unwrap();
 		polkadot_config.task_executor = parachain_config.task_executor.clone();
 
 		let (builder, inherent_data_providers) = new_full_start!(parachain_config);
@@ -120,9 +121,9 @@ pub fn run_collator<E: sc_service::ChainSpecExtension>(
 		};
 
 		let polkadot_future = polkadot_collator::build_collator(polkadot_config, crate::PARA_ID, key, Box::new(builder));
+		//let polkadot_future = async { () };
 		//service.spawn_essential_task("polkadot", polkadot_future);
 
-		let task_executor = parachain_config.task_executor.as_ref().unwrap();
 		task_executor(Box::pin(polkadot_future));
 
 		Ok(service)