mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-21 01:41:03 +00:00
chore: update libp2p to 0.52.1 (#14429)
* update libp2p to 0.52.0 * proto name now must implement `AsRef<str>` * update libp2p version everywhere * ToSwarm, FromBehaviour, ToBehaviour also LocalProtocolsChange and RemoteProtocolsChange * new NetworkBehaviour invariants * replace `Vec<u8>` with `StreamProtocol` * rename ConnectionHandlerEvent::Custom to NotifyBehaviour * remove DialError & ListenError invariants also fix pending_events * use connection_limits::Behaviour See https://github.com/libp2p/rust-libp2p/pull/3885 * impl `void::Void` for `BehaviourOut` also use `Behaviour::with_codec` * KademliaHandler no longer public * fix StreamProtocol construction * update libp2p-identify to 0.2.0 * remove non-existing methods from PollParameters rename ConnectionHandlerUpgrErr to StreamUpgradeError * `P2p` now contains `PeerId`, not `Multihash` * use multihash-codetable crate * update Cargo.lock * reformat text * comment out tests for now * remove `.into()` from P2p * confirm observed addr manually See https://github.com/libp2p/rust-libp2p/blob/master/protocols/identify/CHANGELOG.md#0430 * remove SwarmEvent::Banned since we're not using `ban_peer_id`, this can be safely removed. we may want to introduce `libp2p::allow_block_list` module in the future. * fix imports * replace `libp2p` with smaller deps in network-gossip * bring back tests * finish rewriting tests * uncomment handler tests * Revert "uncomment handler tests" This reverts commit 720a06815887f4e10767c62b58864a7ec3a48e50. * add a fixme * update Cargo.lock * remove extra From * make void uninhabited * fix discovery test * use autonat protocols confirming external addresses manually is unsafe in open networks * fix SyncNotificationsClogged invariant * only set server mode manually in tests doubt that we need to set it on node since we're adding public addresses * address @dmitry-markin comments * remove autonat * removed unused var * fix EOL * update smallvec and sha2 in attempt to compile polkadot * bump k256 in attempt to build cumulus --------- Co-authored-by: parity-processbot <>
This commit is contained in:
@@ -162,8 +162,8 @@ impl AddrCache {
|
||||
|
||||
fn peer_id_from_multiaddr(addr: &Multiaddr) -> Option<PeerId> {
|
||||
addr.iter().last().and_then(|protocol| {
|
||||
if let Protocol::P2p(multihash) = protocol {
|
||||
PeerId::from_multihash(multihash).ok()
|
||||
if let Protocol::P2p(peer_id) = protocol {
|
||||
Some(peer_id)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
@@ -178,7 +178,8 @@ fn addresses_to_peer_ids(addresses: &HashSet<Multiaddr>) -> HashSet<PeerId> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
use libp2p::multihash::{self, Multihash};
|
||||
use libp2p::multihash::Multihash;
|
||||
use multihash_codetable::Code;
|
||||
use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
|
||||
|
||||
use sp_authority_discovery::{AuthorityId, AuthorityPair};
|
||||
@@ -200,14 +201,13 @@ mod tests {
|
||||
impl Arbitrary for TestMultiaddr {
|
||||
fn arbitrary(g: &mut Gen) -> Self {
|
||||
let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
|
||||
let peer_id = PeerId::from_multihash(
|
||||
Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
let peer_id =
|
||||
PeerId::from_multihash(Multihash::wrap(Code::Sha2_256.into(), &seed).unwrap())
|
||||
.unwrap();
|
||||
let multiaddr = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
|
||||
.parse::<Multiaddr>()
|
||||
.unwrap()
|
||||
.with(Protocol::P2p(peer_id.into()));
|
||||
.with(Protocol::P2p(peer_id));
|
||||
|
||||
TestMultiaddr(multiaddr)
|
||||
}
|
||||
@@ -219,18 +219,17 @@ mod tests {
|
||||
impl Arbitrary for TestMultiaddrsSamePeerCombo {
|
||||
fn arbitrary(g: &mut Gen) -> Self {
|
||||
let seed = (0..32).map(|_| u8::arbitrary(g)).collect::<Vec<_>>();
|
||||
let peer_id = PeerId::from_multihash(
|
||||
Multihash::wrap(multihash::Code::Sha2_256.into(), &seed).unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
let peer_id =
|
||||
PeerId::from_multihash(Multihash::wrap(Code::Sha2_256.into(), &seed).unwrap())
|
||||
.unwrap();
|
||||
let multiaddr1 = "/ip6/2001:db8:0:0:0:0:0:2/tcp/30333"
|
||||
.parse::<Multiaddr>()
|
||||
.unwrap()
|
||||
.with(Protocol::P2p(peer_id.into()));
|
||||
.with(Protocol::P2p(peer_id));
|
||||
let multiaddr2 = "/ip6/2002:db8:0:0:0:0:0:2/tcp/30133"
|
||||
.parse::<Multiaddr>()
|
||||
.unwrap()
|
||||
.with(Protocol::P2p(peer_id.into()));
|
||||
.with(Protocol::P2p(peer_id));
|
||||
TestMultiaddrsSamePeerCombo(multiaddr1, multiaddr2)
|
||||
}
|
||||
}
|
||||
@@ -367,7 +366,7 @@ mod tests {
|
||||
let mut addr_cache = AddrCache::new();
|
||||
|
||||
let peer_id = PeerId::random();
|
||||
let addr = Multiaddr::empty().with(Protocol::P2p(peer_id.into()));
|
||||
let addr = Multiaddr::empty().with(Protocol::P2p(peer_id));
|
||||
|
||||
let authority_id0 = AuthorityPair::generate().0.public();
|
||||
let authority_id1 = AuthorityPair::generate().0.public();
|
||||
|
||||
@@ -415,7 +415,7 @@ fn dont_stop_polling_dht_event_stream_after_bogus_event() {
|
||||
let peer_id = PeerId::random();
|
||||
let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
|
||||
|
||||
address.with(multiaddr::Protocol::P2p(peer_id.into()))
|
||||
address.with(multiaddr::Protocol::P2p(peer_id))
|
||||
};
|
||||
let remote_key_store = MemoryKeystore::new();
|
||||
let remote_public_key: AuthorityId = remote_key_store
|
||||
@@ -526,7 +526,7 @@ impl DhtValueFoundTester {
|
||||
let address: Multiaddr =
|
||||
format!("/ip6/2001:db8:0:0:0:0:0:{:x}/tcp/30333", idx).parse().unwrap();
|
||||
|
||||
address.with(multiaddr::Protocol::P2p(peer_id.into()))
|
||||
address.with(multiaddr::Protocol::P2p(peer_id))
|
||||
}
|
||||
|
||||
fn process_value_found(
|
||||
@@ -749,7 +749,7 @@ fn lookup_throttling() {
|
||||
let peer_id = PeerId::random();
|
||||
let address: Multiaddr = "/ip6/2001:db8:0:0:0:0:0:1/tcp/30333".parse().unwrap();
|
||||
|
||||
address.with(multiaddr::Protocol::P2p(peer_id.into()))
|
||||
address.with(multiaddr::Protocol::P2p(peer_id))
|
||||
};
|
||||
let remote_key_store = MemoryKeystore::new();
|
||||
let remote_public_keys: Vec<AuthorityId> = (0..20)
|
||||
|
||||
Reference in New Issue
Block a user