Correct RuntimeApi & RuntimeExecutor (#141)

darwinia-network · Dec 20, 2022 · 02b2ccb · 02b2ccb
1 parent 4187b7b
commit 02b2ccb
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 21 deletions.
diff --git a/node/src/command.rs b/node/src/command.rs
@@ -594,17 +594,43 @@ pub fn run() -> Result<()> {
 					SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle)
 						.map_err(|err| format!("Relay chain argument error: {}", err))?;
 
-				service::start_parachain_node(
-					config,
-					polkadot_config,
-					collator_options,
-					id,
-					hwbench,
-					&eth_rpc_config,
-				)
-				.await
-				.map(|r| r.0)
-				.map_err(Into::into)
+				return if chain_spec.is_crab() {
+					service::start_parachain_node::<CrabRuntimeApi, CrabRuntimeExecutor>(
+						config,
+						polkadot_config,
+						collator_options,
+						id,
+						hwbench,
+						&eth_rpc_config,
+					)
+					.await
+					.map(|r| r.0)
+					.map_err(Into::into)
+				} else if chain_spec.is_pangolin() {
+					service::start_parachain_node::<PangolinRuntimeApi, PangolinRuntimeExecutor>(
+						config,
+						polkadot_config,
+						collator_options,
+						id,
+						hwbench,
+						&eth_rpc_config,
+					)
+					.await
+					.map(|r| r.0)
+					.map_err(Into::into)
+				} else {
+					service::start_parachain_node::<DarwiniaRuntimeApi, DarwiniaRuntimeExecutor>(
+						config,
+						polkadot_config,
+						collator_options,
+						id,
+						hwbench,
+						&eth_rpc_config,
+					)
+					.await
+					.map(|r| r.0)
+					.map_err(Into::into)
+				};
 			})
 		},
 	}

diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
@@ -524,7 +524,7 @@ where
 }
 
 /// Start a parachain node.
-pub async fn start_parachain_node(
+pub async fn start_parachain_node<RuntimeApi, Executor>(
 	parachain_config: sc_service::Configuration,
 	polkadot_config: sc_service::Configuration,
 	collator_options: cumulus_client_cli::CollatorOptions,
@@ -533,15 +533,19 @@ pub async fn start_parachain_node(
 	eth_rpc_config: &crate::cli::EthRpcConfig,
 ) -> sc_service::error::Result<(
 	sc_service::TaskManager,
-	Arc<
-		sc_service::TFullClient<
-			Block,
-			darwinia_runtime::RuntimeApi,
-			sc_executor::NativeElseWasmExecutor<DarwiniaRuntimeExecutor>,
-		>,
-	>,
-)> {
-	start_node_impl::<darwinia_runtime::RuntimeApi, DarwiniaRuntimeExecutor, _, _>(
+	Arc<sc_service::TFullClient<Block, RuntimeApi, sc_executor::NativeElseWasmExecutor<Executor>>>,
+)>
+where
+	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>
+		+ Send
+		+ Sync
+		+ 'static,
+	RuntimeApi::RuntimeApi:
+		RuntimeApiCollection<StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>,
+	RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi<Block, AuraId>,
+	Executor: 'static + sc_executor::NativeExecutionDispatch,
+{
+	start_node_impl::<RuntimeApi, Executor, _, _>(
 		parachain_config,
 		polkadot_config,
 		collator_options,