More cleanup.

Author: dvc94ch

transports/tcp/src/lib.rs

@@ -46,8 +46,7 @@ use libp2p_core::{
 use socket2::{Domain, Socket, Type};
 use std::{
     io,
-    iter::{self, FromIterator},
-    net::{IpAddr, SocketAddr, TcpListener, TcpStream},
+    net::{SocketAddr, TcpListener, TcpStream},
     pin::Pin,
     task::{Context, Poll},
     time::Duration,
@@ -192,10 +191,7 @@ impl Transport for TcpConfig {
     fn dial(self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
         let socket_addr = if let Ok(socket_addr) = multiaddr_to_socketaddr(&addr) {
             if socket_addr.port() == 0 || socket_addr.ip().is_unspecified() {
-                log::debug!("Instantly refusing dialing {}, as it is invalid", addr);
-                return Err(TransportError::Other(
-                    io::ErrorKind::ConnectionRefused.into(),
-                ));
+                return Err(TransportError::MultiaddrNotSupported(addr));
             }
             socket_addr
         } else {
@@ -231,7 +227,6 @@ pub struct TcpListenStream {
 impl Stream for TcpListenStream {
     type Item = Result<TcpListenerEvent, io::Error>;
 
-    /// Takes ownership of the listener, and returns the next incoming event and the listener.
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
         let me = Pin::into_inner(self);
         loop {
@@ -312,12 +307,9 @@ fn multiaddr_to_socketaddr(addr: &Multiaddr) -> Result<SocketAddr, ()> {
 
 // Create a [`Multiaddr`] from the given IP address and port number.
 fn socketaddr_to_multiaddr(addr: &SocketAddr) -> Multiaddr {
-    let proto = match addr.ip() {
-        IpAddr::V4(ip) => Protocol::Ip4(ip),
-        IpAddr::V6(ip) => Protocol::Ip6(ip),
-    };
-    let it = iter::once(proto).chain(iter::once(Protocol::Tcp(addr.port())));
-    Multiaddr::from_iter(it)
+    Multiaddr::empty()
+        .with(addr.ip().into())
+        .with(Protocol::Tcp(addr.port()))
 }
 
 #[cfg(test)]
@@ -326,7 +318,7 @@ mod tests {
 
     #[test]
     fn multiaddr_to_tcp_conversion() {
-        use std::net::{Ipv4Addr, Ipv6Addr};
+        use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
         assert!(
             multiaddr_to_socketaddr(&"/ip4/127.0.0.1/udp/1234".parse::<Multiaddr>().unwrap())