refactor(swarm)!: deprecate PollParameters where possible

swarm/src/behaviour.rs

@@ -19,8 +19,11 @@
 // DEALINGS IN THE SOFTWARE.
 
 mod either;
+mod listen_addresses;
 pub mod toggle;
 
+pub use listen_addresses::ListenAddresses;
+
 use crate::dial_opts::DialOpts;
 use crate::handler::{ConnectionHandler, IntoConnectionHandler};
 use crate::{AddressRecord, AddressScore, DialError};
@@ -402,6 +405,10 @@ pub trait PollParameters {
     fn supported_protocols(&self) -> Self::SupportedProtocolsIter;
 
     /// Returns the list of the addresses we're listening on.
+    #[deprecated(
+        since = "0.41.0",
+        note = "Use `libp2p_swarm::ListenAddresses` instead."
+    )]
     fn listened_addresses(&self) -> Self::ListenedAddressesIter;
 
     /// Returns the list of the addresses nodes can use to reach us.

swarm/src/behaviour/listen_addresses.rs

@@ -0,0 +1,33 @@
+use crate::behaviour::{ExpiredListenAddr, FromSwarm, NewListenAddr};
+use crate::IntoConnectionHandler;
+use libp2p_core::Multiaddr;
+use std::collections::HashSet;
+
+/// Utility struct for tracking the addresses a [`Swarm`](crate::Swarm) is listening on.
+#[derive(Debug, Default, Clone)]
+pub struct ListenAddresses {
+    addresses: HashSet<Multiaddr>,
+}
+
+impl ListenAddresses {
+    /// Returns an [`Iterator`] over all listen addresses.
+    pub fn iter(&self) -> impl ExactSizeIterator<Item = &Multiaddr> {
+        self.addresses.iter()
+    }
+
+    /// Feed a [`SwarmEvent`] to this struct.
+    pub fn on_event<THandler>(&mut self, event: &FromSwarm<THandler>)
+    where
+        THandler: IntoConnectionHandler,
+    {
+        match event {
+            FromSwarm::NewListenAddr(NewListenAddr { addr, .. }) => {
+                self.addresses.insert((*addr).clone());
+            }
+            FromSwarm::ExpiredListenAddr(ExpiredListenAddr { addr, .. }) => {
+                self.addresses.insert((*addr).clone());
+            }
+            _ => {}
+        }
+    }
+}

swarm/src/lib.rs

@@ -101,7 +101,8 @@ pub mod derive_prelude {
 }
 
 pub use behaviour::{
-    CloseConnection, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters,
+    CloseConnection, ListenAddresses, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler,
+    PollParameters,
 };
 pub use connection::pool::{ConnectionCounters, ConnectionLimits};
 pub use connection::{