From 25914bb5e1c4d5e295a430b85fe3b4ca0e85f62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Fri, 9 Oct 2020 17:32:45 +0200
Subject: [PATCH] Rename `node_handles` to `overseer_handler` (#1803)

They are not node handles anymore ;)
---
 polkadot/node/service/src/lib.rs      | 14 +++++++-------
 polkadot/node/test-service/src/lib.rs |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index b82ecaa21a..da970f4129 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -301,7 +301,7 @@ fn real_overseer<S: SpawnNamed>(
 pub struct NewFull<C> {
 	pub task_manager: TaskManager,
 	pub client: C,
-	pub node_handles: OverseerHandler,
+	pub overseer_handler: OverseerHandler,
 	pub network: Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>,
 	pub network_status_sinks: service::NetworkStatusSinks<Block>,
 	pub rpc_handlers: RpcHandlers,
@@ -313,7 +313,7 @@ impl<C> NewFull<C> {
 		NewFull {
 			client: func(self.client),
 			task_manager: self.task_manager,
-			node_handles: self.node_handles,
+			overseer_handler: self.overseer_handler,
 			network: self.network,
 			network_status_sinks: self.network_status_sinks,
 			rpc_handlers: self.rpc_handlers,
@@ -415,13 +415,13 @@ pub fn new_full<RuntimeApi, Executor>(
 		})
 		.collect();
 
-	let (overseer, handler) = real_overseer(leaves, prometheus_registry.as_ref(), spawner)?;
-	let handler_clone = handler.clone();
+	let (overseer, overseer_handler) = real_overseer(leaves, prometheus_registry.as_ref(), spawner)?;
+	let overseer_handler_clone = overseer_handler.clone();
 
 	task_manager.spawn_essential_handle().spawn_blocking("overseer", Box::pin(async move {
 		use futures::{pin_mut, select, FutureExt};
 
-		let forward = polkadot_overseer::forward_events(overseer_client, handler_clone);
+		let forward = polkadot_overseer::forward_events(overseer_client, overseer_handler_clone);
 
 		let forward = forward.fuse();
 		let overseer_fut = overseer.run().fuse();
@@ -445,7 +445,7 @@ pub fn new_full<RuntimeApi, Executor>(
 		let proposer = ProposerFactory::new(
 			client.clone(),
 			transaction_pool,
-			handler.clone(),
+			overseer_handler.clone(),
 		);
 
 		let babe_config = babe::BabeParams {
@@ -575,7 +575,7 @@ pub fn new_full<RuntimeApi, Executor>(
 	Ok(NewFull {
 		task_manager,
 		client,
-		node_handles: handler,
+		overseer_handler,
 		network,
 		network_status_sinks,
 		rpc_handlers,
diff --git a/polkadot/node/test-service/src/lib.rs b/polkadot/node/test-service/src/lib.rs
index 939b065cd3..33969bb7df 100644
--- a/polkadot/node/test-service/src/lib.rs
+++ b/polkadot/node/test-service/src/lib.rs
@@ -193,7 +193,7 @@ pub fn run_test_node(
 	let config = node_config(storage_update_func, task_executor, key, boot_nodes);
 	let multiaddr = config.network.listen_addresses[0].clone();
 	let authority_discovery_enabled = false;
-	let NewFull {task_manager, client, network, rpc_handlers, node_handles, ..} =
+	let NewFull {task_manager, client, network, rpc_handlers, overseer_handler, ..} =
 		polkadot_test_new_full(config, authority_discovery_enabled)
 			.expect("could not create Polkadot test service");
 
@@ -203,7 +203,7 @@ pub fn run_test_node(
 	PolkadotTestNode {
 		task_manager,
 		client,
-		handles: node_handles,
+		overseer_handler,
 		addr,
 		rpc_handlers,
 	}
@@ -215,8 +215,8 @@ pub struct PolkadotTestNode<S, C> {
 	pub task_manager: S,
 	/// Client's instance.
 	pub client: Arc<C>,
-	/// Node's handles.
-	pub handles: OverseerHandler,
+	/// The overseer handler.
+	pub overseer_handler: OverseerHandler,
 	/// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes.
 	pub addr: MultiaddrWithPeerId,
 	/// RPCHandlers to make RPC queries.