fix failed tests

Author: iosh

crates/cfxcore/core/src/channel.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/consensus/pivot_hint/tests.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/light_protocol/handler/sync/headers.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);
 

crates/util/treap-map/benches/map_cmp.rs

@@ -41,7 +41,7 @@ fn make_seperate_map(
     for _ in 0..SIZE {
         let key = rng.random_range(0..SIZE * 2);
         btree_map.insert(key, key);
-        treap_map.insert(key, (), rng.gen::<u64>() % u32::MAX as u64);
+        treap_map.insert(key, (), rng.random::<u64>() % u32::MAX as u64);
     }
     (treap_map, btree_map)
 }

crates/util/treap-map/benches/useless_weight.rs

@@ -34,7 +34,7 @@ fn make_small_weight_map(mut rng: impl Rng) -> TreapMap<SmallWeight> {
     let mut treap_map = TreapMap::<SmallWeight>::new();
     for _ in 0..SIZE {
         let key = rng.random_range(0..(SIZE * 2));
-        treap_map.insert(key, key, rng.gen::<u64>() >> 14);
+        treap_map.insert(key, key, rng.random::<u64>() >> 14);
     }
     treap_map
 }
@@ -43,7 +43,7 @@ fn make_large_weight_map(mut rng: impl Rng) -> TreapMap<LargeWeight> {
     let mut treap_map = TreapMap::<LargeWeight>::new();
     for _ in 0..SIZE {
         let key = rng.random_range(0..(SIZE * 2));
-        treap_map.insert(key, key, U512(rng.gen::<[u64; 8]>()) >> 14);
+        treap_map.insert(key, key, U512(rng.random::<[u64; 8]>()) >> 14);
     }
     treap_map
 }

crates/util/treap-map/src/tests.rs

@@ -11,7 +11,7 @@ use primitives::{
     transaction::native_transaction::NativeTransaction, Action,
     SignedTransaction, Transaction,
 };
-use rand::{seq::SliceRandom, thread_rng, Rng, RngCore, SeedableRng};
+use rand::{rng, seq::SliceRandom, Rng, RngCore, SeedableRng};
 use rand_chacha::ChaChaRng;
 use rand_xorshift::XorShiftRng;
 use std::{
@@ -198,7 +198,7 @@ fn test_insert_query_random() {
     let mut tx_vec: Vec<SignedTransaction> = vec![];
 
     for _ in 0..operation_num {
-        let operation = match operation_rng.gen::<u32>() % 4 {
+        let operation = match operation_rng.random::<u32>() % 4 {
             0 => Operation::Len,
             1 => Operation::ContainsKey,
             2 => Operation::Insert,
@@ -267,7 +267,7 @@ fn test_insert_remove_query_random() {
     let mut tx_vec: Vec<SignedTransaction> = vec![];
 
     for _ in 0..operation_num {
-        let operation = match operation_rng.gen::<u32>() % 7 {
+        let operation = match operation_rng.random::<u32>() % 7 {
             0 => Operation::Len,
             1 => Operation::ContainsKey,
             2..=3 => Operation::Insert,
@@ -391,7 +391,7 @@ fn test_apply_op_change_value() {
     }
     // Test update value
     let mut indicies: Vec<_> = (0u32..200).collect();
-    indicies.shuffle(&mut thread_rng());
+    indicies.shuffle(&mut rng());
     for i in indicies {
         let should_fail = i % 3 == 0;
         let update = |node: &mut Node<_>| {
@@ -439,7 +439,7 @@ fn test_apply_op_change_weight() {
     }
     // Test update value
     let mut indicies: Vec<_> = (0u32..200).collect();
-    indicies.shuffle(&mut thread_rng());
+    indicies.shuffle(&mut rng());
     for i in indicies {
         let should_fail = i % 3 == 0;
         let update = |node: &mut Node<_>| {
@@ -489,7 +489,7 @@ fn test_apply_op_change_key() {
     }
     // Test update value
     let mut indicies: Vec<_> = (0u32..200).collect();
-    indicies.shuffle(&mut thread_rng());
+    indicies.shuffle(&mut rng());
     for i in indicies {
         let should_fail = i % 3 == 0;
         let delete_item = i % 5 == 0;
@@ -578,7 +578,7 @@ fn test_apply_op_change_key_for_shared_key() {
     }
     // Test update value
     let mut indicies: Vec<_> = (0u32..200).collect();
-    indicies.shuffle(&mut thread_rng());
+    indicies.shuffle(&mut rng());
     for i in indicies {
         let should_fail = i % 3 == 0;
         let delete_item = i % 5 == 0;