diff --git a/libp2p/src/tutorials/hole_punching.rs b/libp2p/src/tutorials/hole_punching.rs index 10e2ec4c..8c898f7f 100644 --- a/libp2p/src/tutorials/hole_punching.rs +++ b/libp2p/src/tutorials/hole_punching.rs @@ -168,7 +168,7 @@ //! //! 2. The listening client initiating a direct connection upgrade for the new relayed connection. //! Reported by [`dcutr`](crate::dcutr) through -//! [`Event::RemoteInitiatedDirectConnectionUpgrade`](crate::dcutr::behaviour::Event::RemoteInitiatedDirectConnectionUpgrade). +//! [`Event::RemoteInitiatedDirectConnectionUpgrade`](crate::dcutr::Event::RemoteInitiatedDirectConnectionUpgrade). //! //! ``` ignore //! [2022-01-30T12:54:11Z INFO client] RemoteInitiatedDirectConnectionUpgrade { remote_peer_id: PeerId("12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X"), remote_relayed_addr: "/ip4/$RELAY_PEER_ID/tcp/4001/p2p/12D3KooWDpJ7As7BWAwRMfu1VU2WCqNjvq387JEYKDBj4kx6nXTN/p2p-circuit/p2p/12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X" } @@ -176,7 +176,7 @@ //! //! 3. The direct connection upgrade, also known as hole punch, succeeding. Reported by //! [`dcutr`](crate::dcutr) through -//! [`Event::RemoteInitiatedDirectConnectionUpgrade`](crate::dcutr::behaviour::Event::DirectConnectionUpgradeSucceeded). +//! [`Event::RemoteInitiatedDirectConnectionUpgrade`](crate::dcutr::Event::DirectConnectionUpgradeSucceeded). //! //! ``` ignore //! [2022-01-30T12:54:11Z INFO client] DirectConnectionUpgradeSucceeded { remote_peer_id: PeerId("12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X") } diff --git a/protocols/dcutr/CHANGELOG.md b/protocols/dcutr/CHANGELOG.md index cd3e34e2..5fb84593 100644 --- a/protocols/dcutr/CHANGELOG.md +++ b/protocols/dcutr/CHANGELOG.md @@ -2,8 +2,10 @@ - Raise MSRV to 1.65. See [PR 3715]. +- Remove deprecated items. See [PR 3700]. [PR 3715]: https://github.com/libp2p/rust-libp2p/pull/3715 +[PR 3700]: https://github.com/libp2p/rust-libp2p/pull/3700 ## 0.9.1 diff --git a/protocols/dcutr/src/lib.rs b/protocols/dcutr/src/lib.rs index b3584931..6001c914 100644 --- a/protocols/dcutr/src/lib.rs +++ b/protocols/dcutr/src/lib.rs @@ -43,25 +43,3 @@ pub mod inbound { pub mod outbound { pub use crate::protocol::outbound::UpgradeError; } - -#[deprecated( - since = "0.9.0", - note = "Use `libp2p_dcutr::inbound::UpgradeError` instead.`" -)] -pub type InboundUpgradeError = inbound::UpgradeError; - -#[deprecated( - since = "0.9.0", - note = "Use `libp2p_dcutr::outbound::UpgradeError` instead.`" -)] -pub type OutboundUpgradeError = outbound::UpgradeError; -pub mod behaviour { - #[deprecated(since = "0.9.0", note = "Use `libp2p_dcutr::Behaviour` instead.`")] - pub type Behaviour = crate::Behaviour; - - #[deprecated(since = "0.9.0", note = "Use `libp2p_dcutr::Event` instead.`")] - pub type Event = crate::Event; - - #[deprecated(since = "0.9.0", note = "Use `libp2p_dcutr::Error` instead.`")] - pub type UpgradeError = crate::Error; -} diff --git a/protocols/dcutr/src/protocol/inbound.rs b/protocols/dcutr/src/protocol/inbound.rs index fde42c6c..df4c3c63 100644 --- a/protocols/dcutr/src/protocol/inbound.rs +++ b/protocols/dcutr/src/protocol/inbound.rs @@ -130,9 +130,6 @@ pub enum UpgradeError { StreamClosed, #[error("Expected at least one address in reservation.")] NoAddresses, - #[deprecated(since = "0.8.1", note = "Error is no longer constructed.")] - #[error("Invalid addresses.")] - InvalidAddrs, #[error("Failed to parse response type field.")] ParseTypeField, #[error("Unexpected message type 'connect'")] diff --git a/protocols/dcutr/src/protocol/outbound.rs b/protocols/dcutr/src/protocol/outbound.rs index 9bbb1eb8..29509b16 100644 --- a/protocols/dcutr/src/protocol/outbound.rs +++ b/protocols/dcutr/src/protocol/outbound.rs @@ -136,9 +136,6 @@ pub enum UpgradeError { NoAddresses, #[error("Invalid expiration timestamp in reservation.")] InvalidReservationExpiration, - #[deprecated(since = "0.8.1", note = "Error is no longer constructed.")] - #[error("Invalid addresses in reservation.")] - InvalidAddrs, #[error("Failed to parse response type field.")] ParseTypeField, #[error("Unexpected message type 'connect'")]