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

Companion PR for #8748 (#2990)

Browse Source 
* Replace NetworkStatusSinks with Arc<NetworkService>

* update Substrate

Co-authored-by: parity-processbot <>
This commit is contained in:
Roman Proskuryakov
2021-05-27 14:27:52 +00:00
committed by GitHub
parent 6e5d90a972
commit 3d04a0cce0
2 changed files with 159 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+157 -159
View File
File diff suppressed because it is too large Load Diff
polkadot/node/service/src/lib.rs
+2 -7
View File
@@ -570,7 +570,6 @@ pub struct NewFull<C> {
pub client: C, pub client: C,
pub overseer_handler: Option<OverseerHandler>, pub overseer_handler: Option<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 rpc_handlers: RpcHandlers, pub rpc_handlers: RpcHandlers,
pub backend: Arc<FullBackend>, pub backend: Arc<FullBackend>,
} }
@@ -584,7 +583,6 @@ impl<C> NewFull<C> {
task_manager: self.task_manager, task_manager: self.task_manager,
overseer_handler: self.overseer_handler, overseer_handler: self.overseer_handler,
network: self.network, network: self.network,
network_status_sinks: self.network_status_sinks,
rpc_handlers: self.rpc_handlers, rpc_handlers: self.rpc_handlers,
backend: self.backend, backend: self.backend,
} }
@@ -752,7 +750,7 @@ pub fn new_full<RuntimeApi, Executor>(
multiplexer multiplexer
}; };
let (network, network_status_sinks, system_rpc_tx, network_starter) = let (network, system_rpc_tx, network_starter) =
service::build_network(service::BuildNetworkParams { service::build_network(service::BuildNetworkParams {
config: &config, config: &config,
client: client.clone(), client: client.clone(),
@@ -807,7 +805,6 @@ pub fn new_full<RuntimeApi, Executor>(
task_manager: &mut task_manager, task_manager: &mut task_manager,
on_demand: None, on_demand: None,
remote_blockchain: None, remote_blockchain: None,
network_status_sinks: network_status_sinks.clone(),
system_rpc_tx, system_rpc_tx,
telemetry: telemetry.as_mut(), telemetry: telemetry.as_mut(),
})?; })?;
@@ -1071,7 +1068,6 @@ pub fn new_full<RuntimeApi, Executor>(
client, client,
overseer_handler, overseer_handler,
network, network,
network_status_sinks,
rpc_handlers, rpc_handlers,
backend, backend,
}) })
@@ -1163,7 +1159,7 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(
telemetry.as_ref().map(|x| x.handle()), telemetry.as_ref().map(|x| x.handle()),
)?; )?;
let (network, network_status_sinks, system_rpc_tx, network_starter) = let (network, system_rpc_tx, network_starter) =
service::build_network(service::BuildNetworkParams { service::build_network(service::BuildNetworkParams {
config: &config, config: &config,
client: client.clone(), client: client.clone(),
@@ -1223,7 +1219,6 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(
transaction_pool, transaction_pool,
client, client,
network, network,
network_status_sinks,
system_rpc_tx, system_rpc_tx,
telemetry: telemetry.as_mut(), telemetry: telemetry.as_mut(),
})?; })?;