chore(relay): remove deprecated items

Related: #3647. Pull-Request: #3948.
libp2p · May 15, 2023 · 7c64c42 · 7c64c42
1 parent 2512b6c
commit 7c64c42
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 172 deletions.
diff --git a/libp2p/src/tutorials/hole_punching.rs b/libp2p/src/tutorials/hole_punching.rs
@@ -25,7 +25,7 @@
 //! post](https://blog.ipfs.io/2022-01-20-libp2p-hole-punching/) to familiarize yourself with libp2p's hole
 //! punching mechanism on a conceptual level.
 //!
-//! We will be using the [Circuit Relay v2](crate::relay::v2) and the [Direct Connection
+//! We will be using the [Circuit Relay](crate::relay) and the [Direct Connection
 //! Upgrade through Relay (DCUtR)](crate::dcutr) protocol.
 //!
 //! You will need 3 machines for this tutorial:

diff --git a/protocols/relay/CHANGELOG.md b/protocols/relay/CHANGELOG.md
@@ -10,9 +10,12 @@
   These variants are no longer constructed.
   See [PR 3605].
 
+- Remove deprecated items. See [PR 3948].
+
 [PR 3605]: https://github.com/libp2p/rust-libp2p/pull/3605
 [PR 3715]: https://github.com/libp2p/rust-libp2p/pull/3715
 [PR 3829]: https://github.com/libp2p/rust-libp2p/pull/3829
+[PR 3948]: https://github.com/libp2p/rust-libp2p/pull/3948
 
 ## 0.15.2
 

diff --git a/protocols/relay/src/lib.rs b/protocols/relay/src/lib.rs
@@ -28,7 +28,6 @@ mod copy_future;
 mod multiaddr_ext;
 mod priv_client;
 mod protocol;
-pub mod v2;
 
 mod proto {
     #![allow(unreachable_pub)]

diff --git a/protocols/relay/src/priv_client.rs b/protocols/relay/src/priv_client.rs
@@ -118,11 +118,6 @@ pub fn new(local_peer_id: PeerId) -> (Transport, Behaviour) {
 }
 
 impl Behaviour {
-    #[deprecated(since = "0.15.0", note = "Use libp2p_relay::client::new instead.")]
-    pub fn new_transport_and_behaviour(local_peer_id: PeerId) -> (transport::Transport, Self) {
-        new(local_peer_id)
-    }
-
     fn on_connection_closed(
         &mut self,
         ConnectionClosed {

diff --git a/protocols/relay/src/priv_client/transport.rs b/protocols/relay/src/priv_client/transport.rs
@@ -301,7 +301,7 @@ fn parse_relayed_multiaddr(addr: Multiaddr) -> Result<RelayedMultiaddr, Transpor
     Ok(relayed_multiaddr)
 }
 
-pub struct Listener {
+pub(crate) struct Listener {
     listener_id: ListenerId,
     /// Queue of events to report when polled.
     queued_events: VecDeque<<Self as Stream>::Item>,
@@ -422,8 +422,9 @@ impl From<Error> for TransportError<Error> {
 
 /// Message from the [`Transport`] to the [`Behaviour`](crate::Behaviour)
 /// [`NetworkBehaviour`](libp2p_swarm::NetworkBehaviour).
-pub enum TransportToBehaviourMsg {
+pub(crate) enum TransportToBehaviourMsg {
     /// Dial destination node via relay node.
+    #[allow(dead_code)]
     DialReq {
         request_id: RequestId,
         relay_addr: Multiaddr,

diff --git a/protocols/relay/src/v2.rs b/protocols/relay/src/v2.rs