Merge branch 'master' into dp/chore/remove-rust-crypto-from-devp2p

* master: [devp2p] Fix warnings and re-org imports (#10710)
openethereum · Jun 4, 2019 · b0c89b8 · b0c89b8
2 parents 6f51390 + 425dcd4
commit b0c89b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/util/network-devp2p/src/connection.rs b/util/network-devp2p/src/connection.rs
@@ -31,7 +31,7 @@ use crypto::aes::{AesCtr256, AesEcb256};
 use rlp::{Rlp, RlpStream};
 use tiny_keccak::Keccak;
 
-use ethkey::{crypto, Secret};
+use ethkey::crypto;
 use handshake::Handshake;
 use io::{IoContext, StreamToken};
 use network::{Error, ErrorKind};

diff --git a/util/network-devp2p/src/lib.rs b/util/network-devp2p/src/lib.rs
@@ -60,6 +60,7 @@
 //TODO: use Poll from mio
 #![allow(deprecated)]
 
+//TODO: remove this
 extern crate ansi_term;
 #[cfg(test)] #[macro_use]
 extern crate assert_matches;
@@ -87,7 +88,6 @@ extern crate parity_snappy as snappy;
 extern crate parking_lot;
 extern crate rand;
 extern crate rlp;
-//TODO: remove this
 extern crate rustc_hex;
 extern crate serde;
 #[macro_use]