From 21a2539a2434dc7aa0c257ef195f561de12b38df Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Wed, 22 Jan 2020 16:33:42 +0100
Subject: [PATCH] make NotificationStream event naming consistent (#4712)
---
substrate/client/network-gossip/src/bridge.rs | 2 +-
substrate/client/network/src/behaviour.rs | 4 ++--
substrate/client/network/src/protocol.rs | 4 ++--
substrate/client/network/src/protocol/event.rs | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/substrate/client/network-gossip/src/bridge.rs b/substrate/client/network-gossip/src/bridge.rs
index 2b0b19b8761..d6d6805b3e5 100644
--- a/substrate/client/network-gossip/src/bridge.rs
+++ b/substrate/client/network-gossip/src/bridge.rs
@@ -100,7 +100,7 @@ impl<B: BlockT> GossipEngine<B> {
let inner = &mut *inner;
inner.state_machine.new_peer(&mut *inner.network, remote, roles);
}
- Event::NotificationsStreamClosed { remote, engine_id: msg_engine_id } => {
+ Event::NotificationStreamClosed { remote, engine_id: msg_engine_id } => {
if msg_engine_id != engine_id {
continue;
}
diff --git a/substrate/client/network/src/behaviour.rs b/substrate/client/network/src/behaviour.rs
index 7cc9eee74d6..faaa25c660e 100644
--- a/substrate/client/network/src/behaviour.rs
+++ b/substrate/client/network/src/behaviour.rs
@@ -144,9 +144,9 @@ Behaviour<B, S, H> {
roles,
}));
},
- CustomMessageOutcome::NotificationsStreamClosed { remote, protocols } =>
+ CustomMessageOutcome::NotificationStreamClosed { remote, protocols } =>
for engine_id in protocols {
- self.events.push(BehaviourOut::Event(Event::NotificationsStreamClosed {
+ self.events.push(BehaviourOut::Event(Event::NotificationStreamClosed {
remote: remote.clone(),
engine_id,
}));
diff --git a/substrate/client/network/src/protocol.rs b/substrate/client/network/src/protocol.rs
index 6914ea9efe1..7a9fc7ecfbb 100644
--- a/substrate/client/network/src/protocol.rs
+++ b/substrate/client/network/src/protocol.rs
@@ -1792,7 +1792,7 @@ pub enum CustomMessageOutcome<B: BlockT> {
/// Notification protocols have been opened with a remote.
NotificationStreamOpened { remote: PeerId, protocols: Vec<ConsensusEngineId>, roles: Roles },
/// Notification protocols have been closed with a remote.
- NotificationsStreamClosed { remote: PeerId, protocols: Vec<ConsensusEngineId> },
+ NotificationStreamClosed { remote: PeerId, protocols: Vec<ConsensusEngineId> },
/// Messages have been received on one or more notifications protocols.
NotificationsReceived { remote: PeerId, messages: Vec<(ConsensusEngineId, Bytes)> },
None,
@@ -1931,7 +1931,7 @@ Protocol<B, S, H> {
LegacyProtoOut::CustomProtocolClosed { peer_id, .. } => {
self.on_peer_disconnected(peer_id.clone());
// Notify all the notification protocols as closed.
- CustomMessageOutcome::NotificationsStreamClosed {
+ CustomMessageOutcome::NotificationStreamClosed {
remote: peer_id,
protocols: self.registered_notif_protocols.iter().cloned().collect(),
}
diff --git a/substrate/client/network/src/protocol/event.rs b/substrate/client/network/src/protocol/event.rs
index 47bf057505d..e239e9d9831 100644
--- a/substrate/client/network/src/protocol/event.rs
+++ b/substrate/client/network/src/protocol/event.rs
@@ -61,7 +61,7 @@ pub enum Event {
/// Closed a substream with the given node. Always matches a corresponding previous
/// `NotificationStreamOpened` message.
- NotificationsStreamClosed {
+ NotificationStreamClosed {
/// Node we closed the substream with.
remote: PeerId,
/// The concerned protocol. Each protocol uses a different substream.
--
GitLab