Skip to content
This repository has been archived by the owner on Oct 23, 2022. It is now read-only.

Update libp2p #485

Closed
wants to merge 3 commits into from
Closed

Update libp2p #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c6de5a
Update libp2p: 0.39.1 -> 0.40.0
matthiasbeyer Dec 6, 2021
167084f
Fix module path
matthiasbeyer Dec 6, 2021
dad189c
Remove inject_addr_reach_failure() which was removed
matthiasbeyer Dec 23, 2021
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ either = { default-features = false, version = "1.5" }
futures = { default-features = false, version = "0.3.9", features = ["alloc", "std"] }
hash_hasher = "2.0.3"
ipfs-unixfs = { version = "0.2", path = "unixfs" }
libp2p = { default-features = false, features = ["floodsub", "identify", "kad", "tcp-tokio", "mplex", "noise", "ping", "yamux", "dns-tokio"], version = "0.39.1" }
libp2p = { default-features = false, features = ["floodsub", "identify", "kad", "tcp-tokio", "mplex", "noise", "ping", "yamux", "dns-tokio"], version = "0.40.0" }
multibase = { default-features = false, version = "0.9" }
multihash = { default-features = false, version = "0.11" }
prost = { default-features = false, version = "0.8" }
Expand Down
2 changes: 1 addition & 1 deletion src/p2p/behaviour.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ impl<Types: IpfsTypes> NetworkBehaviourEventProcess<BitswapEvent> for Behaviour<

impl<Types: IpfsTypes> NetworkBehaviourEventProcess<PingEvent> for Behaviour<Types> {
fn inject_event(&mut self, event: PingEvent) {
use libp2p::ping::handler::{PingFailure, PingSuccess};
use libp2p::ping::{PingFailure, PingSuccess};
match event {
PingEvent {
peer,
Expand Down
10 changes: 0 additions & 10 deletions src/p2p/pubsub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,6 @@ impl NetworkBehaviour for Pubsub {
self.floodsub.inject_event(peer_id, connection, event)
}

fn inject_addr_reach_failure(
&mut self,
peer_id: Option<&PeerId>,
addr: &Multiaddr,
error: &dyn std::error::Error,
) {
self.floodsub
.inject_addr_reach_failure(peer_id, addr, error)
}

fn inject_dial_failure(&mut self, peer_id: &PeerId) {
self.floodsub.inject_dial_failure(peer_id)
}
Expand Down
31 changes: 0 additions & 31 deletions src/p2p/swarm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,37 +355,6 @@ impl NetworkBehaviour for SwarmApi {
}
}

fn inject_addr_reach_failure(
&mut self,
peer_id: Option<&PeerId>,
addr: &Multiaddr,
error: &dyn std::error::Error,
) {
trace!("inject_addr_reach_failure {} {}", addr, error);

if let Some(peer_id) = peer_id {
match self.pending_connections.entry(*peer_id) {
Entry::Occupied(mut oe) => {
let addresses = oe.get_mut();
let addr = MultiaddrWithPeerId::try_from(addr.clone())
.expect("dialed address contains peerid in libp2p 0.38");
let pos = addresses.iter().position(|a| *a == addr);

if let Some(pos) = pos {
addresses.swap_remove(pos);
self.connect_registry
.finish_subscription(addr.into(), Err(error.to_string()));
}

if addresses.is_empty() {
oe.remove();
}
}
Entry::Vacant(_) => {}
}
}
}

fn poll(
&mut self,
_: &mut Context,
Expand Down