build(deps): Bump rand to 0.8 and quickcheck to 1

Cargo.toml

@@ -60,7 +60,7 @@ rendezvous = ["dep:libp2p-rendezvous"]
 tcp-async-io = ["dep:libp2p-tcp", "libp2p-tcp?/async-io"]
 tcp-tokio = ["dep:libp2p-tcp", "libp2p-tcp?/tokio"]
 uds = ["dep:libp2p-uds"]
-wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js", "rand/wasm-bindgen"]
+wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen", "getrandom/js"]
 wasm-ext = ["dep:libp2p-wasm-ext"]
 wasm-ext-websocket = ["wasm-ext", "libp2p-wasm-ext?/websocket"]
 websocket = ["dep:libp2p-websocket"]
@@ -103,7 +103,6 @@ libp2p-yamux = { version = "0.40.0", path = "muxers/yamux", optional = true }
 multiaddr = { version = "0.14.0" }
 parking_lot = "0.12.0"
 pin-project = "1.0.0"
-rand = "0.7.3" # Explicit dependency to be used in `wasm-bindgen` feature
 smallvec = "1.6.1"
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
@@ -131,6 +130,7 @@ members = [
     "misc/rw-stream-sink",
     "misc/keygen",
     "misc/prost-codec",
+    "misc/quickcheck-ext",
     "muxers/mplex",
     "muxers/yamux",
     "protocols/dcutr",

core/Cargo.toml

@@ -50,8 +50,7 @@ libp2p-mplex = { path = "../muxers/mplex" }
 libp2p-noise = { path = "../transports/noise" }
 libp2p-tcp = { path = "../transports/tcp" }
 multihash = { version = "0.16", default-features = false, features = ["arb"] }
-quickcheck = "0.9.0"
-rand07 = { package = "rand", version = "0.7" }
+quickcheck = { package = "quickcheck-ext", path = "../misc/quickcheck-ext" }
 rmp-serde = "1.0"
 serde_json = "1.0"
 

core/src/identity/rsa.rs

@@ -306,7 +306,6 @@ impl DerDecodable<'_> for Asn1SubjectPublicKeyInfo {
 mod tests {
     use super::*;
     use quickcheck::*;
-    use rand07::seq::SliceRandom;
     use std::fmt;
 
     const KEY1: &'static [u8] = include_bytes!("test/rsa-2048.pk8");
@@ -323,8 +322,8 @@ mod tests {
     }
 
     impl Arbitrary for SomeKeypair {
-        fn arbitrary<G: Gen>(g: &mut G) -> SomeKeypair {
-            let mut key = [KEY1, KEY2, KEY3].choose(g).unwrap().to_vec();
+        fn arbitrary(g: &mut Gen) -> SomeKeypair {
+            let mut key = g.choose(&[KEY1, KEY2, KEY3]).unwrap().to_vec();
             SomeKeypair(Keypair::from_pkcs8(&mut key).unwrap())
         }
     }

misc/multistream-select/Cargo.toml

@@ -25,6 +25,6 @@ libp2p-core = { path = "../../core", default-features = false }
 libp2p-swarm = { path = "../../swarm", default-features = false }
 libp2p-mplex = { path = "../../muxers/mplex" }
 libp2p-plaintext = { path = "../../transports/plaintext" }
-quickcheck = "0.9.0"
-rand = "0.7.2"
+quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
+rand = "0.8"
 rw-stream-sink = { version = "0.3.0", path = "../../misc/rw-stream-sink" }

misc/multistream-select/src/protocol.rs

@@ -455,24 +455,23 @@ impl fmt::Display for ProtocolError {
 mod tests {
     use super::*;
     use quickcheck::*;
-    use rand::distributions::Alphanumeric;
-    use rand::Rng;
     use std::iter;
 
     impl Arbitrary for Protocol {
-        fn arbitrary<G: Gen>(g: &mut G) -> Protocol {
-            let n = g.gen_range(1, g.size());
+        fn arbitrary(g: &mut Gen) -> Protocol {
+            let n = g.gen_range(1..g.size());
             let p: String = iter::repeat(())
-                .map(|()| g.sample(Alphanumeric))
+                .map(|()| char::arbitrary(g))
+                .filter(|&c| c.is_ascii_alphanumeric())
                 .take(n)
                 .collect();
             Protocol(Bytes::from(format!("/{}", p)))
         }
     }
 
     impl Arbitrary for Message {
-        fn arbitrary<G: Gen>(g: &mut G) -> Message {
-            match g.gen_range(0, 5) {
+        fn arbitrary(g: &mut Gen) -> Message {
+            match g.gen_range(0..5u8) {
                 0 => Message::Header(HeaderLine::V1),
                 1 => Message::NotAvailable,
                 2 => Message::ListProtocols,

misc/quickcheck-ext/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "quickcheck-ext"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "Unlicense/MIT"
+
+[dependencies]
+quickcheck = "1"
+num-traits = "0.2"

misc/quickcheck-ext/src/lib.rs

@@ -0,0 +1,14 @@
+pub use quickcheck::*;
+
+use core::ops::Range;
+use num_traits::sign::Unsigned;
+
+pub trait GenRange {
+    fn gen_range<T: Unsigned + Arbitrary + Copy>(&mut self, _range: Range<T>) -> T;
+}
+
+impl GenRange for Gen {
+    fn gen_range<T: Unsigned + Arbitrary + Copy>(&mut self, range: Range<T>) -> T {
+        <T as Arbitrary>::arbitrary(self) % (range.end - range.start) + range.start
+    }
+}

muxers/mplex/Cargo.toml

@@ -18,7 +18,7 @@ libp2p-core = { version = "0.36.0", path = "../../core", default-features = fals
 log = "0.4"
 nohash-hasher = "0.2"
 parking_lot = "0.12"
-rand = "0.7"
+rand = "0.8"
 smallvec = "1.6.1"
 unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] }
 
@@ -29,8 +29,7 @@ env_logger = "0.9"
 futures = "0.3"
 libp2p-tcp = { path = "../../transports/tcp" }
 libp2p-plaintext = { path = "../../transports/plaintext" }
-quickcheck = "0.9"
-rand = "0.7"
+quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
 
 [[bench]]
 name = "split_send_size"

muxers/mplex/src/io.rs

@@ -1105,27 +1105,25 @@ mod tests {
     use asynchronous_codec::{Decoder, Encoder};
     use bytes::BytesMut;
     use quickcheck::*;
-    use rand::prelude::*;
     use std::collections::HashSet;
     use std::num::NonZeroU8;
     use std::ops::DerefMut;
     use std::pin::Pin;
 
     impl Arbitrary for MaxBufferBehaviour {
-        fn arbitrary<G: Gen>(g: &mut G) -> MaxBufferBehaviour {
-            *[MaxBufferBehaviour::Block, MaxBufferBehaviour::ResetStream]
-                .choose(g)
+        fn arbitrary(g: &mut Gen) -> MaxBufferBehaviour {
+            *g.choose(&[MaxBufferBehaviour::Block, MaxBufferBehaviour::ResetStream])
                 .unwrap()
         }
     }
 
     impl Arbitrary for MplexConfig {
-        fn arbitrary<G: Gen>(g: &mut G) -> MplexConfig {
+        fn arbitrary(g: &mut Gen) -> MplexConfig {
             MplexConfig {
-                max_substreams: g.gen_range(1, 100),
-                max_buffer_len: g.gen_range(1, 1000),
+                max_substreams: g.gen_range(1..100),
+                max_buffer_len: g.gen_range(1..1000),
                 max_buffer_behaviour: MaxBufferBehaviour::arbitrary(g),
-                split_send_size: g.gen_range(1, 10000),
+                split_send_size: g.gen_range(1..10000),
                 protocol_name: crate::config::DEFAULT_MPLEX_PROTOCOL_NAME,
             }
         }

protocols/dcutr/Cargo.toml

@@ -35,5 +35,5 @@ libp2p-identify = { path = "../identify" }
 libp2p-plaintext = { path = "../../transports/plaintext" }
 libp2p-relay = { path = "../relay" }
 libp2p-yamux = { path = "../../muxers/yamux" }
-rand = "0.7"
+rand = "0.8"
 clap = {version = "3.1.6", features = ["derive"]}

protocols/floodsub/Cargo.toml

@@ -18,7 +18,7 @@ libp2p-core = { version = "0.36.0", path = "../../core", default-features = fals
 libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
 log = "0.4"
 prost = "0.11"
-rand = "0.7"
+rand = "0.8"
 smallvec = "1.6.1"
 
 [build-dependencies]

protocols/gossipsub/Cargo.toml

@@ -17,7 +17,7 @@ bytes = "1.0"
 byteorder = "1.3.4"
 fnv = "1.0.7"
 futures = "0.3.5"
-rand = "0.7.3"
+rand = "0.8"
 asynchronous-codec = "0.6"
 unsigned-varint = { version = "0.7.0", features = ["asynchronous_codec"] }
 log = "0.4.11"
@@ -40,7 +40,7 @@ libp2p-plaintext = { path = "../../transports/plaintext" }
 libp2p-yamux = { path = "../../muxers/yamux" }
 libp2p-mplex = { path = "../../muxers/mplex" }
 libp2p-noise = { path = "../../transports/noise" }
-quickcheck = "0.9.2"
+quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
 hex = "0.4.2"
 derive_builder = "0.11.1"
 

protocols/gossipsub/src/behaviour.rs

@@ -3204,7 +3204,7 @@ where
             debug!("Peer disconnected: {}", peer_id);
             {
                 let topics = match self.peer_topics.get(peer_id) {
-                    Some(topics) => (topics),
+                    Some(topics) => topics,
                     None => {
                         debug_assert!(
                             self.blacklisted_peers.contains(peer_id),
@@ -3667,7 +3667,6 @@ mod local_test {
     use crate::IdentTopic;
     use asynchronous_codec::Encoder;
     use quickcheck::*;
-    use rand::Rng;
 
     fn empty_rpc() -> GossipsubRpc {
         GossipsubRpc {
@@ -3704,16 +3703,16 @@ mod local_test {
     }
 
     impl Arbitrary for GossipsubRpc {
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        fn arbitrary(g: &mut Gen) -> Self {
             let mut rpc = empty_rpc();
 
-            for _ in 0..g.gen_range(0, 10) {
+            for _ in 0..g.gen_range(0..10u8) {
                 rpc.subscriptions.push(test_subscription());
             }
-            for _ in 0..g.gen_range(0, 10) {
+            for _ in 0..g.gen_range(0..10u8) {
                 rpc.messages.push(test_message());
             }
-            for _ in 0..g.gen_range(0, 10) {
+            for _ in 0..g.gen_range(0..10u8) {
                 rpc.control_msgs.push(test_control());
             }
             rpc

protocols/gossipsub/src/behaviour/tests.rs

@@ -3293,12 +3293,12 @@ mod tests {
         *seq += 1;
         RawGossipsubMessage {
             source: Some(PeerId::random()),
-            data: (0..rng.gen_range(10, 30))
+            data: (0..rng.gen_range(10..30))
                 .into_iter()
                 .map(|_| rng.gen())
                 .collect(),
             sequence_number: Some(*seq),
-            topic: topics[rng.gen_range(0, topics.len())].clone(),
+            topic: topics[rng.gen_range(0..topics.len())].clone(),
             signature: None,
             key: None,
             validated: true,

protocols/gossipsub/src/protocol.rs

@@ -572,13 +572,12 @@ mod tests {
     use crate::IdentTopic as Topic;
     use libp2p_core::identity::Keypair;
     use quickcheck::*;
-    use rand::Rng;
 
     #[derive(Clone, Debug)]
     struct Message(RawGossipsubMessage);
 
     impl Arbitrary for Message {
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        fn arbitrary(g: &mut Gen) -> Self {
             let keypair = TestKeypair::arbitrary(g);
 
             // generate an arbitrary GossipsubMessage using the behaviour signing functionality
@@ -588,8 +587,8 @@ mod tests {
                 config,
             )
             .unwrap();
-            let data = (0..g.gen_range(10, 10024))
-                .map(|_| g.gen())
+            let data = (0..g.gen_range(10..10024u32))
+                .map(|_| u8::arbitrary(g))
                 .collect::<Vec<_>>();
             let topic_id = TopicId::arbitrary(g).0;
             Message(gs.build_raw_message(topic_id, data).unwrap())
@@ -600,9 +599,9 @@ mod tests {
     struct TopicId(TopicHash);
 
     impl Arbitrary for TopicId {
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
-            let topic_string: String = (0..g.gen_range(20, 1024))
-                .map(|_| g.gen::<char>())
+        fn arbitrary(g: &mut Gen) -> Self {
+            let topic_string: String = (0..g.gen_range(20..1024u32))
+                .map(|_| char::arbitrary(g))
                 .collect::<String>()
                 .into();
             TopicId(Topic::new(topic_string).into())
@@ -614,8 +613,8 @@ mod tests {
 
     impl Arbitrary for TestKeypair {
         #[cfg(feature = "rsa")]
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
-            let keypair = if g.gen() {
+        fn arbitrary(g: &mut Gen) -> Self {
+            let keypair = if bool::arbitrary(g) {
                 // Small enough to be inlined.
                 Keypair::generate_ed25519()
             } else {

protocols/kad/Cargo.toml

@@ -21,7 +21,7 @@ log = "0.4"
 libp2p-core = { version = "0.36.0", path = "../../core", default-features = false }
 libp2p-swarm = { version = "0.39.0", path = "../../swarm" }
 prost = "0.11"
-rand = "0.7.2"
+rand = "0.8"
 sha2 = "0.10.0"
 smallvec = "1.6.1"
 uint = "0.9"
@@ -37,7 +37,7 @@ env_logger = "0.9.0"
 futures-timer = "3.0"
 libp2p-noise = { path = "../../transports/noise" }
 libp2p-yamux = { path = "../../muxers/yamux" }
-quickcheck = "0.9.0"
+quickcheck = { package = "quickcheck-ext", path = "../../misc/quickcheck-ext" }
 
 [build-dependencies]
 prost-build = "0.11"

protocols/kad/src/behaviour/test.rs

@@ -147,8 +147,9 @@ fn random_multihash() -> Multihash {
 struct Seed([u8; 32]);
 
 impl Arbitrary for Seed {
-    fn arbitrary<G: Gen>(g: &mut G) -> Seed {
-        Seed(g.gen())
+    fn arbitrary(g: &mut Gen) -> Seed {
+        let seed = core::array::from_fn(|_| u8::arbitrary(g));
+        Seed(seed)
     }
 }
 
@@ -157,14 +158,14 @@ fn bootstrap() {
     fn prop(seed: Seed) {
         let mut rng = StdRng::from_seed(seed.0);
 
-        let num_total = rng.gen_range(2, 20);
+        let num_total = rng.gen_range(2..20);
         // When looking for the closest node to a key, Kademlia considers
         // K_VALUE nodes to query at initialization. If `num_group` is larger
         // than K_VALUE the remaining locally known nodes will not be
         // considered. Given that no other node is aware of them, they would be
         // lost entirely. To prevent the above restrict `num_group` to be equal
         // or smaller than K_VALUE.
-        let num_group = rng.gen_range(1, (num_total % K_VALUE.get()) + 2);
+        let num_group = rng.gen_range(1..(num_total % K_VALUE.get()) + 2);
 
         let mut cfg = KademliaConfig::default();
         if rng.gen() {
@@ -244,7 +245,7 @@ fn query_iter() {
     }
 
     fn run(rng: &mut impl Rng) {
-        let num_total = rng.gen_range(2, 20);
+        let num_total = rng.gen_range(2..20);
         let mut swarms = build_connected_nodes(num_total, 1)
             .into_iter()
             .map(|(_a, s)| s)
@@ -492,7 +493,7 @@ fn put_record() {
     fn prop(records: Vec<Record>, seed: Seed, filter_records: bool, drop_records: bool) {
         let mut rng = StdRng::from_seed(seed.0);
         let replication_factor =
-            NonZeroUsize::new(rng.gen_range(1, (K_VALUE.get() / 2) + 1)).unwrap();
+            NonZeroUsize::new(rng.gen_range(1..(K_VALUE.get() / 2) + 1)).unwrap();
         // At least 4 nodes, 1 under test + 3 bootnodes.
         let num_total = usize::max(4, replication_factor.get() * 2);
 
@@ -856,7 +857,7 @@ fn add_provider() {
     fn prop(keys: Vec<record::Key>, seed: Seed) {
         let mut rng = StdRng::from_seed(seed.0);
         let replication_factor =
-            NonZeroUsize::new(rng.gen_range(1, (K_VALUE.get() / 2) + 1)).unwrap();
+            NonZeroUsize::new(rng.gen_range(1..(K_VALUE.get() / 2) + 1)).unwrap();
         // At least 4 nodes, 1 under test + 3 bootnodes.
         let num_total = usize::max(4, replication_factor.get() * 2);