Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 29 additions & 9 deletions network-libp2p/src/connection_pool/behaviour.rs
Original file line number Diff line number Diff line change
Expand Up @@ -598,15 +598,35 @@ impl NetworkBehaviour for ConnectionPoolBehaviour {
_handler: Self::ProtocolsHandler,
error: &DialError,
) {
let peer_id = match peer_id {
Some(id) => id,
// Not interested in dial failures to unknown peers right now.
None => return,
};

log::debug!("Failed to dial peer {}: {:?}", peer_id, error);
self.peer_ids.mark_failed(peer_id);
self.maintain_peers();
match error {
DialError::Banned
| DialError::ConnectionLimit(_)
| DialError::LocalPeerId
| DialError::InvalidPeerId
| DialError::Aborted
| DialError::ConnectionIo(_)
| DialError::Transport(_)
| DialError::NoAddresses => {
let peer_id = match peer_id {
Some(id) => id,
// Not interested in dial failures to unknown peers right now.
None => return,
};

log::debug!("Failed to dial peer {}: {:?}", peer_id, error);
self.peer_ids.mark_failed(peer_id);
self.maintain_peers();
}
DialError::DialPeerConditionFalse(
DialPeerCondition::Disconnected | DialPeerCondition::NotDialing,
) => {
// We might (still) be connected, or about to be connected, thus do not report the
// failure.
}
DialError::DialPeerConditionFalse(DialPeerCondition::Always) => {
unreachable!("DialPeerCondition::Always can not trigger DialPeerConditionFalse.");
}
}
}

fn poll(
Expand Down
2 changes: 0 additions & 2 deletions network-libp2p/src/network.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![allow(dead_code)]

use std::num::NonZeroU8;
use std::{collections::HashMap, sync::Arc};

use async_trait::async_trait;
Expand Down Expand Up @@ -213,7 +212,6 @@ impl Network {
// TODO add proper config
SwarmBuilder::new(transport, behaviour, local_peer_id)
.connection_limits(limits)
.dial_concurrency_factor(NonZeroU8::new(10).unwrap())
.executor(Box::new(|fut| {
tokio::spawn(fut);
}))
Expand Down
2 changes: 1 addition & 1 deletion validator/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ impl<TNetwork: Network, TValidatorNetwork: ValidatorNetwork>
tokio::spawn(async move {
debug!("Sending unpark transaction");
if cn.send_transaction(unpark_transaction).await.is_err() {
error!("Failed to send unpark transatction");
error!("Failed to send unpark transaction");
}
});
self.unpark_sent = true;
Expand Down