diff --git a/misc/metrics/src/swarm.rs b/misc/metrics/src/swarm.rs index 17de48b6..86aff6dd 100644 --- a/misc/metrics/src/swarm.rs +++ b/misc/metrics/src/swarm.rs @@ -246,9 +246,6 @@ impl super::Recorder { record(OutgoingConnectionErrorError::WrongPeerId) } - libp2p_swarm::DialError::ConnectionIo(_) => { - record(OutgoingConnectionErrorError::ConnectionIo) - } }; } libp2p_swarm::SwarmEvent::BannedPeer { endpoint, .. } => { @@ -347,7 +344,6 @@ enum OutgoingConnectionErrorError { Aborted, InvalidPeerId, WrongPeerId, - ConnectionIo, TransportMultiaddrNotSupported, TransportOther, } diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs index 27450b2a..0cc606fa 100644 --- a/protocols/kad/src/behaviour.rs +++ b/protocols/kad/src/behaviour.rs @@ -1936,7 +1936,6 @@ where | DialError::InvalidPeerId { .. } | DialError::WrongPeerId { .. } | DialError::Aborted - | DialError::ConnectionIo(_) | DialError::Transport(_) | DialError::NoAddresses => { if let DialError::Transport(addresses) = error { diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md index 9666daa4..c66391f1 100644 --- a/swarm/CHANGELOG.md +++ b/swarm/CHANGELOG.md @@ -29,6 +29,10 @@ This was never constructed. See [PR 3373]. +- Remove `DialError::ConnectionIo` variant. + This was never constructed. + See [PR 3374]. + [PR 3364]: https://github.com/libp2p/rust-libp2p/pull/3364 [PR 3170]: https://github.com/libp2p/rust-libp2p/pull/3170 [PR 3134]: https://github.com/libp2p/rust-libp2p/pull/3134 @@ -39,6 +43,7 @@ [PR 3188]: https://github.com/libp2p/rust-libp2p/pull/3188 [PR 3377]: https://github.com/libp2p/rust-libp2p/pull/3377 [PR 3373]: https://github.com/libp2p/rust-libp2p/pull/3373 +[PR 3374]: https://github.com/libp2p/rust-libp2p/pull/3374 # 0.41.1 diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs index 66ef8e74..9644d17f 100644 --- a/swarm/src/lib.rs +++ b/swarm/src/lib.rs @@ -1597,8 +1597,6 @@ pub enum DialError { obtained: PeerId, endpoint: ConnectedPoint, }, - /// An I/O error occurred on the connection. - ConnectionIo(io::Error), /// An error occurred while negotiating the transport protocol(s) on a connection. Transport(Vec<(Multiaddr, TransportError)>), } @@ -1641,10 +1639,6 @@ impl fmt::Display for DialError { f, "Dial error: Unexpected peer ID {obtained} at {endpoint:?}." ), - DialError::ConnectionIo(e) => write!( - f, - "Dial error: An I/O error occurred on the connection: {e:?}." - ), DialError::Transport(errors) => { write!(f, "Failed to negotiate transport protocol(s): [")?; @@ -1682,7 +1676,6 @@ impl error::Error for DialError { DialError::Aborted => None, DialError::InvalidPeerId { .. } => None, DialError::WrongPeerId { .. } => None, - DialError::ConnectionIo(_) => None, DialError::Transport(_) => None, } }