remove direct dependencies on multiaddr (#1092)

transports/dns/Cargo.toml

@@ -13,7 +13,6 @@ categories = ["network-programming", "asynchronous"]
 libp2p-core = { version = "0.7.0", path = "../../core" }
 log = "0.4.1"
 futures = "0.1"
-multiaddr = { package = "parity-multiaddr", version = "0.4.0", path = "../../misc/multiaddr" }
 tokio-dns-unofficial = "0.4"
 tokio-io = "0.1"
 

transports/dns/src/lib.rs

@@ -34,9 +34,12 @@
 //!
 
 use futures::{future::{self, Either, FutureResult, JoinAll}, prelude::*, stream, try_ready};
-use libp2p_core::{Transport, transport::{TransportError, ListenerEvent}};
+use libp2p_core::{
+    Transport,
+    multiaddr::{Protocol, Multiaddr},
+    transport::{TransportError, ListenerEvent}
+};
 use log::{debug, trace, log_enabled, Level};
-use multiaddr::{Protocol, Multiaddr};
 use std::{error, fmt, io, marker::PhantomData, net::IpAddr};
 use tokio_dns::{CpuPoolResolver, Resolver};
 
@@ -306,8 +309,11 @@ where
 mod tests {
     use libp2p_tcp::TcpConfig;
     use futures::future;
-    use libp2p_core::{Transport, transport::TransportError};
+    use libp2p_core::{
-    use multiaddr::{Protocol, Multiaddr};
+        Transport,
+        multiaddr::{Protocol, Multiaddr},
+        transport::TransportError
+    };
     use super::DnsConfig;
 
     #[test]

transports/tcp/Cargo.toml

@@ -14,7 +14,6 @@ get_if_addrs = "0.5.3"
 libp2p-core = { version = "0.7.0", path = "../../core" }
 log = "0.4.1"
 futures = "0.1"
-multiaddr = { package = "parity-multiaddr", version = "0.4.0", path = "../../misc/multiaddr" }
 tk-listen = "0.2.0"
 tokio-io = "0.1"
 tokio-tcp = "0.1"

transports/tcp/src/lib.rs

@@ -44,9 +44,12 @@ use futures::{
     stream::{self, Chain, IterOk, Once}
 };
 use get_if_addrs::get_if_addrs;
-use libp2p_core::{Transport, transport::{ListenerEvent, TransportError}};
+use libp2p_core::{
+    Transport,
+    multiaddr::{Protocol, Multiaddr},
+    transport::{ListenerEvent, TransportError}
+};
 use log::{debug, error};
-use multiaddr::{Protocol, Multiaddr};
 use std::{
     collections::{HashMap, VecDeque},
     fmt,
@@ -499,10 +502,13 @@ mod tests {
     use super::{multiaddr_to_socketaddr, TcpConfig};
     use futures::stream::Stream;
     use futures::Future;
-    use multiaddr::{Multiaddr, Protocol};
     use std;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-    use libp2p_core::{Transport, transport::ListenerEvent};
+    use libp2p_core::{
+        Transport,
+        multiaddr::{Multiaddr, Protocol},
+        transport::ListenerEvent
+    };
     use tokio_io;
 
     #[test]

transports/uds/Cargo.toml

@@ -13,7 +13,6 @@ categories = ["network-programming", "asynchronous"]
 libp2p-core = { version = "0.7.0", path = "../../core" }
 log = "0.4.1"
 futures = "0.1"
-multiaddr = { package = "parity-multiaddr", version = "0.4.0", path = "../../misc/multiaddr" }
 tokio-uds = "0.2"
 
 [target.'cfg(all(unix, not(any(target_os = "emscripten", target_os = "unknown"))))'.dev-dependencies]

transports/uds/src/lib.rs

@@ -49,9 +49,12 @@
 use futures::{future::{self, FutureResult}, prelude::*, try_ready};
 use futures::stream::Stream;
 use log::debug;
-use multiaddr::{Protocol, Multiaddr};
 use std::{io, path::PathBuf};
-use libp2p_core::{Transport, transport::{ListenerEvent, TransportError}};
+use libp2p_core::{
+    Transport,
+    multiaddr::{Protocol, Multiaddr},
+    transport::{ListenerEvent, TransportError}
+};
 use tokio_uds::{UnixListener, UnixStream};
 
 /// Represents the configuration for a Unix domain sockets transport capability for libp2p.
@@ -171,9 +174,12 @@ mod tests {
     use tokio::runtime::current_thread::Runtime;
     use super::{multiaddr_to_path, UdsConfig};
     use futures::prelude::*;
-    use multiaddr::{Protocol, Multiaddr};
     use std::{self, borrow::Cow, path::Path};
-    use libp2p_core::{Transport, transport::ListenerEvent};
+    use libp2p_core::{
+        Transport,
+        multiaddr::{Protocol, Multiaddr},
+        transport::ListenerEvent
+    };
     use tempfile;
     use tokio_io;
 

transports/websocket/Cargo.toml

@@ -12,7 +12,6 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 libp2p-core = { version = "0.7.0", path = "../../core" }
 futures = "0.1"
-multiaddr = { package = "parity-multiaddr", version = "0.4.0", path = "../../misc/multiaddr" }
 log = "0.4.1"
 rw-stream-sink = { version = "0.1.1", path = "../../misc/rw-stream-sink" }
 tokio-io = "0.1"

transports/websocket/src/browser.rs

@@ -23,14 +23,17 @@ use futures::{future, stream};
 use futures::stream::Then as StreamThen;
 use futures::sync::{mpsc, oneshot};
 use futures::{Async, Future, Poll, Stream};
-use multiaddr::{Protocol, Multiaddr};
 use rw_stream_sink::RwStreamSink;
 use std::io::{Error as IoError, ErrorKind as IoErrorKind};
 use std::io::{Read, Write};
 use std::sync::{Arc, Mutex};
 use stdweb::web::TypedArray;
 use stdweb::{self, Reference};
-use libp2p_core::{Transport, transport::{ListenerEvent, TransportError}};
+use libp2p_core::{
+    Transport,
+    multiaddr::{Protocol, Multiaddr},
+    transport::{ListenerEvent, TransportError}
+};
 use tokio_io::{AsyncRead, AsyncWrite};
 
 /// Represents the configuration for a websocket transport capability for libp2p.

transports/websocket/src/desktop.rs

@@ -19,9 +19,12 @@
 // DEALINGS IN THE SOFTWARE.
 
 use futures::{Future, IntoFuture, Sink, Stream};
-use libp2p_core::{Transport, transport::{ListenerEvent, TransportError}};
+use libp2p_core::{
+    Transport,
+    multiaddr::{Protocol, Multiaddr},
+    transport::{ListenerEvent, TransportError}
+};
 use log::{debug, trace};
-use multiaddr::{Protocol, Multiaddr};
 use rw_stream_sink::RwStreamSink;
 use std::{error, fmt};
 use std::io::{Error as IoError, ErrorKind as IoErrorKind};
@@ -276,8 +279,11 @@ mod tests {
     use libp2p_tcp as tcp;
     use tokio::runtime::current_thread::Runtime;
     use futures::{Future, Stream};
-    use multiaddr::{Multiaddr, Protocol};
+    use libp2p_core::{
-    use libp2p_core::{Transport, transport::ListenerEvent};
+        Transport,
+        multiaddr::Protocol,
+        transport::ListenerEvent
+    };
     use super::WsConfig;
 
     #[test]