Upgrade rand to 0.10.1 - WIP (some other crates were also upgraded)

Author: ImplOfAnImpl

Cargo.lock

@@ -169,7 +169,7 @@ enumflags2 = "0.7"
 expect-test = "1.3"
 file-rotate = "0.7"
 fix-hidden-lifetime-bug = "0.2"
-fixed-hash = "0.8"
+fixed-hash = { version = "0.8", default-features = false, features = ["byteorder", "rustc-hex"] } # FIXME docs
 flate2 = "1.0"
 fs4 = "0.12"
 futures = { version = "0.3", default-features = false }
@@ -212,14 +212,14 @@ parking_lot = "0.12"
 paste = "1.0"
 probabilistic-collections = "0.7"
 proc-macro2 = "1.0"
-# Note: proptest v1.7+ uses rand 0.9, which is incompatible with rand 0.8 that we currently use.
-# But we can't easily switch to rand 0.9 because many of our other dependencies use earlier versions
-# of rand.
-proptest = "~1.6"
+proptest = "1.11"
 qrcodegen = "1.8"
 quote = "1.0"
-rand = "0.8"
-rand_chacha = "0.3"
+rand = "0.10"
+rand_core = "0.10"
+rand_0_8 = { version = "0.8", package = "rand" }
+rand_0_9 = { version = "0.9", package = "rand" }
+rand_chacha = "0.10"
 rayon = "1.10"
 reedline = "0.38"
 ref-cast = "1.0"
@@ -233,7 +233,7 @@ rstest = "0.24"
 rstest_reuse = "0.7"
 rusqlite = "0.33"
 schnorrkel = "0.11"
-secp256k1 = { version = "0.29", default-features = false }
+secp256k1 = { version = "0.31", default-features = false }
 semver = "1.0"
 serde = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -22,7 +22,6 @@ chrono.workspace = true
 futures = { workspace = true, default-features = false }
 libtest-mimic.workspace = true
 proptest.workspace = true
-rand.workspace = true
 tokio = { workspace = true, features = ["full"] }
 
 [[test]]

api-server/storage-test-suite/Cargo.toml

@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use rand::CryptoRng;
 use serialization::extras::non_empty_vec::DataOrNoVec;
 use std::{collections::BTreeMap, sync::Arc};
 
@@ -35,7 +34,7 @@ use crypto::{
     key::{KeyKind, PrivateKey},
     vrf::{VRFKeyKind, VRFPrivateKey},
 };
