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

Revert "chore: update libp2p to 0.52.1 (#14429)" (#14722)

Browse Source 
* Revert "chore: update libp2p to 0.52.1 (#14429)"

This reverts commit 59d8b86450.

* Fix dependencies

* Update dependencies

* Update Cargo.lock
This commit is contained in:
Aaro Altonen
2023-08-16 13:06:13 +03:00
committed by GitHub
parent d160818a9f
commit dd1b29c2f8
39 changed files with 2171 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/peer_info.rs
+20 -45
View File
@@ -31,13 +31,13 @@ use libp2p::{
Info as IdentifyInfo,
},
identity::PublicKey,
ping::{Behaviour as Ping, Config as PingConfig, Event as PingEvent},
ping::{Behaviour as Ping, Config as PingConfig, Event as PingEvent, Success as PingSuccess},
swarm::{
behaviour::{
AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm,
ListenFailure,
},
ConnectionDenied, ConnectionHandler, ConnectionHandlerSelect, ConnectionId,
ConnectionDenied, ConnectionHandler, ConnectionId, IntoConnectionHandlerSelect,
NetworkBehaviour, PollParameters, THandler, THandlerInEvent, THandlerOutEvent, ToSwarm,
},
Multiaddr, PeerId,
@@ -148,18 +148,13 @@ impl PeerInfoBehaviour {
/// Inserts a ping time in the cache. Has no effect if we don't have any entry for that node,
/// which shouldn't happen.
fn handle_ping_report(
&mut self,
peer_id: &PeerId,
ping_time: Duration,
connection: ConnectionId,
) {
trace!(target: "sub-libp2p", "Ping time with {:?} via {:?}: {:?}", peer_id, connection, ping_time);
fn handle_ping_report(&mut self, peer_id: &PeerId, ping_time: Duration) {
trace!(target: "sub-libp2p", "Ping time with {:?}: {:?}", peer_id, ping_time);
if let Some(entry) = self.nodes_info.get_mut(peer_id) {
entry.latest_ping = Some(ping_time);
} else {
error!(target: "sub-libp2p",
"Received ping from node we're not connected to {:?} via {:?}", peer_id, connection);
"Received ping from node we're not connected to {:?}", peer_id);
}
}
@@ -213,11 +208,11 @@ pub enum PeerInfoEvent {
}
impl NetworkBehaviour for PeerInfoBehaviour {
type ConnectionHandler = ConnectionHandlerSelect<
type ConnectionHandler = IntoConnectionHandlerSelect<
<Ping as NetworkBehaviour>::ConnectionHandler,
<Identify as NetworkBehaviour>::ConnectionHandler,
>;
type ToSwarm = PeerInfoEvent;
type OutEvent = PeerInfoEvent;
fn handle_pending_inbound_connection(
&mut self,
@@ -383,9 +378,9 @@ impl NetworkBehaviour for PeerInfoBehaviour {
self.ping.on_swarm_event(FromSwarm::ListenerError(e));
self.identify.on_swarm_event(FromSwarm::ListenerError(e));
},
FromSwarm::ExternalAddrExpired(e) => {
self.ping.on_swarm_event(FromSwarm::ExternalAddrExpired(e));
self.identify.on_swarm_event(FromSwarm::ExternalAddrExpired(e));
FromSwarm::ExpiredExternalAddr(e) => {
self.ping.on_swarm_event(FromSwarm::ExpiredExternalAddr(e));
self.identify.on_swarm_event(FromSwarm::ExpiredExternalAddr(e));
},
FromSwarm::NewListener(e) => {
self.ping.on_swarm_event(FromSwarm::NewListener(e));
@@ -396,13 +391,9 @@ impl NetworkBehaviour for PeerInfoBehaviour {
self.identify.on_swarm_event(FromSwarm::ExpiredListenAddr(e));
self.external_addresses.remove(e.addr);
},
FromSwarm::NewExternalAddrCandidate(e) => {
self.ping.on_swarm_event(FromSwarm::NewExternalAddrCandidate(e));
self.identify.on_swarm_event(FromSwarm::NewExternalAddrCandidate(e));
},
FromSwarm::ExternalAddrConfirmed(e) => {
self.ping.on_swarm_event(FromSwarm::ExternalAddrConfirmed(e));
self.identify.on_swarm_event(FromSwarm::ExternalAddrConfirmed(e));
FromSwarm::NewExternalAddr(e) => {
self.ping.on_swarm_event(FromSwarm::NewExternalAddr(e));
self.identify.on_swarm_event(FromSwarm::NewExternalAddr(e));
self.external_addresses.add(e.addr.clone());
},
FromSwarm::AddressChange(e @ AddressChange { peer_id, old, new, .. }) => {
@@ -446,13 +437,13 @@ impl NetworkBehaviour for PeerInfoBehaviour {
&mut self,
cx: &mut Context,
params: &mut impl PollParameters,
) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
) -> Poll<ToSwarm<Self::OutEvent, THandlerInEvent<Self>>> {
loop {
match self.ping.poll(cx, params) {
Poll::Pending => break,
Poll::Ready(ToSwarm::GenerateEvent(ev)) => {
if let PingEvent { peer, result: Ok(rtt), connection } = ev {
self.handle_ping_report(&peer, rtt, connection)
if let PingEvent { peer, result: Ok(PingSuccess::Ping { rtt }) } = ev {
self.handle_ping_report(&peer, rtt)
}
},
Poll::Ready(ToSwarm::Dial { opts }) => return Poll::Ready(ToSwarm::Dial { opts }),
@@ -462,18 +453,10 @@ impl NetworkBehaviour for PeerInfoBehaviour {
handler,
event: Either::Left(event),
}),
Poll::Ready(ToSwarm::ReportObservedAddr { address, score }) =>
return Poll::Ready(ToSwarm::ReportObservedAddr { address, score }),
Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }) =>
return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)) =>
return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)) =>
return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
Poll::Ready(ToSwarm::ExternalAddrExpired(addr)) =>
return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
Poll::Ready(ToSwarm::ListenOn { opts }) =>
return Poll::Ready(ToSwarm::ListenOn { opts }),
Poll::Ready(ToSwarm::RemoveListener { id }) =>
return Poll::Ready(ToSwarm::RemoveListener { id }),
}
}
@@ -499,18 +482,10 @@ impl NetworkBehaviour for PeerInfoBehaviour {
handler,
event: Either::Right(event),
}),
Poll::Ready(ToSwarm::ReportObservedAddr { address, score }) =>
return Poll::Ready(ToSwarm::ReportObservedAddr { address, score }),
Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }) =>
return Poll::Ready(ToSwarm::CloseConnection { peer_id, connection }),
Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)) =>
return Poll::Ready(ToSwarm::NewExternalAddrCandidate(observed)),
Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)) =>
return Poll::Ready(ToSwarm::ExternalAddrConfirmed(addr)),
Poll::Ready(ToSwarm::ExternalAddrExpired(addr)) =>
return Poll::Ready(ToSwarm::ExternalAddrExpired(addr)),
Poll::Ready(ToSwarm::ListenOn { opts }) =>
return Poll::Ready(ToSwarm::ListenOn { opts }),
Poll::Ready(ToSwarm::RemoveListener { id }) =>
return Poll::Ready(ToSwarm::RemoveListener { id }),
}
}