tsarevvv/rust-ipfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: apply review suggestions and fix clippy lints

Browse Source
This commit is contained in:
Addy Bryant 2022-03-24 11:14:23 -04:00 committed by Joonas Koivunen
parent 1cee67de31
commit 897c16fe22
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/p2p/swarm.rs
View File

@ -332,6 +332,9 @@ impl NetworkBehaviour for SwarmApi {
_handler: Self::ConnectionHandler, _handler: Self::ConnectionHandler,
error: &DialError, error: &DialError,
) { ) {
// TODO: there might be additional connections we should attempt
// (i.e) a new MultiAddr was found after sending the existing ones
// off to dial
if let Some(peer_id) = peer_id { if let Some(peer_id) = peer_id {
match self.pending_connections.entry(peer_id) { match self.pending_connections.entry(peer_id) {
Entry::Occupied(mut oe) => { Entry::Occupied(mut oe) => {
@ -342,23 +345,17 @@ impl NetworkBehaviour for SwarmApi {
for (addr, error) in multiaddrs { for (addr, error) in multiaddrs {
let addr = MultiaddrWithPeerId::try_from(addr.clone()) let addr = MultiaddrWithPeerId::try_from(addr.clone())
.expect("to recieve an MultiAddrWithPeerId from DialError"); .expect("to recieve an MultiAddrWithPeerId from DialError");
self.connect_registry self.connect_registry.finish_subscription(
.finish_subscription(addr.into(), Err(error.to_string())); addr.clone().into(),
} Err(error.to_string()),
);
let peer_ids = multiaddrs if let Some(pos) = addresses.iter().position(|a| *a == addr) {
.into_iter() addresses.swap_remove(pos);
.map(|(addr, _err)| {
MultiaddrWithPeerId::try_from(addr.clone()).unwrap()
})
.collect::<Vec<_>>();
addresses.retain(|peer_id| !peer_ids.iter().any(|id| peer_id == id));
} }
DialError::WrongPeerId { }
obtained: _, }
endpoint: _, DialError::WrongPeerId { .. } => {
} => {
for addr in addresses.iter() { for addr in addresses.iter() {
self.connect_registry.finish_subscription( self.connect_registry.finish_subscription(
addr.clone().into(), addr.clone().into(),
@ -368,7 +365,12 @@ impl NetworkBehaviour for SwarmApi {
addresses.clear(); addresses.clear();
} }
err => trace!("unhandled DialError {}", err), error => {
warn!(
?error,
"unexpected DialError; some futures might never complete"
);
}
} }
if addresses.is_empty() { if addresses.is_empty() {