Use Vec instead of SmallVec

In order to not expose a third party dependency in our API use a `Vec` type for the addresses list instead of a `SmallVec`.
libp2p · Mar 10, 2020 · 7e347a0 · 7e347a0
1 parent f154c81
commit 7e347a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/core/src/connection/listeners.rs b/core/src/connection/listeners.rs
@@ -149,7 +149,7 @@ where
         /// The ID of the listener that closed.
         listener_id: ListenerId,
         /// The addresses that the listener was listening on.
-        addresses: SmallVec<[Multiaddr; 4]>,
+        addresses: Vec<Multiaddr>,
         /// Reason for the closure. Contains `Ok(())` if the stream produced `None`, or `Err`
         /// if the stream produced an error.
         reason: Result<(), TTrans::Error>,
@@ -285,14 +285,14 @@ where
                 Poll::Ready(None) => {
                     return Poll::Ready(ListenersEvent::Closed {
                         listener_id: *listener_project.id,
-                        addresses: listener.addresses.clone(),
+                        addresses: listener.addresses.to_vec(),
                         reason: Ok(()),
                     })
                 }
                 Poll::Ready(Some(Err(err))) => {
                     return Poll::Ready(ListenersEvent::Closed {
                         listener_id: *listener_project.id,
-                        addresses: listener.addresses.clone(),
+                        addresses: listener.addresses.to_vec(),
                         reason: Err(err),
                     })
                 }

diff --git a/core/src/network/event.rs b/core/src/network/event.rs
@@ -44,7 +44,6 @@ use crate::{
 };
 use futures::prelude::*;
 use std::{error, fmt, hash::Hash};
-use smallvec::SmallVec;
 
 /// Event that can happen on the `Network`.
 pub enum NetworkEvent<'a, TTrans, TInEvent, TOutEvent, THandler, TConnInfo, TPeerId>
@@ -57,7 +56,7 @@ where
         /// The listener ID that closed.
         listener_id: ListenerId,
         /// The addresses that the listener was listening on.
-        addresses: SmallVec<[Multiaddr; 4]>,
+        addresses: Vec<Multiaddr>,
         /// Reason for the closure. Contains `Ok(())` if the stream produced `None`, or `Err`
         /// if the stream produced an error.
         reason: Result<(), TTrans::Error>,
@@ -347,4 +346,3 @@ where
         self.info().to_connected_point()
     }
 }
-