pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-25 07:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename node_handles to overseer_handler (#1803)

Browse Source 
They are not node handles anymore ;)
This commit is contained in:
Bastian Köcher
2020-10-09 17:32:45 +02:00
committed by GitHub
parent d985b9aa02
commit 25914bb5e1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/service/src/lib.rs
+7 -7
View File
@@ -301,7 +301,7 @@ fn real_overseer<S: SpawnNamed>(
pub struct NewFull<C> { pub struct NewFull<C> {
pub task_manager: TaskManager, pub task_manager: TaskManager,
pub client: C, pub client: C,
pub node_handles: OverseerHandler, pub overseer_handler: OverseerHandler,
pub network: Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>, pub network: Arc<sc_network::NetworkService<Block, <Block as BlockT>::Hash>>,
pub network_status_sinks: service::NetworkStatusSinks<Block>, pub network_status_sinks: service::NetworkStatusSinks<Block>,
pub rpc_handlers: RpcHandlers, pub rpc_handlers: RpcHandlers,
@@ -313,7 +313,7 @@ impl<C> NewFull<C> {
NewFull { NewFull {
client: func(self.client), client: func(self.client),
task_manager: self.task_manager, task_manager: self.task_manager,
node_handles: self.node_handles, overseer_handler: self.overseer_handler,
network: self.network, network: self.network,
network_status_sinks: self.network_status_sinks, network_status_sinks: self.network_status_sinks,
rpc_handlers: self.rpc_handlers, rpc_handlers: self.rpc_handlers,
@@ -415,13 +415,13 @@ pub fn new_full<RuntimeApi, Executor>(
}) })
.collect(); .collect();
let (overseer, handler) = real_overseer(leaves, prometheus_registry.as_ref(), spawner)?; let (overseer, overseer_handler) = real_overseer(leaves, prometheus_registry.as_ref(), spawner)?;
let handler_clone = handler.clone(); let overseer_handler_clone = overseer_handler.clone();
task_manager.spawn_essential_handle().spawn_blocking("overseer", Box::pin(async move { task_manager.spawn_essential_handle().spawn_blocking("overseer", Box::pin(async move {
use futures::{pin_mut, select, FutureExt}; 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 forward = forward.fuse();
let overseer_fut = overseer.run().fuse(); let overseer_fut = overseer.run().fuse();
@@ -445,7 +445,7 @@ pub fn new_full<RuntimeApi, Executor>(
let proposer = ProposerFactory::new( let proposer = ProposerFactory::new(
client.clone(), client.clone(),
transaction_pool, transaction_pool,
handler.clone(), overseer_handler.clone(),
); );
let babe_config = babe::BabeParams { let babe_config = babe::BabeParams {
@@ -575,7 +575,7 @@ pub fn new_full<RuntimeApi, Executor>(
Ok(NewFull { Ok(NewFull {
task_manager, task_manager,
client, client,
node_handles: handler, overseer_handler,
network, network,
network_status_sinks, network_status_sinks,
rpc_handlers, rpc_handlers,
polkadot/node/test-service/src/lib.rs
+4 -4
View File
@@ -193,7 +193,7 @@ pub fn run_test_node(
let config = node_config(storage_update_func, task_executor, key, boot_nodes); let config = node_config(storage_update_func, task_executor, key, boot_nodes);
let multiaddr = config.network.listen_addresses[0].clone(); let multiaddr = config.network.listen_addresses[0].clone();
let authority_discovery_enabled = false; 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) polkadot_test_new_full(config, authority_discovery_enabled)
.expect("could not create Polkadot test service"); .expect("could not create Polkadot test service");
@@ -203,7 +203,7 @@ pub fn run_test_node(
PolkadotTestNode { PolkadotTestNode {
task_manager, task_manager,
client, client,
handles: node_handles, overseer_handler,
addr, addr,
rpc_handlers, rpc_handlers,
} }
@@ -215,8 +215,8 @@ pub struct PolkadotTestNode<S, C> {
pub task_manager: S, pub task_manager: S,
/// Client's instance. /// Client's instance.
pub client: Arc<C>, pub client: Arc<C>,
/// Node's handles. /// The overseer handler.
pub handles: OverseerHandler, pub overseer_handler: OverseerHandler,
/// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes. /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" to other nodes.
pub addr: MultiaddrWithPeerId, pub addr: MultiaddrWithPeerId,
/// RPCHandlers to make RPC queries. /// RPCHandlers to make RPC queries.