Merge branch 'master' into dependabot/cargo/unsigned-varint-0.8

Author: jxs

src/lib.rs

@@ -27,7 +27,7 @@ use std::{
     sync::Arc,
 };
 
-use libp2p_identity::PeerId;
+pub use libp2p_identity::PeerId;
 
 #[cfg(feature = "url")]
 pub use self::from_url::{from_url, from_url_lossy, FromUrlErr};

src/protocol.rs

@@ -1,9 +1,8 @@
 use crate::onion_addr::Onion3Addr;
-use crate::{Error, Result};
+use crate::{Error, PeerId, Result};
 use arrayref::array_ref;
 use byteorder::{BigEndian, ByteOrder, ReadBytesExt, WriteBytesExt};
 use data_encoding::BASE32;
-use libp2p_identity::PeerId;
 use std::{
     borrow::Cow,
     convert::From,

tests/lib.rs

@@ -1,5 +1,4 @@
 use data_encoding::HEXUPPER;
-use libp2p_identity::PeerId;
 use multiaddr::*;
 use multihash::Multihash;
 use quickcheck::{Arbitrary, Gen, QuickCheck};
@@ -740,8 +739,7 @@ fn arbitrary_impl_for_all_proto_variants() {
 }
 
 mod multiaddr_with_p2p {
-    use libp2p_identity::PeerId;
-    use multiaddr::Multiaddr;
+    use multiaddr::{Multiaddr, PeerId};
 
     fn test_multiaddr_with_p2p(
         multiaddr: &str,