replace task executor with tokio handler

paritytech/substrate#9737

Author: shawntabrizi

polkadot-parachains/src/command.rs

@@ -18,8 +18,8 @@ use crate::{
 	chain_spec,
 	cli::{Cli, RelayChainCli, Subcommand},
 	service::{
-		StatemineRuntimeExecutor, StatemintRuntimeExecutor, WestmintRuntimeExecutor, new_partial,
-		RococoParachainRuntimeExecutor, ShellRuntimeExecutor, Block,
+		new_partial, Block, RococoParachainRuntimeExecutor, ShellRuntimeExecutor,
+		StatemineRuntimeExecutor, StatemintRuntimeExecutor, WestmintRuntimeExecutor,
 	},
 };
 use codec::Encode;
@@ -28,8 +28,8 @@ use cumulus_primitives_core::ParaId;
 use log::info;
 use polkadot_parachain::primitives::AccountIdConversion;
 use sc_cli::{
-	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-	NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
+	build_runtime, ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams,
+	KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
@@ -327,7 +327,7 @@ pub fn run() -> Result<()> {
 				let polkadot_config = SubstrateCli::create_configuration(
 					&polkadot_cli,
 					&polkadot_cli,
-					config.task_executor.clone(),
+					config.tokio_handle.clone(),
 				)
 				.map_err(|err| format!("Relay chain argument error: {}", err))?;
 
@@ -423,10 +423,13 @@ pub fn run() -> Result<()> {
 					generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?;
 				let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
 
-				let task_executor = config.task_executor.clone();
-				let polkadot_config =
-					SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
-						.map_err(|err| format!("Relay chain argument error: {}", err))?;
+				let tokio_runtime = build_runtime()?;
+				let polkadot_config = SubstrateCli::create_configuration(
+					&polkadot_cli,
+					&polkadot_cli,
+					tokio_runtime.handle().clone(),
+				)
+				.map_err(|err| format!("Relay chain argument error: {}", err))?;
 
 				info!("Parachain id: {:?}", id);
 				info!("Parachain Account: {}", parachain_account);
@@ -441,32 +444,29 @@ pub fn run() -> Result<()> {
 				);
 
 				if config.chain_spec.is_statemint() {
-					crate::service::start_statemint_node::<statemint_runtime::RuntimeApi, StatemintRuntimeExecutor>(
-						config,
-						polkadot_config,
-						id,
-					)
-						.await
-						.map(|r| r.0)
-						.map_err(Into::into)
+					crate::service::start_statemint_node::<
+						statemint_runtime::RuntimeApi,
+						StatemintRuntimeExecutor,
+					>(config, polkadot_config, id)
+					.await
+					.map(|r| r.0)
+					.map_err(Into::into)
 				} else if config.chain_spec.is_statemine() {
-					crate::service::start_statemint_node::<statemine_runtime::RuntimeApi, StatemineRuntimeExecutor>(
-						config,
-						polkadot_config,
-						id,
-					)
-						.await
-						.map(|r| r.0)
-						.map_err(Into::into)
+					crate::service::start_statemint_node::<
+						statemine_runtime::RuntimeApi,
+						StatemineRuntimeExecutor,
+					>(config, polkadot_config, id)
+					.await
+					.map(|r| r.0)
+					.map_err(Into::into)
 				} else if config.chain_spec.is_westmint() {
-					crate::service::start_statemint_node::<westmint_runtime::RuntimeApi, WestmintRuntimeExecutor>(
-						config,
-						polkadot_config,
-						id,
-					)
-						.await
-						.map(|r| r.0)
-						.map_err(Into::into)
+					crate::service::start_statemint_node::<
+						westmint_runtime::RuntimeApi,
+						WestmintRuntimeExecutor,
+					>(config, polkadot_config, id)
+					.await
+					.map(|r| r.0)
+					.map_err(Into::into)
 				} else if config.chain_spec.is_shell() {
 					crate::service::start_shell_node(config, polkadot_config, id)
 						.await
@@ -575,10 +575,6 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.rpc_ws_max_connections()
 	}
 
-	fn rpc_http_threads(&self) -> Result<Option<usize>> {
-		self.base.base.rpc_http_threads()
-	}
-
 	fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {
 		self.base.base.rpc_cors(is_dev)
 	}

test/service/Cargo.toml

@@ -9,6 +9,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 rand = "0.7.3"
 serde = { version = "1.0.101", features = ["derive"] }
 async-trait = "0.1.42"
+tokio = "1.10.0"
 
 # Substrate
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }

test/service/src/lib.rs

@@ -38,7 +38,7 @@ use sc_service::{
 		OffchainWorkerConfig, PruningMode, TransactionStorageMode, WasmExecutionMethod,
 	},
 	BasePath, ChainSpec, Configuration, Error as ServiceError, PartialComponents, Role,
-	RpcHandlers, TFullBackend, TFullClient, TaskExecutor, TaskManager,
+	RpcHandlers, TFullBackend, TFullClient, TaskManager,
 };
 use sp_arithmetic::traits::SaturatedConversion;
 use sp_blockchain::HeaderBackend;
@@ -375,7 +375,7 @@ enum Consensus {
 /// A builder to create a [`TestNode`].
 pub struct TestNodeBuilder {
 	para_id: ParaId,
-	task_executor: TaskExecutor,
+	tokio_handle: tokio::runtime::Handle,
 	key: Sr25519Keyring,
 	collator_key: Option<CollatorPair>,
 	parachain_nodes: Vec<MultiaddrWithPeerId>,
@@ -391,13 +391,13 @@ impl TestNodeBuilder {
 	/// Create a new instance of `Self`.
 	///
 	/// `para_id` - The parachain id this node is running for.
-	/// `task_executor` - The task executor to use.
+	/// `tokio_handle` - The tokio handler to use.
 	/// `key` - The key that will be used to generate the name and that will be passed as `dev_seed`.
-	pub fn new(para_id: ParaId, task_executor: TaskExecutor, key: Sr25519Keyring) -> Self {
+	pub fn new(para_id: ParaId, tokio_handle: tokio::runtime::Handle, key: Sr25519Keyring) -> Self {
 		TestNodeBuilder {
 			key,
 			para_id,
-			task_executor,
+			tokio_handle,
 			collator_key: None,
 			parachain_nodes: Vec::new(),
 			parachain_nodes_exclusive: false,
@@ -503,7 +503,7 @@ impl TestNodeBuilder {
 		let parachain_config = node_config(
 			self.storage_update_func_parachain
 				.unwrap_or_else(|| Box::new(|| ())),
-			self.task_executor.clone(),
+			self.tokio_handle.clone(),
 			self.key.clone(),
 			self.parachain_nodes,
 			self.parachain_nodes_exclusive,
@@ -514,7 +514,7 @@ impl TestNodeBuilder {
 		let mut relay_chain_config = polkadot_test_service::node_config(
 			self.storage_update_func_relay_chain
 				.unwrap_or_else(|| Box::new(|| ())),
-			self.task_executor,
+			self.tokio_handle,
 			self.key,
 			self.relay_chain_nodes,
 			false,
@@ -557,7 +557,7 @@ impl TestNodeBuilder {
 /// adjustments to the runtime genesis.
 pub fn node_config(
 	storage_update_func: impl Fn(),
-	task_executor: TaskExecutor,
+	tokio_handle: tokio::runtime::Handle,
 	key: Sr25519Keyring,
 	nodes: Vec<MultiaddrWithPeerId>,
 	nodes_exlusive: bool,
@@ -609,7 +609,7 @@ pub fn node_config(
 		impl_name: "cumulus-test-node".to_string(),
 		impl_version: "0.1".to_string(),
 		role,
-		task_executor,
+		tokio_handle,
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore: KeystoreConfig::InMemory,
@@ -637,7 +637,6 @@ pub fn node_config(
 		rpc_ws: None,
 		rpc_ipc: None,
 		rpc_ws_max_connections: None,
-		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_max_payload: None,
@@ -686,7 +685,10 @@ impl TestNode {
 		let call = frame_system::Call::set_code { code: validation };
 
 		self.send_extrinsic(
-			runtime::SudoCall::sudo_unchecked_weight { call: Box::new(call.into()), weight: 1_000 },
+			runtime::SudoCall::sudo_unchecked_weight {
+				call: Box::new(call.into()),
+				weight: 1_000,
+			},
 			Sr25519Keyring::Alice,
 		)
 		.await
@@ -747,13 +749,13 @@ pub fn construct_extrinsic(
 /// This is essentially a wrapper around
 /// [`run_validator_node`](polkadot_test_service::run_validator_node).
 pub fn run_relay_chain_validator_node(
-	task_executor: TaskExecutor,
+	tokio_handle: tokio::runtime::Handle,
 	key: Sr25519Keyring,
 	storage_update_func: impl Fn(),
 	boot_nodes: Vec<MultiaddrWithPeerId>,
 ) -> polkadot_test_service::PolkadotTestNode {
 	polkadot_test_service::run_validator_node(
-		task_executor,
+		tokio_handle,
 		key,
 		storage_update_func,
 		boot_nodes,