Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Remove:
Browse files Browse the repository at this point in the history
* `NetworkStatusSinks`
* `NetworkStatus`
* `NetworkWorker::status()`
* `sc_service::SpawnTasksParams::network_status_sinks`
* `sc_service::Configuration::informant_output_format`

Also:
* `sc_service::build_network()` does not return `network_status_sinks`
* `sc_service::run()` and `sc_informant::build()` do not report `NetworkStatus` events (it was broken for some time)
  • Loading branch information
kpp committed May 6, 2021
1 parent bc43ad4 commit 2a556e8
Show file tree
Hide file tree
Showing 19 changed files with 18 additions and 503 deletions.
7 changes: 0 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions bin/node-template/node/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>

config.network.extra_sets.push(sc_finality_grandpa::grandpa_peers_set_config());

let (network, network_status_sinks, system_rpc_tx, network_starter) =
let (network, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
client: client.clone(),
Expand Down Expand Up @@ -208,7 +208,6 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
on_demand: None,
remote_blockchain: None,
backend,
network_status_sinks,
system_rpc_tx,
config,
telemetry: telemetry.as_mut(),
Expand Down Expand Up @@ -384,7 +383,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
},
)?;

let (network, network_status_sinks, system_rpc_tx, network_starter) =
let (network, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
client: client.clone(),
Expand Down Expand Up @@ -412,7 +411,6 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
keystore: keystore_container.sync_keystore(),
backend,
network,
network_status_sinks,
system_rpc_tx,
telemetry: telemetry.as_mut(),
})?;
Expand Down
9 changes: 3 additions & 6 deletions bin/node/cli/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ pub struct NewFullBase {
pub task_manager: TaskManager,
pub client: Arc<FullClient>,
pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
pub network_status_sinks: sc_service::NetworkStatusSinks<Block>,
pub transaction_pool: Arc<sc_transaction_pool::FullPool<Block, FullClient>>,
}

Expand Down Expand Up @@ -242,7 +241,7 @@ pub fn new_full_base(
)
);

let (network, network_status_sinks, system_rpc_tx, network_starter) =
let (network, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
client: client.clone(),
Expand Down Expand Up @@ -279,7 +278,6 @@ pub fn new_full_base(
task_manager: &mut task_manager,
on_demand: None,
remote_blockchain: None,
network_status_sinks: network_status_sinks.clone(),
system_rpc_tx,
telemetry: telemetry.as_mut(),
},
Expand Down Expand Up @@ -415,7 +413,6 @@ pub fn new_full_base(
task_manager,
client,
network,
network_status_sinks,
transaction_pool,
})
}
Expand Down Expand Up @@ -519,7 +516,7 @@ pub fn new_light_base(
telemetry.as_ref().map(|x| x.handle()),
)?;

let (network, network_status_sinks, system_rpc_tx, network_starter) =
let (network, system_rpc_tx, network_starter) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
client: client.clone(),
Expand Down Expand Up @@ -554,7 +551,7 @@ pub fn new_light_base(
client: client.clone(),
transaction_pool: transaction_pool.clone(),
keystore: keystore_container.sync_keystore(),
config, backend, network_status_sinks, system_rpc_tx,
config, backend, system_rpc_tx,
network: network.clone(),
task_manager: &mut task_manager,
telemetry: telemetry.as_mut(),
Expand Down
1 change: 0 additions & 1 deletion client/cli/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
announce_block: self.announce_block()?,
role,
base_path: Some(base_path),
informant_output_format: Default::default(),
})
}

Expand Down
5 changes: 0 additions & 5 deletions client/informant/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ targets = ["x86_64-unknown-linux-gnu"]
ansi_term = "0.12.1"
futures = "0.3.9"
log = "0.4.8"
parity-util-mem = { version = "0.9.0", default-features = false, features = ["primitive-types"] }
sc-client-api = { version = "3.0.0", path = "../api" }
sc-network = { version = "0.9.0", path = "../network" }
sp-blockchain = { version = "3.0.0", path = "../../primitives/blockchain" }
sp-runtime = { version = "3.0.0", path = "../../primitives/runtime" }
sp-utils = { version = "3.0.0", path = "../../primitives/utils" }
sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
wasm-timer = "0.2"
204 changes: 0 additions & 204 deletions client/informant/src/display.rs

This file was deleted.

Loading

0 comments on commit 2a556e8

Please sign in to comment.