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

client/network: Adjust wording (#6755)

Browse Source 
Rename `NetworkWorker::from_worker` to `NetworkWorker::from_service` as
it is a channel from the `NetworkService` to the `NetworkWorker`.
This commit is contained in:
Max Inden
2020-07-29 13:18:40 +02:00
committed by GitHub
parent a2163420f4
commit e674d64a72
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/service.rs
+7 -7
View File
@@ -125,7 +125,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
&params.network_config.transport, &params.network_config.transport,
)?; )?;
let (to_worker, from_worker) = tracing_unbounded("mpsc_network_worker"); let (to_worker, from_service) = tracing_unbounded("mpsc_network_worker");
if let Some(path) = params.network_config.net_config_path { if let Some(path) = params.network_config.net_config_path {
fs::create_dir_all(&path)?; fs::create_dir_all(&path)?;
@@ -361,7 +361,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkWorker<B, H> {
network_service: swarm, network_service: swarm,
service, service,
import_queue: params.import_queue, import_queue: params.import_queue,
from_worker, from_service,
light_client_rqs: params.on_demand.and_then(|od| od.extract_receiver()), light_client_rqs: params.on_demand.and_then(|od| od.extract_receiver()),
event_streams: out_events::OutChannels::new(params.metrics_registry.as_ref())?, event_streams: out_events::OutChannels::new(params.metrics_registry.as_ref())?,
metrics, metrics,
@@ -843,7 +843,7 @@ enum ServiceToWorkerMsg<B: BlockT, H: ExHashT> {
/// Main network worker. Must be polled in order for the network to advance. /// Main network worker. Must be polled in order for the network to advance.
/// ///
/// You are encouraged to poll this in a separate background thread or task. /// You are encouraged to poll this in a separate background thread or task.
#[must_use = "The NetworkWorker must be polled in order for the network to work"] #[must_use = "The NetworkWorker must be polled in order for the network to advance"]
pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> { pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
/// Updated by the `NetworkWorker` and loaded by the `NetworkService`. /// Updated by the `NetworkWorker` and loaded by the `NetworkService`.
external_addresses: Arc<Mutex<Vec<Multiaddr>>>, external_addresses: Arc<Mutex<Vec<Multiaddr>>>,
@@ -855,10 +855,10 @@ pub struct NetworkWorker<B: BlockT + 'static, H: ExHashT> {
service: Arc<NetworkService<B, H>>, service: Arc<NetworkService<B, H>>,
/// The *actual* network. /// The *actual* network.
network_service: Swarm<B, H>, network_service: Swarm<B, H>,
/// The import queue that was passed as initialization. /// The import queue that was passed at initialization.
import_queue: Box<dyn ImportQueue<B>>, import_queue: Box<dyn ImportQueue<B>>,
/// Messages from the `NetworkService` and that must be processed. /// Messages from the [`NetworkService`] that must be processed.
from_worker: TracingUnboundedReceiver<ServiceToWorkerMsg<B, H>>, from_service: TracingUnboundedReceiver<ServiceToWorkerMsg<B, H>>,
/// Receiver for queries from the light client that must be processed. /// Receiver for queries from the light client that must be processed.
light_client_rqs: Option<TracingUnboundedReceiver<light_client_handler::Request<B>>>, light_client_rqs: Option<TracingUnboundedReceiver<light_client_handler::Request<B>>>,
/// Senders for events that happen on the network. /// Senders for events that happen on the network.
@@ -1137,7 +1137,7 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
loop { loop {
// Process the next message coming from the `NetworkService`. // Process the next message coming from the `NetworkService`.
let msg = match this.from_worker.poll_next_unpin(cx) { let msg = match this.from_service.poll_next_unpin(cx) {
Poll::Ready(Some(msg)) => msg, Poll::Ready(Some(msg)) => msg,
Poll::Ready(None) => return Poll::Ready(()), Poll::Ready(None) => return Poll::Ready(()),
Poll::Pending => break, Poll::Pending => break,