Use tokio runtime handle instead of TaskExecutor abstraction (#9737)

* Use tokio runtime handle instead of TaskExecutor abstraction

Before this pr we had the `TaskExecutor` abstraction which theoretically
allowed that any futures executor could have been used. However, this
was never tested and is currently not really required. Anyone running a
node currently only used tokio and nothing else (because this was hard
coded in CLI). So, this pr removes the `TaskExecutor` abstraction and
relies directly on the tokio runtime handle.

Besides this changes, this pr also makes sure that the http and ws rpc
server use the same tokio runtime. This fixes a panic that occurred when
you drop the rpc servers inside an async function (tokio doesn't like
that a tokio runtime is dropped in the async context of another tokio
runtime).

As we don't use any custom runtime in the http rpc server anymore, this
pr also removes the `rpc-http-threads` cli argument. If external parties
complain that there aren't enough threads for the rpc server, we could
bring support for increasing the thread count of the tokio runtime.

* FMT

* Fix try runtime

* Fix integration tests and some other optimizations

* Remove warnings

substrate/Cargo.lock

@@ -4385,6 +4385,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-timestamp",
+ "sp-tracing",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -8079,6 +8080,7 @@ dependencies = [
  "log 0.4.14",
  "serde_json",
  "substrate-prometheus-endpoint",
+ "tokio",
 ]
 
 [[package]]

substrate/bin/node/cli/Cargo.toml

@@ -114,6 +114,7 @@ sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/commo
 sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensus/epochs" }
 sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
+sp-tracing = { version = "4.0.0-dev", path = "../../../primitives/tracing" }
 futures = "0.3.16"
 tempfile = "3.1.0"
 assert_cmd = "1.0"

substrate/bin/node/cli/src/chain_spec.rs

@@ -463,6 +463,8 @@ pub(crate) mod tests {
 	#[test]
 	#[ignore]
 	fn test_connectivity() {
+		sp_tracing::try_init_simple();
+
 		sc_service_test::connectivity(
 			integration_test_config_with_two_authorities(),
 			|config| {

substrate/bin/node/cli/src/command.rs

@@ -156,7 +156,7 @@ pub fn run() -> Result<()> {
 				// manager to do `async_run`.
 				let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
 				let task_manager =
-					sc_service::TaskManager::new(config.task_executor.clone(), registry)
+					sc_service::TaskManager::new(config.tokio_handle.clone(), registry)
 						.map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
 
 				Ok((cmd.run::<Block, ExecutorDispatch>(config), task_manager))

substrate/bin/node/cli/src/service.rs

@@ -644,6 +644,8 @@ mod tests {
 	// This can be run locally with `cargo test --release -p node-cli test_sync -- --ignored`.
 	#[ignore]
 	fn test_sync() {
+		sp_tracing::try_init_simple();
+
 		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
 		let keystore: SyncCryptoStorePtr =
 			Arc::new(LocalKeystore::open(keystore_path.path(), None).expect("Creates keystore"));
@@ -843,6 +845,8 @@ mod tests {
 	#[test]
 	#[ignore]
 	fn test_consensus() {
+		sp_tracing::try_init_simple();
+
 		sc_service_test::consensus(
 			crate::chain_spec::tests::integration_test_config_with_two_authorities(),
 			|config| {

substrate/bin/node/cli/tests/running_the_node_and_interrupt.rs

@@ -16,23 +16,30 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+#![cfg(unix)]
+
 use assert_cmd::cargo::cargo_bin;
-use std::{convert::TryInto, process::Command, thread, time::Duration};
+use nix::{
+	sys::signal::{
+		kill,
+		Signal::{self, SIGINT, SIGTERM},
+	},
+	unistd::Pid,
+};
+use sc_service::Deref;
+use std::{
+	convert::TryInto,
+	ops::DerefMut,
+	process::{Child, Command},
+	thread,
+	time::Duration,
+};
 use tempfile::tempdir;
 
 pub mod common;
 
 #[test]
-#[cfg(unix)]
 fn running_the_node_works_and_can_be_interrupted() {
-	use nix::{
-		sys::signal::{
-			kill,
-			Signal::{self, SIGINT, SIGTERM},
-		},
-		unistd::Pid,
-	};
-
 	fn run_command_and_kill(signal: Signal) {
 		let base_path = tempdir().expect("could not create a temp dir");
 		let mut cmd = Command::new(cargo_bin("substrate"))
@@ -55,3 +62,57 @@ fn running_the_node_works_and_can_be_interrupted() {
 	run_command_and_kill(SIGINT);
 	run_command_and_kill(SIGTERM);
 }
+
+struct KillChildOnDrop(Child);
+
+impl Drop for KillChildOnDrop {
+	fn drop(&mut self) {
+		let _ = self.0.kill();
+	}
+}
+
+impl Deref for KillChildOnDrop {
+	type Target = Child;
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl DerefMut for KillChildOnDrop {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
+#[test]
+fn running_two_nodes_with_the_same_ws_port_should_work() {
+	fn start_node() -> Child {
+		Command::new(cargo_bin("substrate"))
+			.args(&["--dev", "--tmp", "--ws-port=45789"])
+			.spawn()
+			.unwrap()
+	}
+
+	let mut first_node = KillChildOnDrop(start_node());
+	let mut second_node = KillChildOnDrop(start_node());
+
+	thread::sleep(Duration::from_secs(30));
+
+	assert!(first_node.try_wait().unwrap().is_none(), "The first node should still be running");
+	assert!(second_node.try_wait().unwrap().is_none(), "The second node should still be running");
+
+	kill(Pid::from_raw(first_node.id().try_into().unwrap()), SIGINT).unwrap();
+	kill(Pid::from_raw(second_node.id().try_into().unwrap()), SIGINT).unwrap();
+
+	assert_eq!(
+		common::wait_for(&mut first_node, 30).map(|x| x.success()),
+		Some(true),
+		"The first node must exit gracefully",
+	);
+	assert_eq!(
+		common::wait_for(&mut second_node, 30).map(|x| x.success()),
+		Some(true),
+		"The second node must exit gracefully",
+	);
+}

substrate/bin/node/test-runner-example/src/lib.rs

@@ -88,18 +88,17 @@ mod tests {
 	use node_cli::chain_spec::development_config;
 	use sp_keyring::sr25519::Keyring::Alice;
 	use sp_runtime::{traits::IdentifyAccount, MultiSigner};
-	use test_runner::{build_runtime, client_parts, task_executor, ConfigOrChainSpec, Node};
+	use test_runner::{build_runtime, client_parts, ConfigOrChainSpec, Node};
 
 	#[test]
 	fn test_runner() {
 		let tokio_runtime = build_runtime().unwrap();
-		let task_executor = task_executor(tokio_runtime.handle().clone());
-		let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::<
-			NodeTemplateChainInfo,
-		>(
-			ConfigOrChainSpec::ChainSpec(Box::new(development_config()), task_executor),
-		)
-		.unwrap();
+		let (rpc, task_manager, client, pool, command_sink, backend) =
+			client_parts::<NodeTemplateChainInfo>(ConfigOrChainSpec::ChainSpec(
+				Box::new(development_config()),
+				tokio_runtime.handle().clone(),
+			))
+			.unwrap();
 		let node = Node::<NodeTemplateChainInfo>::new(
 			rpc,
 			task_manager,

substrate/client/cli/src/commands/run_cmd.rs

@@ -127,10 +127,6 @@ pub struct RunCmd {
 	#[structopt(long = "ws-max-connections", value_name = "COUNT")]
 	pub ws_max_connections: Option<usize>,
 
-	/// Size of the RPC HTTP server thread pool.
-	#[structopt(long = "rpc-http-threads", value_name = "COUNT")]
-	pub rpc_http_threads: Option<usize>,
-
 	/// Specify browser Origins allowed to access the HTTP & WS RPC servers.
 	///
 	/// A comma-separated list of origins (protocol://domain or special `null`
@@ -381,10 +377,6 @@ impl CliConfiguration for RunCmd {
 		Ok(self.ws_max_connections)
 	}
 
-	fn rpc_http_threads(&self) -> Result<Option<usize>> {
-		Ok(self.rpc_http_threads)
-	}
-
 	fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {
 		Ok(self
 			.rpc_cors

substrate/client/cli/src/config.rs

@@ -29,7 +29,7 @@ use sc_service::{
 	config::{
 		BasePath, Configuration, DatabaseSource, KeystoreConfig, NetworkConfiguration,
 		NodeKeyConfig, OffchainWorkerConfig, PrometheusConfig, PruningMode, Role, RpcMethods,
-		TaskExecutor, TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
+		TelemetryEndpoints, TransactionPoolOptions, WasmExecutionMethod,
 	},
 	ChainSpec, KeepBlocks, TracingReceiver, TransactionStorageMode,
 };
@@ -348,13 +348,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(None)
 	}
 
-	/// Get the RPC HTTP thread pool size (`None` for a default 4-thread pool config).
-	///
-	/// By default this is `None`.
-	fn rpc_http_threads(&self) -> Result<Option<usize>> {
-		Ok(None)
-	}
-
 	/// Get the RPC cors (`None` if disabled)
 	///
 	/// By default this is `Some(Vec::new())`.
@@ -465,7 +458,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 	fn create_configuration<C: SubstrateCli>(
 		&self,
 		cli: &C,
-		task_executor: TaskExecutor,
+		tokio_handle: tokio::runtime::Handle,
 	) -> Result<Configuration> {
 		let is_dev = self.is_dev()?;
 		let chain_id = self.chain_id(is_dev)?;
@@ -490,7 +483,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(Configuration {
 			impl_name: C::impl_name(),
 			impl_version: C::impl_version(),
-			task_executor,
+			tokio_handle,
 			transaction_pool: self.transaction_pool()?,
 			network: self.network_config(
 				&chain_spec,
@@ -518,7 +511,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			rpc_ipc: self.rpc_ipc()?,
 			rpc_methods: self.rpc_methods()?,
 			rpc_ws_max_connections: self.rpc_ws_max_connections()?,
-			rpc_http_threads: self.rpc_http_threads()?,
 			rpc_cors: self.rpc_cors(is_dev)?,
 			rpc_max_payload: self.rpc_max_payload()?,
 			prometheus_config: self.prometheus_config(DCV::prometheus_listen_port())?,

substrate/client/cli/src/lib.rs

@@ -35,8 +35,8 @@ pub use config::*;
 pub use error::*;
 pub use params::*;
 pub use runner::*;
+use sc_service::Configuration;
 pub use sc_service::{ChainSpec, Role};
-use sc_service::{Configuration, TaskExecutor};
 pub use sc_tracing::logging::LoggerBuilder;
 pub use sp_version::RuntimeVersion;
 use std::io::Write;
@@ -216,9 +216,9 @@ pub trait SubstrateCli: Sized {
 	fn create_configuration<T: CliConfiguration<DVC>, DVC: DefaultConfigurationValues>(
 		&self,
 		command: &T,
-		task_executor: TaskExecutor,
+		tokio_handle: tokio::runtime::Handle,
 	) -> error::Result<Configuration> {
-		command.create_configuration(self, task_executor)
+		command.create_configuration(self, tokio_handle)
 	}
 
 	/// Create a runner for the command provided in argument. This will create a Configuration and

substrate/client/cli/src/runner.rs

@@ -20,7 +20,7 @@ use crate::{error::Error as CliError, CliConfiguration, Result, SubstrateCli};
 use chrono::prelude::*;
 use futures::{future, future::FutureExt, pin_mut, select, Future};
 use log::info;
-use sc_service::{Configuration, Error as ServiceError, TaskManager, TaskType};
+use sc_service::{Configuration, Error as ServiceError, TaskManager};
 use sc_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
 
@@ -116,15 +116,8 @@ impl<C: SubstrateCli> Runner<C> {
 		let tokio_runtime = build_runtime()?;
 		let runtime_handle = tokio_runtime.handle().clone();
 
-		let task_executor = move |fut, task_type| match task_type {
-			TaskType::Async => runtime_handle.spawn(fut).map(drop),
-			TaskType::Blocking => runtime_handle
-				.spawn_blocking(move || futures::executor::block_on(fut))
-				.map(drop),
-		};
-
 		Ok(Runner {
-			config: command.create_configuration(cli, task_executor.into())?,
+			config: command.create_configuration(cli, runtime_handle)?,
 			tokio_runtime,
 			phantom: PhantomData,
 		})

substrate/client/rpc-servers/Cargo.toml

@@ -19,6 +19,7 @@ pubsub = { package = "jsonrpc-pubsub", version = "18.0.0" }
 log = "0.4.8"
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
 serde_json = "1.0.41"
+tokio = "1.10"
 http = { package = "jsonrpc-http-server", version = "18.0.0" }
 ipc = { package = "jsonrpc-ipc-server", version = "18.0.0" }
 ws = { package = "jsonrpc-ws-server", version = "18.0.0" }

substrate/client/rpc-servers/src/lib.rs

@@ -36,9 +36,6 @@ pub const RPC_MAX_PAYLOAD_DEFAULT: usize = 15 * MEGABYTE;
 /// Default maximum number of connections for WS RPC servers.
 const WS_MAX_CONNECTIONS: usize = 100;
 
-/// Default thread pool size for RPC HTTP servers.
-const HTTP_THREADS: usize = 4;
-
 /// The RPC IoHandler containing all requested APIs.
 pub type RpcHandler<T> = pubsub::PubSubHandler<T, RpcMiddleware>;
 
@@ -130,17 +127,18 @@ impl ws::SessionStats for ServerMetrics {
 /// Start HTTP server listening on given address.
 pub fn start_http<M: pubsub::PubSubMetadata + Default + Unpin>(
 	addr: &std::net::SocketAddr,
-	thread_pool_size: Option<usize>,
 	cors: Option<&Vec<String>>,
 	io: RpcHandler<M>,
 	maybe_max_payload_mb: Option<usize>,
+	tokio_handle: tokio::runtime::Handle,
 ) -> io::Result<http::Server> {
 	let max_request_body_size = maybe_max_payload_mb
 		.map(|mb| mb.saturating_mul(MEGABYTE))
 		.unwrap_or(RPC_MAX_PAYLOAD_DEFAULT);
 
 	http::ServerBuilder::new(io)
-		.threads(thread_pool_size.unwrap_or(HTTP_THREADS))
+		.threads(1)
+		.event_loop_executor(tokio_handle)
 		.health_api(("/health", "system_health"))
 		.allowed_hosts(hosts_filtering(cors.is_some()))
 		.rest_api(if cors.is_some() { http::RestApi::Secure } else { http::RestApi::Unsecure })
@@ -175,6 +173,7 @@ pub fn start_ws<
 	io: RpcHandler<M>,
 	maybe_max_payload_mb: Option<usize>,
 	server_metrics: ServerMetrics,
+	tokio_handle: tokio::runtime::Handle,
 ) -> io::Result<ws::Server> {
 	let rpc_max_payload = maybe_max_payload_mb
 		.map(|mb| mb.saturating_mul(MEGABYTE))
@@ -182,6 +181,7 @@ pub fn start_ws<
 	ws::ServerBuilder::with_meta_extractor(io, |context: &ws::RequestContext| {
 		context.sender().into()
 	})
+	.event_loop_executor(tokio_handle)
 	.max_payload(rpc_max_payload)
 	.max_connections(max_connections.unwrap_or(WS_MAX_CONNECTIONS))
 	.allowed_origins(map_cors(cors))

substrate/client/service/Cargo.toml

@@ -79,11 +79,11 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = [
 	"primitive-types",
 ] }
 async-trait = "0.1.50"
+tokio = { version = "1.10", features = ["time", "rt-multi-thread"] }
 tempfile = "3.1.0"
 directories = "3.0.2"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
 substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime/" }
-tokio = { version = "1.10", features = ["time"] }
 async-std = { version = "1.6.5", default-features = false }

substrate/client/service/src/builder.rs

@@ -286,7 +286,7 @@ where
 
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry)?
+		TaskManager::new(config.tokio_handle.clone(), registry)?
 	};
 
 	let chain_spec = &config.chain_spec;
@@ -372,7 +372,7 @@ where
 	let keystore_container = KeystoreContainer::new(&config.keystore)?;
 	let task_manager = {
 		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.task_executor.clone(), registry)?
+		TaskManager::new(config.tokio_handle.clone(), registry)?
 	};
 
 	let db_storage = {

substrate/client/service/src/config.rs

@@ -36,12 +36,9 @@ pub use sc_telemetry::TelemetryEndpoints;
 pub use sc_transaction_pool::Options as TransactionPoolOptions;
 use sp_core::crypto::SecretString;
 use std::{
-	future::Future,
 	io,
 	net::SocketAddr,
 	path::{Path, PathBuf},
-	pin::Pin,
-	sync::Arc,
 };
 use tempfile::TempDir;
 
@@ -54,8 +51,8 @@ pub struct Configuration {
 	pub impl_version: String,
 	/// Node role.
 	pub role: Role,
-	/// How to spawn background tasks. Mandatory, otherwise creating a `Service` will error.
-	pub task_executor: TaskExecutor,
+	/// Handle to the tokio runtime. Will be used to spawn futures by the task manager.
+	pub tokio_handle: tokio::runtime::Handle,
 	/// Extrinsic pool configuration.
 	pub transaction_pool: TransactionPoolOptions,
 	/// Network configuration.
@@ -94,8 +91,6 @@ pub struct Configuration {
 	pub rpc_ipc: Option<String>,
 	/// Maximum number of connections for WebSockets RPC server. `None` if default.
 	pub rpc_ws_max_connections: Option<usize>,
-	/// Size of the RPC HTTP server thread pool. `None` if default.
-	pub rpc_http_threads: Option<usize>,
 	/// CORS settings for HTTP & WS servers. `None` if all origins are allowed.
 	pub rpc_cors: Option<Vec<String>>,
 	/// RPC methods to expose (by default only a safe subset or all of them).
@@ -305,62 +300,3 @@ impl std::convert::From<PathBuf> for BasePath {
 		BasePath::new(path)
 	}
 }
-
-// NOTE: here for code readability.
-pub(crate) type SomeFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
-pub(crate) type JoinFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
-
-/// Callable object that execute tasks.
-///
-/// This struct can be created easily using `Into`.
-///
-/// # Examples
-///
-/// ## Using tokio
-///
-/// ```
-/// # use sc_service::TaskExecutor;
-/// use futures::future::FutureExt;
-/// use tokio::runtime::Runtime;
-///
-/// let runtime = Runtime::new().unwrap();
-/// let handle = runtime.handle().clone();
-/// let task_executor: TaskExecutor = (move |future, _task_type| {
-///     handle.spawn(future).map(|_| ())
-/// }).into();
-/// ```
-///
-/// ## Using async-std
-///
-/// ```
-/// # use sc_service::TaskExecutor;
-/// let task_executor: TaskExecutor = (|future, _task_type| {
-///     // NOTE: async-std's JoinHandle is not a Result so we don't need to map the result
-///     async_std::task::spawn(future)
-/// }).into();
-/// ```
-#[derive(Clone)]
-pub struct TaskExecutor(Arc<dyn Fn(SomeFuture, TaskType) -> JoinFuture + Send + Sync>);
-
-impl std::fmt::Debug for TaskExecutor {
-	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-		write!(f, "TaskExecutor")
-	}
-}
-
-impl<F, FUT> std::convert::From<F> for TaskExecutor
-where
-	F: Fn(SomeFuture, TaskType) -> FUT + Send + Sync + 'static,
-	FUT: Future<Output = ()> + Send + 'static,
-{
-	fn from(func: F) -> Self {
-		Self(Arc::new(move |fut, tt| Box::pin(func(fut, tt))))
-	}
-}
-
-impl TaskExecutor {
-	/// Spawns a new asynchronous task.
-	pub fn spawn(&self, future: SomeFuture, task_type: TaskType) -> JoinFuture {
-		self.0(future, task_type)
-	}
-}

substrate/client/service/src/lib.rs

@@ -58,8 +58,8 @@ pub use self::{
 	error::Error,
 };
 pub use config::{
-	BasePath, Configuration, DatabaseSource, KeepBlocks, PruningMode, Role, RpcMethods,
-	TaskExecutor, TaskType, TransactionStorageMode,
+	BasePath, Configuration, DatabaseSource, KeepBlocks, PruningMode, Role, RpcMethods, TaskType,
+	TransactionStorageMode,
 };
 pub use sc_chain_spec::{
 	ChainSpec, ChainType, Extension as ChainSpecExtension, GenericChainSpec, NoExtension,
@@ -395,7 +395,6 @@ fn start_rpc_servers<
 		maybe_start_server(config.rpc_http, |address| {
 			sc_rpc_server::start_http(
 				address,
-				config.rpc_http_threads,
 				config.rpc_cors.as_ref(),
 				gen_handler(
 					deny_unsafe(&address, &config.rpc_methods),
@@ -406,6 +405,7 @@ fn start_rpc_servers<
 					),
 				)?,
 				config.rpc_max_payload,
+				config.tokio_handle.clone(),
 			)
 			.map_err(Error::from)
 		})?
@@ -425,6 +425,7 @@ fn start_rpc_servers<
 				)?,
 				config.rpc_max_payload,
 				server_metrics.clone(),
+				config.tokio_handle.clone(),
 			)
 			.map_err(Error::from)
 		})?

substrate/client/service/src/task_manager/mod.rs

@@ -18,23 +18,20 @@
 
 //! Substrate service tasks management module.
 
-use crate::{
-	config::{JoinFuture, TaskExecutor, TaskType},
-	Error,
-};
+use crate::{config::TaskType, Error};
 use exit_future::Signal;
 use futures::{
 	future::{join_all, pending, select, try_join_all, BoxFuture, Either},
-	sink::SinkExt,
 	Future, FutureExt, StreamExt,
 };
-use log::{debug, error};
+use log::debug;
 use prometheus_endpoint::{
 	exponential_buckets, register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError,
 	Registry, U64,
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{panic, pin::Pin, result::Result};
+use tokio::{runtime::Handle, task::JoinHandle};
 use tracing_futures::Instrument;
 
 mod prometheus_future;
@@ -45,9 +42,9 @@ mod tests;
 #[derive(Clone)]
 pub struct SpawnTaskHandle {
 	on_exit: exit_future::Exit,
-	executor: TaskExecutor,
+	tokio_handle: Handle,
 	metrics: Option<Metrics>,
-	task_notifier: TracingUnboundedSender<JoinFuture>,
+	task_notifier: TracingUnboundedSender<JoinHandle<()>>,
 }
 
 impl SpawnTaskHandle {
@@ -126,19 +123,20 @@ impl SpawnTaskHandle {
 				futures::pin_mut!(task);
 				let _ = select(on_exit, task).await;
 			}
+		}
+		.in_current_span();
+
+		let join_handle = match task_type {
+			TaskType::Async => self.tokio_handle.spawn(future),
+			TaskType::Blocking => {
+				let handle = self.tokio_handle.clone();
+				self.tokio_handle.spawn_blocking(move || {
+					handle.block_on(future);
+				})
+			},
 		};
 
-		let join_handle = self.executor.spawn(future.in_current_span().boxed(), task_type);
-
-		let mut task_notifier = self.task_notifier.clone();
-		self.executor.spawn(
-			Box::pin(async move {
-				if let Err(err) = task_notifier.send(join_handle).await {
-					error!("Could not send spawned task handle to queue: {}", err);
-				}
-			}),
-			TaskType::Async,
-		);
+		let _ = self.task_notifier.unbounded_send(join_handle);
 	}
 }
 
@@ -222,8 +220,8 @@ pub struct TaskManager {
 	on_exit: exit_future::Exit,
 	/// A signal that makes the exit future above resolve, fired on service drop.
 	signal: Option<Signal>,
-	/// How to spawn background tasks.
-	executor: TaskExecutor,
+	/// Tokio runtime handle that is used to spawn futures.
+	tokio_handle: Handle,
 	/// Prometheus metric where to report the polling times.
 	metrics: Option<Metrics>,
 	/// Send a signal when a spawned essential task has concluded. The next time
@@ -234,9 +232,9 @@ pub struct TaskManager {
 	/// Things to keep alive until the task manager is dropped.
 	keep_alive: Box<dyn std::any::Any + Send>,
 	/// A sender to a stream of background tasks. This is used for the completion future.
-	task_notifier: TracingUnboundedSender<JoinFuture>,
+	task_notifier: TracingUnboundedSender<JoinHandle<()>>,
 	/// This future will complete when all the tasks are joined and the stream is closed.
-	completion_future: JoinFuture,
+	completion_future: JoinHandle<()>,
 	/// A list of other `TaskManager`'s to terminate and gracefully shutdown when the parent
 	/// terminates and gracefully shutdown. Also ends the parent `future()` if a child's essential
 	/// task fails.
@@ -247,7 +245,7 @@ impl TaskManager {
 	/// If a Prometheus registry is passed, it will be used to report statistics about the
 	/// service tasks.
 	pub fn new(
-		executor: TaskExecutor,
+		tokio_handle: Handle,
 		prometheus_registry: Option<&Registry>,
 	) -> Result<Self, PrometheusError> {
 		let (signal, on_exit) = exit_future::signal();
@@ -261,13 +259,15 @@ impl TaskManager {
 		// NOTE: for_each_concurrent will await on all the JoinHandle futures at the same time. It
 		// is possible to limit this but it's actually better for the memory foot print to await
 		// them all to not accumulate anything on that stream.
-		let completion_future = executor
-			.spawn(Box::pin(background_tasks.for_each_concurrent(None, |x| x)), TaskType::Async);
+		let completion_future =
+			tokio_handle.spawn(background_tasks.for_each_concurrent(None, |x| async move {
+				let _ = x.await;
+			}));
 
 		Ok(Self {
 			on_exit,
 			signal: Some(signal),
-			executor,
+			tokio_handle,
 			metrics,
 			essential_failed_tx,
 			essential_failed_rx,
@@ -282,7 +282,7 @@ impl TaskManager {
 	pub fn spawn_handle(&self) -> SpawnTaskHandle {
 		SpawnTaskHandle {
 			on_exit: self.on_exit.clone(),
-			executor: self.executor.clone(),
+			tokio_handle: self.tokio_handle.clone(),
 			metrics: self.metrics.clone(),
 			task_notifier: self.task_notifier.clone(),
 		}
@@ -310,14 +310,9 @@ impl TaskManager {
 
 		Box::pin(async move {
 			join_all(children_shutdowns).await;
-			completion_future.await;
+			let _ = completion_future.await;
 
-			// The keep_alive stuff is holding references to some RPC handles etc. These
-			// RPC handles spawn their own tokio stuff and that doesn't like to be closed in an
-			// async context. So, we move the deletion to some other thread.
-			std::thread::spawn(move || {
-				let _ = keep_alive;
-			});
+			let _ = keep_alive;
 		})
 	}
 

substrate/client/service/src/task_manager/tests.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{config::TaskExecutor, task_manager::TaskManager};
+use crate::task_manager::TaskManager;
 use futures::{future::FutureExt, pin_mut, select};
 use parking_lot::Mutex;
 use std::{any::Any, sync::Arc, time::Duration};
@@ -84,17 +84,16 @@ async fn run_background_task_blocking(duration: Duration, _keep_alive: impl Any)
 	}
 }
 
-fn new_task_manager(task_executor: TaskExecutor) -> TaskManager {
-	TaskManager::new(task_executor, None).unwrap()
+fn new_task_manager(tokio_handle: tokio::runtime::Handle) -> TaskManager {
+	TaskManager::new(tokio_handle, None).unwrap()
 }
 
 #[test]
 fn ensure_tasks_are_awaited_on_shutdown() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let task_manager = new_task_manager(task_executor);
+	let task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -111,9 +110,8 @@ fn ensure_tasks_are_awaited_on_shutdown() {
 fn ensure_keep_alive_during_shutdown() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	task_manager.keep_alive(drop_tester.new_ref());
@@ -130,9 +128,8 @@ fn ensure_keep_alive_during_shutdown() {
 fn ensure_blocking_futures_are_awaited_on_shutdown() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let task_manager = new_task_manager(task_executor);
+	let task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn(
@@ -155,9 +152,8 @@ fn ensure_blocking_futures_are_awaited_on_shutdown() {
 fn ensure_no_task_can_be_spawn_after_terminate() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -176,9 +172,8 @@ fn ensure_no_task_can_be_spawn_after_terminate() {
 fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let drop_tester = DropTester::new();
 	spawn_handle.spawn("task1", run_background_task(drop_tester.new_ref()));
@@ -197,9 +192,8 @@ fn ensure_task_manager_future_ends_when_task_manager_terminated() {
 fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor);
+	let mut task_manager = new_task_manager(handle);
 	let spawn_handle = task_manager.spawn_handle();
 	let spawn_essential_handle = task_manager.spawn_essential_handle();
 	let drop_tester = DropTester::new();
@@ -222,12 +216,11 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
 fn ensure_children_tasks_ends_when_task_manager_terminated() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor.clone());
-	let child_1 = new_task_manager(task_executor.clone());
+	let mut task_manager = new_task_manager(handle.clone());
+	let child_1 = new_task_manager(handle.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
-	let child_2 = new_task_manager(task_executor.clone());
+	let child_2 = new_task_manager(handle.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
@@ -251,13 +244,12 @@ fn ensure_children_tasks_ends_when_task_manager_terminated() {
 fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor.clone());
-	let child_1 = new_task_manager(task_executor.clone());
+	let mut task_manager = new_task_manager(handle.clone());
+	let child_1 = new_task_manager(handle.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
 	let spawn_essential_handle_child_1 = child_1.spawn_essential_handle();
-	let child_2 = new_task_manager(task_executor.clone());
+	let child_2 = new_task_manager(handle.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);
@@ -284,12 +276,11 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
 fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
 	let runtime = tokio::runtime::Runtime::new().unwrap();
 	let handle = runtime.handle().clone();
-	let task_executor: TaskExecutor = (move |future, _| handle.spawn(future).map(|_| ())).into();
 
-	let mut task_manager = new_task_manager(task_executor.clone());
-	let child_1 = new_task_manager(task_executor.clone());
+	let mut task_manager = new_task_manager(handle.clone());
+	let child_1 = new_task_manager(handle.clone());
 	let spawn_handle_child_1 = child_1.spawn_handle();
-	let child_2 = new_task_manager(task_executor.clone());
+	let child_2 = new_task_manager(handle.clone());
 	let spawn_handle_child_2 = child_2.spawn_handle();
 	task_manager.add_child(child_1);
 	task_manager.add_child(child_2);

substrate/client/service/test/src/lib.rs

@@ -18,7 +18,7 @@
 
 //! Service integration test utils.
 
-use futures::{task::Poll, Future, FutureExt, TryFutureExt as _};
+use futures::{task::Poll, Future, TryFutureExt as _};
 use log::{debug, info};
 use parking_lot::Mutex;
 use sc_client_api::{Backend, CallExecutor};
@@ -30,7 +30,7 @@ use sc_service::{
 	client::Client,
 	config::{BasePath, DatabaseSource, KeystoreConfig},
 	ChainSpecExtension, Configuration, Error, GenericChainSpec, KeepBlocks, Role, RuntimeGenesis,
-	SpawnTaskHandle, TaskExecutor, TaskManager, TransactionStorageMode,
+	SpawnTaskHandle, TaskManager, TransactionStorageMode,
 };
 use sc_transaction_pool_api::TransactionPool;
 use sp_blockchain::HeaderBackend;
@@ -55,6 +55,16 @@ struct TestNet<G, E, F, L, U> {
 	nodes: usize,
 }
 
+impl<G, E, F, L, U> Drop for TestNet<G, E, F, L, U> {
+	fn drop(&mut self) {
+		// Drop the nodes before dropping the runtime, as the runtime otherwise waits for all
+		// futures to be ended and we run into a dead lock.
+		self.full_nodes.drain(..);
+		self.light_nodes.drain(..);
+		self.authority_nodes.drain(..);
+	}
+}
+
 pub trait TestNetNode:
 	Clone + Future<Output = Result<(), sc_service::Error>> + Send + 'static
 {
@@ -200,7 +210,7 @@ fn node_config<
 	index: usize,
 	spec: &GenericChainSpec<G, E>,
 	role: Role,
-	task_executor: TaskExecutor,
+	tokio_handle: tokio::runtime::Handle,
 	key_seed: Option<String>,
 	base_port: u16,
 	root: &TempDir,
@@ -229,7 +239,7 @@ fn node_config<
 		impl_name: String::from("network-test-impl"),
 		impl_version: String::from("0.1"),
 		role,
-		task_executor,
+		tokio_handle,
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore_remote: Default::default(),
@@ -248,7 +258,6 @@ fn node_config<
 		rpc_ipc: None,
 		rpc_ws: None,
 		rpc_ws_max_connections: None,
-		rpc_http_threads: None,
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_max_payload: None,
@@ -308,21 +317,13 @@ where
 		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
 	) {
 		let handle = self.runtime.handle().clone();
-		let task_executor: TaskExecutor = {
-			let executor = handle.clone();
-			(move |fut: Pin<Box<dyn futures::Future<Output = ()> + Send>>, _| {
-				executor.spawn(fut.unit_error());
-				async {}
-			})
-			.into()
-		};
 
 		for (key, authority) in authorities {
 			let node_config = node_config(
 				self.nodes,
 				&self.chain_spec,
 				Role::Authority,
-				task_executor.clone(),
+				handle.clone(),
 				Some(key),
 				self.base_port,
 				&temp,
@@ -343,7 +344,7 @@ where
 				self.nodes,
 				&self.chain_spec,
 				Role::Full,
-				task_executor.clone(),
+				handle.clone(),
 				None,
 				self.base_port,
 				&temp,
@@ -363,7 +364,7 @@ where
 				self.nodes,
 				&self.chain_spec,
 				Role::Light,
-				task_executor.clone(),
+				handle.clone(),
 				None,
 				self.base_port,
 				&temp,

substrate/test-utils/derive/src/lib.rs

@@ -36,18 +36,9 @@ fn parse_knobs(
 	let attrs = &input.attrs;
 	let vis = input.vis;
 
-	if sig.inputs.len() != 1 {
-		let msg = "the test function accepts only one argument of type sc_service::TaskExecutor";
-		return Err(syn::Error::new_spanned(&sig, msg))
+	if !sig.inputs.is_empty() {
+		return Err(syn::Error::new_spanned(&sig, "No arguments expected for tests."))
 	}
-	let (task_executor_name, task_executor_type) = match sig.inputs.pop().map(|x| x.into_value()) {
-		Some(syn::FnArg::Typed(x)) => (x.pat, x.ty),
-		_ => {
-			let msg =
-				"the test function accepts only one argument of type sc_service::TaskExecutor";
-			return Err(syn::Error::new_spanned(&sig, msg))
-		},
-	};
 
 	let crate_name = match crate_name("substrate-test-utils") {
 		Ok(FoundCrate::Itself) => syn::Ident::new("substrate_test_utils", Span::call_site().into()),
@@ -65,12 +56,6 @@ fn parse_knobs(
 		#header
 		#(#attrs)*
 		#vis #sig {
-			use #crate_name::futures::future::FutureExt;
-
-			let #task_executor_name: #task_executor_type = (|fut, _| {
-				#crate_name::tokio::spawn(fut).map(drop)
-			})
-			.into();
 			if #crate_name::tokio::time::timeout(
 				std::time::Duration::from_secs(
 					std::env::var("SUBSTRATE_TEST_TIMEOUT")

substrate/test-utils/src/lib.rs

@@ -19,8 +19,7 @@
 
 #[doc(hidden)]
 pub use futures;
-/// Marks async function to be executed by an async runtime and provide a `TaskExecutor`,
-/// suitable to test environment.
+/// Marks async function to be executed by an async runtime suitable to test environment.
 ///
 /// # Requirements
 ///
@@ -30,10 +29,8 @@ pub use futures;
 ///
 /// ```
 /// #[substrate_test_utils::test]
-/// async fn basic_test(task_executor: TaskExecutor) {
+/// async fn basic_test() {
 ///     assert!(true);
-///     // create your node in here and use task_executor
-///     // then don't forget to gracefully shutdown your node before exit
 /// }
 /// ```
 pub use substrate_test_utils_derive::test;

substrate/test-utils/test-crate/src/main.rs

@@ -18,7 +18,7 @@
 
 #[cfg(test)]
 #[test_utils::test]
-async fn basic_test(_: sc_service::TaskExecutor) {
+async fn basic_test() {
 	assert!(true);
 }
 

substrate/test-utils/test-runner/src/client.rs

@@ -29,7 +29,7 @@ use sc_client_api::backend::Backend;
 use sc_executor::NativeElseWasmExecutor;
 use sc_service::{
 	build_network, new_full_parts, spawn_tasks, BuildNetworkParams, ChainSpec, Configuration,
-	SpawnTasksParams, TFullBackend, TFullClient, TaskExecutor, TaskManager,
+	SpawnTasksParams, TFullBackend, TFullClient, TaskManager,
 };
 use sc_transaction_pool::BasicPool;
 use sc_transaction_pool_api::TransactionPool;
@@ -74,7 +74,7 @@ pub enum ConfigOrChainSpec {
 	/// Configuration object
 	Config(Configuration),
 	/// Chain spec object
-	ChainSpec(Box<dyn ChainSpec>, TaskExecutor),
+	ChainSpec(Box<dyn ChainSpec>, tokio::runtime::Handle),
 }
 /// Creates all the client parts you need for [`Node`](crate::node::Node)
 pub fn client_parts<T>(
@@ -103,8 +103,8 @@ where
 	use sp_consensus_babe::AuthorityId;
 	let config = match config_or_chain_spec {
 		ConfigOrChainSpec::Config(config) => config,
-		ConfigOrChainSpec::ChainSpec(chain_spec, task_executor) =>
-			default_config(task_executor, chain_spec),
+		ConfigOrChainSpec::ChainSpec(chain_spec, tokio_handle) =>
+			default_config(tokio_handle, chain_spec),
 	};
 
 	let executor = NativeElseWasmExecutor::<T::ExecutorDispatch>::new(

substrate/test-utils/test-runner/src/utils.rs

@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use futures::FutureExt;
 use sc_client_api::execution_extensions::ExecutionStrategies;
 use sc_executor::WasmExecutionMethod;
 use sc_informant::OutputFormat;
@@ -26,7 +25,7 @@ use sc_network::{
 };
 use sc_service::{
 	config::KeystoreConfig, BasePath, ChainSpec, Configuration, DatabaseSource, KeepBlocks,
-	TaskExecutor, TaskType, TransactionStorageMode,
+	TransactionStorageMode,
 };
 use sp_keyring::sr25519::Keyring::Alice;
 use tokio::runtime::Handle;
@@ -43,10 +42,7 @@ pub fn base_path() -> BasePath {
 }
 
 /// Produces a default configuration object, suitable for use with most set ups.
-pub fn default_config(
-	task_executor: TaskExecutor,
-	mut chain_spec: Box<dyn ChainSpec>,
-) -> Configuration {
+pub fn default_config(tokio_handle: Handle, mut chain_spec: Box<dyn ChainSpec>) -> Configuration {
 	let base_path = base_path();
 	let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id());
 
@@ -75,7 +71,7 @@ pub fn default_config(
 		impl_name: "test-node".to_string(),
 		impl_version: "0.1".to_string(),
 		role: Role::Authority,
-		task_executor: task_executor.into(),
+		tokio_handle,
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore: KeystoreConfig::Path { path: root_path.join("key"), password: None },
@@ -95,7 +91,6 @@ pub fn default_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,
@@ -120,14 +115,3 @@ pub fn default_config(
 		transaction_storage: TransactionStorageMode::BlockBody,
 	}
 }
-
-/// Produce a task executor given a handle to a tokio runtime
-pub fn task_executor(handle: Handle) -> TaskExecutor {
-	let task_executor = move |fut, task_type| match task_type {
-		TaskType::Async => handle.spawn(fut).map(drop),
-		TaskType::Blocking =>
-			handle.spawn_blocking(move || futures::executor::block_on(fut)).map(drop),
-	};
-
-	task_executor.into()
-}

substrate/test-utils/tests/basic.rs

@@ -16,28 +16,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use sc_service::{TaskExecutor, TaskType};
-
 #[substrate_test_utils::test]
-async fn basic_test(_: TaskExecutor) {
+async fn basic_test() {
 	assert!(true);
 }
 
 #[substrate_test_utils::test]
 #[should_panic(expected = "boo!")]
-async fn panicking_test(_: TaskExecutor) {
+async fn panicking_test() {
 	panic!("boo!");
 }
 
 #[substrate_test_utils::test(flavor = "multi_thread", worker_threads = 1)]
-async fn basic_test_with_args(_: TaskExecutor) {
-	assert!(true);
-}
-
-#[substrate_test_utils::test]
-async fn rename_argument(ex: TaskExecutor) {
-	let ex2 = ex.clone();
-	ex2.spawn(Box::pin(async { () }), TaskType::Blocking);
+async fn basic_test_with_args() {
 	assert!(true);
 }
 
@@ -47,7 +38,7 @@ async fn rename_argument(ex: TaskExecutor) {
 #[substrate_test_utils::test]
 #[should_panic(expected = "test took too long")]
 #[ignore]
-async fn timeout(_: TaskExecutor) {
+async fn timeout() {
 	tokio::time::sleep(std::time::Duration::from_secs(
 		std::env::var("SUBSTRATE_TEST_TIMEOUT")
 			.expect("env var SUBSTRATE_TEST_TIMEOUT has been provided by the user")

substrate/test-utils/tests/ui.rs

@@ -19,6 +19,5 @@
 #[test]
 fn substrate_test_utils_derive_trybuild() {
 	let t = trybuild::TestCases::new();
-	t.compile_fail("tests/ui/missing-func-parameter.rs");
 	t.compile_fail("tests/ui/too-many-func-parameters.rs");
 }

substrate/test-utils/tests/ui/missing-func-parameter.rs

@@ -1,24 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-#[substrate_test_utils::test]
-async fn missing_func_parameter() {
-	assert!(true);
-}
-
-fn main() {}

substrate/test-utils/tests/ui/missing-func-parameter.stderr

@@ -1,5 +0,0 @@
-error: the test function accepts only one argument of type sc_service::TaskExecutor
-  --> $DIR/missing-func-parameter.rs:20:1
-   |
-20 | async fn missing_func_parameter() {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

substrate/test-utils/tests/ui/too-many-func-parameters.rs

@@ -16,11 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[allow(unused_imports)]
-use sc_service::TaskExecutor;
-
 #[substrate_test_utils::test]
-async fn too_many_func_parameters(task_executor_1: TaskExecutor, task_executor_2: TaskExecutor) {
+async fn too_many_func_parameters(_: u32) {
 	assert!(true);
 }
 

substrate/test-utils/tests/ui/too-many-func-parameters.stderr

@@ -1,5 +1,5 @@
-error: the test function accepts only one argument of type sc_service::TaskExecutor
-  --> $DIR/too-many-func-parameters.rs:23:1
+error: No arguments expected for tests.
+  --> $DIR/too-many-func-parameters.rs:20:1
    |
-23 | async fn too_many_func_parameters(task_executor_1: TaskExecutor, task_executor_2: TaskExecutor) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+20 | async fn too_many_func_parameters(_: u32) {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^