Merge pull request #3233 from iosh/rand

chore: upgrade rand version to 0.9

Author: iosh

Cargo.lock

@@ -338,10 +338,13 @@ clap = "4"
 clap-verbosity-flag = "3"
 
 # rand & rng
-rand = "0.7"
-rand_xorshift = "0.2"
+rand = "0.9"
+rand_xorshift = "0.4"
+rand_chacha = "0.9.0"
+
+# old rand
+rand_07 = { package = "rand", version = "0.7" }
 rand_08 = { package = "rand", version = "0.8" }
-rand_chacha = "0.2.1"
 
 # misc
 log = "0.4"

Cargo.toml

@@ -14,7 +14,7 @@ parity-secp256k1 = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
 parity-wordlist = { workspace = true }
-rand = { workspace = true }
+rand_07 = { workspace = true }
 rustc-hex = { workspace = true }
 serde = { workspace = true }
 tiny-keccak = { workspace = true }

crates/cfx_key/Cargo.toml

@@ -15,7 +15,7 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::{KeyPair, KeyPairGenerator, SECP256K1};
-use rand::rngs::OsRng;
+use rand_07::rngs::OsRng;
 
 /// Randomly generates new keypair, instantiating the RNG each time.
 pub struct Random;

crates/cfx_key/src/random.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use rand::{distributions::Alphanumeric, rngs::OsRng, Rng, RngCore};
+use rand::{distr::Alphanumeric, rngs::OsRng, Rng, TryRngCore};
 
 pub trait Random {
     fn random() -> Self
@@ -24,20 +24,25 @@ pub trait Random {
 impl Random for [u8; 16] {
     fn random() -> Self {
         let mut result = [0u8; 16];
-        OsRng.fill_bytes(&mut result);
+        OsRng.try_fill_bytes(&mut result).unwrap();
         result
     }
 }
 
 impl Random for [u8; 32] {
     fn random() -> Self {
         let mut result = [0u8; 32];
-        OsRng.fill_bytes(&mut result);
+        OsRng.try_fill_bytes(&mut result).unwrap();
         result
     }
 }
 
 /// Generate a random string of given length.
 pub fn random_string(length: usize) -> String {
-    OsRng.sample_iter(&Alphanumeric).take(length).collect()
+    let mut rng = rand::rng();
+    (&mut rng)
+        .sample_iter(Alphanumeric)
+        .take(length)
+        .map(char::from)
+        .collect()
 }

crates/cfx_store/src/random.rs

@@ -18,12 +18,16 @@ use cfxstore::{
     accounts_dir::{KeyDirectory, RootDiskDirectory},
     Error, SafeAccount,
 };
-use rand::{rngs::OsRng, RngCore};
+use rand::{rngs::OsRng, TryRngCore};
 use std::{env, fs, path::PathBuf};
 
 pub fn random_dir() -> PathBuf {
     let mut dir = env::temp_dir();
-    dir.push(format!("{:x}-{:x}", OsRng.next_u64(), OsRng.next_u64()));
+    dir.push(format!(
+        "{:x}-{:x}",
+        OsRng.try_next_u64().unwrap(),
+        OsRng.try_next_u64().unwrap()
+    ));
     dir
 }
 

crates/cfx_store/tests/util/transient_dir.rs

@@ -256,9 +256,9 @@ mod tests {
 
         // create async sender
         let fut3 = async move {
-            let mut rng = rand::thread_rng();
+            let mut rng = rand::rng();
             let mut sent = vec![];
-            for t in (0..100).map(|_| rng.gen()) {
+            for t in (0..100).map(|_| rng.random()) {
                 chan.send(t);
                 sent.push(t);
             }
@@ -285,9 +285,9 @@ mod tests {
 
         // create async sender
         let fut_a = async move {
-            let mut rng = rand::thread_rng();
+            let mut rng = rand::rng();
 
-            for t in (0..100).map(|_| rng.gen()) {
+            for t in (0..100).map(|_| rng.random()) {
                 send_a.send(t);
                 let t2 = rec_a.recv().await;
 

crates/cfxcore/core/src/channel.rs

@@ -1,4 +1,4 @@
-use rand::{thread_rng, RngCore};
+use rand::{rng, RngCore};
 use std::{
     fs::File,
     io::{Read, Seek, SeekFrom},
@@ -53,7 +53,7 @@ fn test_pivot_hint() {
     let pivot_hint = make_test_pivot_hint();
     let mut test_file = TestHashFile::new();
 
-    let mut rng = thread_rng();
+    let mut rng = rng();
     for _ in 0..100_000 {
         let fork_at = rng.next_u64() % 1_500_000;
         if fork_at == 0 {

crates/cfxcore/core/src/consensus/pivot_hint/tests.rs

@@ -15,7 +15,7 @@ use crate::message::MsgId;
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use network::{node_table::NodeId, service::ProtocolVersion};
-use rand::prelude::SliceRandom;
+use rand::prelude::IndexedRandom;
 use smart_default::SmartDefault;
 use throttling::token_bucket::{ThrottledManager, TokenBucketManager};
 
@@ -121,9 +121,7 @@ impl FullPeerFilter {
     }
 
     pub fn select(self, peers: Arc<Peers<FullPeerState>>) -> Option<NodeId> {
-        self.select_all(peers)
-            .choose(&mut rand::thread_rng())
-            .cloned()
+        self.select_all(peers).choose(&mut rand::rng()).cloned()
     }
 
     pub fn select_all(self, peers: Arc<Peers<FullPeerState>>) -> Vec<NodeId> {

crates/cfxcore/core/src/light_protocol/common/peers.rs

@@ -459,7 +459,7 @@ mod tests {
         headers.push(h5.clone());
         headers.push(h6.clone());
 
-        headers.shuffle(&mut rand::thread_rng());
+        headers.shuffle(&mut rand::rng());
         let mut queue = PriorityQueue::new();
         queue.extend(headers);