Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

chore: update libp2p to 0.52.1 #14429

Merged
merged 53 commits into from
Jul 25, 2023
Merged

chore: update libp2p to 0.52.1 #14429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
3102dbd
update libp2p to 0.52.0
melekes Jun 21, 2023
54778bd
proto name now must implement `AsRef<str>`
melekes Jun 21, 2023
839641b
update libp2p version everywhere
melekes Jun 21, 2023
45ff813
ToSwarm, FromBehaviour, ToBehaviour
melekes Jun 21, 2023
12ba133
new NetworkBehaviour invariants
melekes Jun 22, 2023
fe656e8
replace `Vec<u8>` with `StreamProtocol`
melekes Jun 22, 2023
37e7408
rename ConnectionHandlerEvent::Custom to NotifyBehaviour
melekes Jun 22, 2023
d5b8198
remove DialError & ListenError invariants
melekes Jun 23, 2023
81f5cd0
use connection_limits::Behaviour
melekes Jun 23, 2023
4d068dd
impl `void::Void` for `BehaviourOut`
melekes Jun 27, 2023
3e54dd1
KademliaHandler no longer public
melekes Jun 27, 2023
076635b
fix StreamProtocol construction
melekes Jun 27, 2023
d1fd05c
update libp2p-identify to 0.2.0
melekes Jun 27, 2023
f01de8b
remove non-existing methods from PollParameters
melekes Jun 28, 2023
bea250f
`P2p` now contains `PeerId`, not `Multihash`
melekes Jun 28, 2023
405ebcb
use multihash-codetable crate
melekes Jun 28, 2023
394eba1
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jun 28, 2023
ac5cfd3
update Cargo.lock
melekes Jun 28, 2023
3d04207
reformat text
melekes Jun 28, 2023
5f511cc
comment out tests for now
melekes Jun 29, 2023
f141f03
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jun 29, 2023
6970c11
remove `.into()` from P2p
melekes Jun 29, 2023
49e0ba7
confirm observed addr manually
melekes Jul 4, 2023
477ebc1
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 4, 2023
dd4a718
remove SwarmEvent::Banned
melekes Jul 4, 2023
c4f0a9c
fix imports
melekes Jul 4, 2023
350902c
replace `libp2p` with smaller deps in network-gossip
melekes Jul 4, 2023
b67be46
bring back tests
melekes Jul 4, 2023
3c179f0
finish rewriting tests
melekes Jul 4, 2023
720a068
uncomment handler tests
melekes Jul 5, 2023
7ffa62a
Revert "uncomment handler tests"
melekes Jul 6, 2023
07f2db8
add a fixme
melekes Jul 6, 2023
0370270
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 7, 2023
b25efe5
update Cargo.lock
melekes Jul 7, 2023
343a86e
remove extra From
melekes Jul 7, 2023
965cc2d
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 10, 2023
3b1c8f2
make void uninhabited
melekes Jul 17, 2023
a506670
fix discovery test
melekes Jul 17, 2023
6c78a74
use autonat protocols
melekes Jul 17, 2023
09f1ab6
fix SyncNotificationsClogged invariant
melekes Jul 17, 2023
e22dc73
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 17, 2023
2b1377c
only set server mode manually in tests
melekes Jul 17, 2023
6aa6c8d
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 17, 2023
8538215
Merge remote-tracking branch 'origin/master' into anton/libp2p-0.52.0
Jul 17, 2023
a6e2e25
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 18, 2023
c45b465
address @dmitry-markin comments
melekes Jul 18, 2023
d464408
remove autonat
melekes Jul 18, 2023
8b9309d
removed unused var
melekes Jul 18, 2023
73df4d5
fix EOL
melekes Jul 18, 2023
c34f538
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 19, 2023
d44efb5
update smallvec and sha2
melekes Jul 19, 2023
ff76e2a
bump k256
melekes Jul 19, 2023
925cad0
Merge branch 'master' into anton/libp2p-0.52.0
melekes Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix StreamProtocol construction
  • Loading branch information
@melekes
melekes committed Jun 27, 2023
commit 076635bd98edd03d62675f8b40f4eef62cc7d129
4 changes: 2 additions & 2 deletions client/network/src/discovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
/// Legacy (fallback) Kademlia protocol name based on `protocol_id`.
fn legacy_kademlia_protocol_name(id: &ProtocolId) -> StreamProtocol {
let name = format!("/{}/kad", id.as_ref());
StreamProtocol::new(&name)
StreamProtocol::try_from_owned(name).expect("protocol name is valid. qed")
}

/// Kademlia protocol name based on `genesis_hash` and `fork_id`.
Expand All @@ -954,7 +954,7 @@ fn kademlia_protocol_name<Hash: AsRef<[u8]>>(
} else {
format!("/{}/kad", genesis_hash_hex)
};
StreamProtocol::new(&name)
StreamProtocol::try_from_owned(name).expect("protocol name is valid. qed")
}

#[cfg(test)]
Expand Down
11 changes: 6 additions & 5 deletions client/network/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,13 @@ use libp2p::{
identify::Info as IdentifyInfo,
kad::record::Key as KademliaKey,
multiaddr,
ping::Failure as PingFailure,
// ping::Failure as PingFailure,
swarm::{
ConnectionError, ConnectionId, DialError, Executor, ListenError, NetworkBehaviour, Swarm,
SwarmBuilder, SwarmEvent, THandlerErr,
},
Multiaddr, PeerId,
Multiaddr,
PeerId,
};
use log::{debug, error, info, trace, warn};
use metrics::{Histogram, HistogramVec, MetricSources, Metrics};
Expand Down Expand Up @@ -1560,9 +1561,9 @@ where
};
let reason = match cause {
Some(ConnectionError::IO(_)) => "transport-error",
Some(ConnectionError::Handler(Either::Left(Either::Left(
Either::Right(Either::Left(Either::Left(PingFailure::Timeout))),
)))) => "ping-timeout",
// Some(ConnectionError::Handler(Either::Left(Either::Left(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no such variant seems to exist

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PingFailure doesn't exist?

What does ConnectionError::Handler(Either::Left(Either::Left(Either::Left(Either::Right contain?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

let reason = match cause {
     |                                        ----- this expression has type `std::option::Option<ConnectionError<either::Either<either::Either<either::Either<either::Either<NotifsHandlerError, either::Either<void::Void, std::io::Error>>, std::io::Error>, void::Void>, void::Void>>>`

std::io::Error

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are sure that this io::Error is handling the case for ping failure, may be we should still report it as "ping-failure" and not as default "protocol-error"?

// Either::Right(PingFailure::Timeout),
// )))) => "ping-timeout",
Some(ConnectionError::Handler(Either::Left(Either::Left(
Either::Left(Either::Left(
NotifsHandlerError::SyncNotificationsClogged,
Expand Down