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

node/service/src/lib: Do not spawn authority discovery on sentries (#1835)

Browse Source 
* node/service/src/lib: Do not spawn authority discovery on sentries

The notion of sentry nodes has been deprecated (see [1] for details).
Support for sentry nodes in the `client/authority-discovery` module has
been removed.

This commit adjusts the instantiation of the authority discovery worker
accordingly, only spawning the module on authority nodes.

[1] https://github.com/paritytech/substrate/issues/6845

* "Update Substrate"

Co-authored-by: parity-processbot <>
This commit is contained in:
Max Inden
2020-10-26 11:31:16 +01:00
committed by GitHub
parent 2163988f54
commit 6d7b42b5ac
2 changed files with 151 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+137 -136
View File
File diff suppressed because it is too large Load Diff
polkadot/node/service/src/lib.rs
+5 -19
View File
@@ -531,34 +531,21 @@ pub fn new_full<RuntimeApi, Executor>(
grandpa::setup_disabled_grandpa(network.clone())?; grandpa::setup_disabled_grandpa(network.clone())?;
} }
if matches!(role, Role::Authority{..} | Role::Sentry{..}) { if role.is_authority() && !authority_discovery_disabled {
use sc_network::Event; use sc_network::Event;
use futures::StreamExt; use futures::StreamExt;
if !authority_discovery_disabled { let authority_discovery_role = authority_discovery::Role::PublishAndDiscover(
let (sentries, authority_discovery_role) = match role {
Role::Authority { ref sentry_nodes } => (
sentry_nodes.clone(),
authority_discovery::Role::Authority (
keystore_container.keystore(), keystore_container.keystore(),
), );
), let dht_event_stream = network.event_stream("authority-discovery")
Role::Sentry {..} => ( .filter_map(|e| async move { match e {
vec![],
authority_discovery::Role::Sentry,
),
_ => unreachable!("Due to outer matches! constraint; qed."),
};
let network_event_stream = network.event_stream("authority-discovery");
let dht_event_stream = network_event_stream.filter_map(|e| async move { match e {
Event::Dht(e) => Some(e), Event::Dht(e) => Some(e),
_ => None, _ => None,
}}); }});
let (authority_discovery_worker, _service) = authority_discovery::new_worker_and_service( let (authority_discovery_worker, _service) = authority_discovery::new_worker_and_service(
client.clone(), client.clone(),
network.clone(), network.clone(),
sentries,
Box::pin(dht_event_stream), Box::pin(dht_event_stream),
authority_discovery_role, authority_discovery_role,
prometheus_registry.clone(), prometheus_registry.clone(),
@@ -566,7 +553,6 @@ pub fn new_full<RuntimeApi, Executor>(
task_manager.spawn_handle().spawn("authority-discovery-worker", authority_discovery_worker.run()); task_manager.spawn_handle().spawn("authority-discovery-worker", authority_discovery_worker.run());
} }
}
network_starter.start_network(); network_starter.start_network();