-use randomness::Rng;
+use randomness::{CryptoRng, Rng};
 
 use chainstate_test_framework::{empty_witness, TestFramework, TransactionBuilder};
 use common::{

api-server/storage-test-suite/src/basic.rs

@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use randomness::{make_pseudo_rng, Rng as _};
+
 pub enum Container {
     PostgresFromDockerHub,
 }
@@ -26,9 +28,8 @@ impl Container {
 }
 
 fn random_string(length: usize) -> String {
-    use rand::Rng;
-    rand::thread_rng()
-        .sample_iter(&rand::distributions::Alphanumeric)
+    make_pseudo_rng()
+        .sample_iter(&randomness::distributions::Alphanumeric)
         .take(length)
         .map(char::from)
         .collect()

api-server/storage-test-suite/src/podman.rs

@@ -1854,7 +1854,7 @@ mod produce_block {
                 .expect("Error initializing blockprod");
 
                 let mut rng = make_seedable_rng(seed);
-                let jobs_to_create = rng.random::<usize>() % 20 + 1;
+                let jobs_to_create = rng.random_range(1..=20);
 
                 for _ in 0..jobs_to_create {
                     let (_block, job) = block_production
@@ -1891,7 +1891,7 @@ mod process_block_with_custom_id {
 
         let mut rng = make_seedable_rng(seed);
 
-        let jobs_to_create = rng.random::<usize>() % 20 + 1;
+        let jobs_to_create = rng.random_range(1..=20);
 
         let block_production = BlockProduction::new(
             chain_config,
@@ -1951,7 +1951,7 @@ mod process_block_with_custom_id {
 
         let mut rng = make_seedable_rng(seed);
 
-        let jobs_to_create = 10 + rng.random::<usize>() % 20 + 1;
+        let jobs_to_create = rng.random_range(1..=20);
 
         let block_production = BlockProduction::new(
             chain_config,
@@ -2104,7 +2104,7 @@ mod stop_all_jobs {
         .expect("Error initializing blockprod");
 
         let mut mock_job_manager = Box::<MockJobManager>::default();
-        let return_value = make_seedable_rng(seed).random();
+        let return_value = make_seedable_rng(seed).random_range(0..=usize::MAX);
         let expected_value = return_value;
 
         mock_job_manager
@@ -2226,7 +2226,7 @@ mod stop_job {
         .expect("Error initializing blockprod");
 
         let mut job_keys = Vec::new();
-        let jobs_to_create = rng.random::<usize>() % 20 + 1;
+        let jobs_to_create = rng.random_range(1..=20);
 
         for _ in 1..=jobs_to_create {
             let (job_key, _stop_last_used_block_timestamp, _stop_job_cancel_receiver) =

blockprod/src/detail/tests.rs

@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::BTreeMap;
-use std::rc::Rc;
+use std::{collections::BTreeMap, rc::Rc};
 
-use common::chain::{Block, GenBlock};
-use common::primitives::id::WithId;
-use common::primitives::{Id, Idable};
-use randomness::SliceRandom;
+use common::{
+    chain::{Block, GenBlock},
+    primitives::{id::WithId, Id, Idable},
+};
+use randomness::IndexedRandom as _;
 
 pub struct OrphanBlocksPool {
     orphan_ids: Vec<Id<Block>>,

chainstate/src/detail/orphan_blocks/pool.rs

@@ -367,7 +367,7 @@ impl<'a> RandomTxMaker<'a> {
         self.utxo_set
             .utxos()
             .iter()
-            .choose_multiple(rng, number_of_inputs)
+            .sample(rng, number_of_inputs)
             .iter()
             .filter_map(|(outpoint, utxo)| {
                 let input = TxInput::Utxo((*outpoint).clone());
@@ -402,7 +402,7 @@ impl<'a> RandomTxMaker<'a> {
             .tokens_store
             .tokens_data()
             .iter()
-            .choose_multiple(rng, number_of_inputs)
+            .sample(rng, number_of_inputs)
             .iter()
             .map(|(token_id, _)| AccountType::Token(**token_id))
             .collect::<Vec<_>>();
@@ -411,7 +411,7 @@ impl<'a> RandomTxMaker<'a> {
             .orders_store
             .orders_data()
             .iter()
-            .choose_multiple(rng, number_of_inputs)
+            .sample(rng, number_of_inputs)
             .iter()
             .map(|(id, _)| AccountType::Order(**id))
             .collect::<Vec<_>>();
@@ -420,7 +420,7 @@ impl<'a> RandomTxMaker<'a> {
             .pos_accounting_store
             .all_delegation_balances()
             .iter()
-            .choose_multiple(rng, number_of_inputs)
+            .sample(rng, number_of_inputs)
             .iter()
             .map(|(id, _)| AccountType::Delegation(**id))
             .collect::<Vec<_>>();

chainstate/test-framework/src/random_tx_maker.rs

@@ -35,7 +35,6 @@ tokio = { workspace = true, features = ["rt", "time"] }
 
 criterion.workspace = true
 expect-test.workspace = true
-rand.workspace = true
 rstest.workspace = true
 strum.workspace = true
 

chainstate/test-suite/Cargo.toml

@@ -32,7 +32,7 @@ use common::{
     primitives::{Id, Idable},
 };
 use logging::log;
-use rand::{seq::IteratorRandom as _, CryptoRng, Rng};
+use randomness::{seq::IteratorRandom as _, CryptoRng, Rng};
 use serialization::Encode as _;
 use test_utils::random::{gen_random_bytes, make_seedable_rng, Seed};