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

Rename GenericProto to Notifications (#8415)

Browse Source 
* Rename GenericProto to Notifications

* Small comment fix
This commit is contained in:
Pierre Krieger
2021-03-22 11:32:47 +01:00
committed by GitHub
parent 998d190ea0
commit 5087634ccd
8 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol.rs
+10 -10
View File
@@ -27,7 +27,7 @@ use crate::{
use bytes::Bytes;
use codec::{Decode, DecodeAll, Encode};
use futures::{channel::oneshot, prelude::*};
use generic_proto::{GenericProto, GenericProtoOut};
use notifications::{Notifications, NotificationsOut};
use libp2p::core::{ConnectedPoint, connection::{ConnectionId, ListenerId}};
use libp2p::request_response::OutboundFailure;
use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters};
@@ -56,13 +56,13 @@ use std::collections::{HashMap, HashSet, VecDeque};
use std::sync::Arc;
use std::{io, iter, num::NonZeroUsize, pin::Pin, task::Poll, time};
mod generic_proto;
mod notifications;
pub mod message;
pub mod event;
pub mod sync;
pub use generic_proto::{NotificationsSink, Ready, NotifsHandlerError};
pub use notifications::{NotificationsSink, Ready, NotifsHandlerError};
/// Interval at which we perform time based maintenance
const TICK_TIMEOUT: time::Duration = time::Duration::from_millis(1100);
@@ -161,7 +161,7 @@ pub struct Protocol<B: BlockT> {
/// Used to report reputation changes.
peerset_handle: sc_peerset::PeersetHandle,
/// Handles opening the unique substream and sending and receiving raw messages.
behaviour: GenericProto,
behaviour: Notifications,
/// List of notifications protocols that have been registered.
notification_protocols: Vec<Cow<'static, str>>,
/// If we receive a new "substream open" event that contains an invalid handshake, we ask the
@@ -362,7 +362,7 @@ impl<B: BlockT> Protocol<B> {
genesis_hash,
).encode();
GenericProto::new(
Notifications::new(
peerset,
iter::once((block_announces_protocol, block_announces_handshake, MAX_BLOCK_ANNOUNCE_SIZE))
.chain(network_config.extra_sets.iter()
@@ -1169,7 +1169,7 @@ pub enum CustomMessageOutcome<B: BlockT> {
}
impl<B: BlockT> NetworkBehaviour for Protocol<B> {
type ProtocolsHandler = <GenericProto as NetworkBehaviour>::ProtocolsHandler;
type ProtocolsHandler = <Notifications as NetworkBehaviour>::ProtocolsHandler;
type OutEvent = CustomMessageOutcome<B>;
fn new_handler(&mut self) -> Self::ProtocolsHandler {
@@ -1332,7 +1332,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
};
let outcome = match event {
GenericProtoOut::CustomProtocolOpen { peer_id, set_id, received_handshake, notifications_sink, .. } => {
NotificationsOut::CustomProtocolOpen { peer_id, set_id, received_handshake, notifications_sink, .. } => {
// Set number 0 is hardcoded the default set of peers we sync from.
if set_id == HARDCODED_PEERSETS_SYNC {
// `received_handshake` can be either a `Status` message if received from the
@@ -1419,7 +1419,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
}
}
}
GenericProtoOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
NotificationsOut::CustomProtocolReplaced { peer_id, notifications_sink, set_id } => {
if set_id == HARDCODED_PEERSETS_SYNC {
CustomMessageOutcome::None
} else if self.bad_handshake_substreams.contains(&(peer_id.clone(), set_id)) {
@@ -1432,7 +1432,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
}
}
},
GenericProtoOut::CustomProtocolClosed { peer_id, set_id } => {
NotificationsOut::CustomProtocolClosed { peer_id, set_id } => {
// Set number 0 is hardcoded the default set of peers we sync from.
if set_id == HARDCODED_PEERSETS_SYNC {
if self.on_sync_peer_disconnected(peer_id.clone()).is_ok() {
@@ -1457,7 +1457,7 @@ impl<B: BlockT> NetworkBehaviour for Protocol<B> {
}
}
},
GenericProtoOut::Notification { peer_id, set_id, message } =>
NotificationsOut::Notification { peer_id, set_id, message } =>
match set_id {
HARDCODED_PEERSETS_SYNC if self.peers.contains_key(&peer_id) => {
if let Ok(announce) = message::BlockAnnounce::decode(&mut message.as_ref()) {