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

Don't pass the Endpoint as message (#2814)

Browse Source
This commit is contained in:
Pierre Krieger
2019-06-06 22:12:55 +02:00
committed by Gavin Wood
parent f210557211
commit 6130ff3f46
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network-libp2p/src/custom_proto/behaviour.rs
+5 -5
View File
@@ -412,7 +412,7 @@ impl<TMessage, TSubstream> CustomProto<TMessage, TSubstream> {
debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", occ_entry.key());
self.events.push(NetworkBehaviourAction::SendEvent {
peer_id: occ_entry.key().clone(),
event: CustomProtoHandlerIn::Enable(connected_point.clone().into()),
event: CustomProtoHandlerIn::Enable,
});
*occ_entry.into_mut() = PeerState::Enabled { connected_point, open };
},
@@ -430,7 +430,7 @@ impl<TMessage, TSubstream> CustomProto<TMessage, TSubstream> {
debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", occ_entry.key());
self.events.push(NetworkBehaviourAction::SendEvent {
peer_id: occ_entry.key().clone(),
event: CustomProtoHandlerIn::Enable(connected_point.clone().into()),
event: CustomProtoHandlerIn::Enable,
});
*occ_entry.into_mut() = PeerState::Enabled { connected_point, open: false };
},
@@ -551,7 +551,7 @@ impl<TMessage, TSubstream> CustomProto<TMessage, TSubstream> {
debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", incoming.peer_id);
self.events.push(NetworkBehaviourAction::SendEvent {
peer_id: incoming.peer_id,
event: CustomProtoHandlerIn::Enable(connected_point.clone().into()),
event: CustomProtoHandlerIn::Enable,
});
*state = PeerState::Enabled { open: false, connected_point };
@@ -634,7 +634,7 @@ where
debug!(target: "sub-libp2p", "Handler({:?}) <= Enable", peer_id);
self.events.push(NetworkBehaviourAction::SendEvent {
peer_id: peer_id.clone(),
event: CustomProtoHandlerIn::Enable(connected_point.clone().into()),
event: CustomProtoHandlerIn::Enable,
});
*st = PeerState::Enabled { open: false, connected_point };
}
@@ -985,7 +985,7 @@ where
debug!(target: "sub-libp2p", "Handler({:?}) <= Enable now that ban has expired", peer_id);
self.events.push(NetworkBehaviourAction::SendEvent {
peer_id: peer_id.clone(),
event: CustomProtoHandlerIn::Enable(connected_point.clone().into()),
event: CustomProtoHandlerIn::Enable,
});
*peer_state = PeerState::Enabled { connected_point, open };
}
substrate/core/network-libp2p/src/custom_proto/handler.rs
+11 -7
View File
@@ -118,10 +118,11 @@ where
self.protocol.clone()
}
fn into_handler(self, remote_peer_id: &PeerId, _: &ConnectedPoint) -> Self::Handler {
fn into_handler(self, remote_peer_id: &PeerId, connected_point: &ConnectedPoint) -> Self::Handler {
let clock = Clock::new();
CustomProtoHandler {
protocol: self.protocol,
endpoint: connected_point.to_endpoint(),
remote_peer_id: remote_peer_id.clone(),
state: ProtocolState::Init {
substreams: SmallVec::new(),
@@ -145,6 +146,10 @@ pub struct CustomProtoHandler<TMessage, TSubstream> {
/// any influence on the behaviour.
remote_peer_id: PeerId,
/// Whether we are the connection dialer or listener. Used to determine who, between the local
/// node and the remote node, has priority.
endpoint: Endpoint,
/// Queue of events to send to the outside.
///
/// This queue must only ever be modified to insert elements at the back, or remove the first
@@ -208,9 +213,8 @@ enum ProtocolState<TMessage, TSubstream> {
/// Event that can be received by a `CustomProtoHandler`.
#[derive(Debug)]
pub enum CustomProtoHandlerIn<TMessage> {
/// The node should start using custom protocols. Contains whether we are the dialer or the
/// listener of the connection.
Enable(Endpoint),
/// The node should start using custom protocols.
Enable,
/// The node should stop using custom protocols.
Disable,
@@ -265,7 +269,7 @@ where
TMessage: CustomMessage,
{
/// Enables the handler.
fn enable(&mut self, endpoint: Endpoint) {
fn enable(&mut self) {
self.state = match mem::replace(&mut self.state, ProtocolState::Poisoned) {
ProtocolState::Poisoned => {
error!(target: "sub-libp2p", "Handler with {:?} is in poisoned state",
@@ -275,7 +279,7 @@ where
ProtocolState::Init { substreams: incoming, .. } => {
if incoming.is_empty() {
if let Endpoint::Dialer = endpoint {
if let Endpoint::Dialer = self.endpoint {
self.events_queue.push(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol: SubstreamProtocol::new(self.protocol.clone()),
info: (),
@@ -557,7 +561,7 @@ where TSubstream: AsyncRead + AsyncWrite, TMessage: CustomMessage {
fn inject_event(&mut self, message: CustomProtoHandlerIn<TMessage>) {
match message {
CustomProtoHandlerIn::Disable => self.disable(),
CustomProtoHandlerIn::Enable(endpoint) => self.enable(endpoint),
CustomProtoHandlerIn::Enable => self.enable(),
CustomProtoHandlerIn::SendCustomMessage { message } =>
self.send_message(message),
}