From 900bf67623311851a36dcbcf4a150c8087c86b20 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 4 Dec 2017 16:18:27 +0100
Subject: [PATCH] Remove the tokio-core dependency where not necessary

---
 libp2p-secio/Cargo.toml       | 4 +++-
 libp2p-secio/src/codec/mod.rs | 7 ++++---
 libp2p-secio/src/handshake.rs | 7 ++++---
 libp2p-secio/src/lib.rs       | 1 -
 libp2p-swarm/Cargo.toml       | 1 -
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libp2p-secio/Cargo.toml b/libp2p-secio/Cargo.toml
index 21c85713..79a1c394 100644
--- a/libp2p-secio/Cargo.toml
+++ b/libp2p-secio/Cargo.toml
@@ -12,6 +12,8 @@ rand = "0.3.17"
 ring = { version = "0.12.1", features = ["rsa_signing"] }
 rust-crypto = "^0.2"
 rw-stream-sink = { path = "../rw-stream-sink" }
-tokio-core = "0.1.6"
 tokio-io = "0.1.0"
 untrusted = "0.6.0"
+
+[dev-dependencies]
+tokio-core = "0.1.6"
diff --git a/libp2p-secio/src/codec/mod.rs b/libp2p-secio/src/codec/mod.rs
index bf1a6b7d..5b934409 100644
--- a/libp2p-secio/src/codec/mod.rs
+++ b/libp2p-secio/src/codec/mod.rs
@@ -57,6 +57,7 @@ pub fn full_codec<S>(
 
 #[cfg(test)]
 mod tests {
+	extern crate tokio_core;
 	use super::DecoderMiddleware;
 	use super::EncoderMiddleware;
 	use super::full_codec;
@@ -71,9 +72,9 @@ mod tests {
 	use ring::hmac::SigningKey;
 	use ring::hmac::VerificationKey;
 	use std::io::Error as IoError;
-	use tokio_core::net::TcpListener;
-	use tokio_core::net::TcpStream;
-	use tokio_core::reactor::Core;
+	use self::tokio_core::net::TcpListener;
+	use self::tokio_core::net::TcpStream;
+	use self::tokio_core::reactor::Core;
 	use tokio_io::codec::length_delimited::Framed;
 
 	#[test]
diff --git a/libp2p-secio/src/handshake.rs b/libp2p-secio/src/handshake.rs
index 0eab732f..9c1d27a7 100644
--- a/libp2p-secio/src/handshake.rs
+++ b/libp2p-secio/src/handshake.rs
@@ -443,6 +443,7 @@ fn stretch_key(key: &SigningKey, result: &mut [u8]) {
 
 #[cfg(test)]
 mod tests {
+	extern crate tokio_core;
 	use super::handshake;
 	use super::stretch_key;
 	use futures::Future;
@@ -451,9 +452,9 @@ mod tests {
 	use ring::hmac::SigningKey;
 	use ring::signature::RSAKeyPair;
 	use std::sync::Arc;
-	use tokio_core::net::TcpListener;
-	use tokio_core::net::TcpStream;
-	use tokio_core::reactor::Core;
+	use self::tokio_core::net::TcpListener;
+	use self::tokio_core::net::TcpStream;
+	use self::tokio_core::reactor::Core;
 	use untrusted::Input;
 
 	#[test]
diff --git a/libp2p-secio/src/lib.rs b/libp2p-secio/src/lib.rs
index 94fcf2a2..a547b651 100644
--- a/libp2p-secio/src/lib.rs
+++ b/libp2p-secio/src/lib.rs
@@ -40,7 +40,6 @@ extern crate protobuf;
 extern crate rand;
 extern crate ring;
 extern crate rw_stream_sink;
-extern crate tokio_core;
 extern crate tokio_io;
 extern crate untrusted;
 
diff --git a/libp2p-swarm/Cargo.toml b/libp2p-swarm/Cargo.toml
index 6782a416..037dc96a 100644
--- a/libp2p-swarm/Cargo.toml
+++ b/libp2p-swarm/Cargo.toml
@@ -9,7 +9,6 @@ multiaddr = "0.2.0"
 multistream-select = { path = "../multistream-select" }
 futures = "0.1"
 smallvec = "0.5"
-tokio-core = "0.1"
 tokio-io = "0.1"
 
 [dev-dependencies]