chor(deps)!: Upgrade dependency rand to v0.9

Prepare for rust edition 2024, where `gen` will be a language keyword.

Author: jan-ferdinand

twenty-first/Cargo.toml

@@ -44,8 +44,7 @@ lazy_static = "1.5.0"
 num-bigint = { version = "0.4", features = ["serde"] }
 num-traits = "0.2"
 phf = { version = "0.11", features = ["macros"] }
-rand = { version = "0.8", features = ["min_const_gen"] }
-rand_distr = "0.4"
+rand = "0.9"
 rayon = "1.10"
 serde = { version = "1.0", features = ["derive"] }
 serde-big-array = "0"

twenty-first/benches/merkle_tree_auth_structure_size.rs

@@ -84,7 +84,7 @@ fn auth_structure_len(c: &mut Criterion<AuthStructureEncodingLength>) {
                 let mut total_len = AuthStructureEncodingLength(0.0);
                 for _ in 0..iters {
                     let opened_indices = (0..num_opened_indices)
-                        .map(|_| rng.gen_range(0..num_leafs))
+                        .map(|_| rng.random_range(0..num_leafs))
                         .collect_vec();
                     let auth_structure = mt.authentication_structure(&opened_indices).unwrap();
                     let this_len = auth_structure.encode().len();

twenty-first/benches/merkle_tree_authenticate.rs

@@ -74,7 +74,7 @@ impl MerkleTreeSampler {
 
     fn indices_to_open(&mut self) -> Vec<usize> {
         (0..self.num_opened_indices)
-            .map(|_| self.rng.gen_range(0..self.num_leafs()))
+            .map(|_| self.rng.random_range(0..self.num_leafs()))
             .collect()
     }
 

twenty-first/src/amount/u32s.rs

@@ -12,9 +12,9 @@ use num_bigint::BigUint;
 use num_traits::ConstZero;
 use num_traits::One;
 use num_traits::Zero;
+use rand::distr::Distribution;
+use rand::distr::StandardUniform;
 use rand::Rng;
-use rand_distr::Distribution;
-use rand_distr::Standard;
 use serde_big_array;
 use serde_big_array::BigArray;
 use serde_derive::Deserialize;
@@ -304,9 +304,9 @@ impl<const N: usize> Sum for U32s<N> {
     }
 }
 
-impl<const N: usize> Distribution<U32s<N>> for Standard {
+impl<const N: usize> Distribution<U32s<N>> for StandardUniform {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> U32s<N> {
-        let values = rng.sample::<[u32; N], Standard>(Standard);
+        let values = rng.random();
         U32s { values }
     }
 }
@@ -386,7 +386,6 @@ impl<const N: usize> BFieldCodec for U32s<N> {
 #[cfg(test)]
 mod u32s_tests {
     use rand::random;
-    use rand::thread_rng;
     use rand::Rng;
     use rand::RngCore;
 
@@ -418,7 +417,7 @@ mod u32s_tests {
 
     #[test]
     fn u128_conversion_test() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         for _ in 0..100 {
             let a_as_u128: u128 = ((rng.next_u64() as u128) << 64) | rng.next_u64() as u128;
             let a: U32s<4> = a_as_u128.try_into().unwrap();
@@ -756,12 +755,12 @@ mod u32s_tests {
     fn get_bit_set_bit_pbt() {
         let outer_count = 100;
         let inner_count = 20;
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         let vals: Vec<U32s<4>> = random_elements(outer_count);
         for mut val in vals {
-            let bit_value: bool = rng.gen();
+            let bit_value: bool = rng.random();
             for _ in 0..inner_count {
-                let bit_index = rng.gen_range(0..4 * 32);
+                let bit_index = rng.random_range(0..4 * 32);
                 val.set_bit(bit_index, bit_value);
                 assert_eq!(bit_value, val.get_bit(bit_index));
             }

twenty-first/src/math/b_field_element.rs

@@ -21,9 +21,9 @@ use num_traits::ConstZero;
 use num_traits::One;
 use num_traits::Zero;
 use phf::phf_map;
+use rand::distr::Distribution;
+use rand::distr::StandardUniform;
 use rand::Rng;
-use rand_distr::Distribution;
-use rand_distr::Standard;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
@@ -643,9 +643,9 @@ impl CyclicGroupGenerator for BFieldElement {
     }
 }
 
-impl Distribution<BFieldElement> for Standard {
+impl Distribution<BFieldElement> for StandardUniform {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> BFieldElement {
-        BFieldElement::new(rng.gen_range(0..=BFieldElement::MAX))
+        BFieldElement::new(rng.random_range(0..=BFieldElement::MAX))
     }
 }
 
@@ -802,7 +802,6 @@ mod b_prime_field_element_test {
     use proptest::prelude::*;
     use proptest_arbitrary_interop::arb;
     use rand::random;
-    use rand::thread_rng;
     use test_strategy::proptest;
 
     use crate::math::b_field_element::*;
@@ -1314,8 +1313,8 @@ mod b_prime_field_element_test {
         let one = BFieldElement::ONE;
         assert_eq!(zero, zero.inverse_or_zero());
 
-        let mut rng = rand::thread_rng();
-        let elem: BFieldElement = rng.gen();
+        let mut rng = rand::rng();
+        let elem: BFieldElement = rng.random();
         if elem.is_zero() {
             assert_eq!(zero, elem.inverse_or_zero())
         } else {
@@ -1325,10 +1324,10 @@ mod b_prime_field_element_test {
 
     #[test]
     fn test_random_squares() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let p = BFieldElement::P;
         for _ in 0..100 {
-            let a = rng.gen_range(0..p);
+            let a = rng.random_range(0..p);
             let asq = (((a as u128) * (a as u128)) % (p as u128)) as u64;
             let b = BFieldElement::new(a);
             let bsq = BFieldElement::new(asq);
@@ -1353,9 +1352,9 @@ mod b_prime_field_element_test {
 
     #[test]
     fn test_random_raw() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         for _ in 0..100 {
-            let e: BFieldElement = rng.gen();
+            let e: BFieldElement = rng.random();
             let bytes = e.raw_bytes();
             let c = BFieldElement::from_raw_bytes(&bytes);
             assert_eq!(e, c);

twenty-first/src/math/digest.rs

@@ -8,9 +8,9 @@ use itertools::Itertools;
 use num_bigint::BigUint;
 use num_traits::ConstZero;
 use num_traits::Zero;
+use rand::distr::Distribution;
+use rand::distr::StandardUniform;
 use rand::Rng;
-use rand_distr::Distribution;
-use rand_distr::Standard;
 use serde::Deserialize;
 use serde::Deserializer;
 use serde::Serialize;
@@ -105,16 +105,9 @@ impl fmt::UpperHex for Digest {
     }
 }
 
-impl Distribution<Digest> for Standard {
+impl Distribution<Digest> for StandardUniform {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Digest {
-        // FIXME: impl Fill for [BFieldElement] to rng.fill() a [BFieldElement; Digest::LEN].
-        let elements = rng
-            .sample_iter(Standard)
-            .take(Digest::LEN)
-            .collect_vec()
-            .try_into()
-            .unwrap();
-        Digest::new(elements)
+        Digest::new(rng.random())
     }
 }
 

twenty-first/src/math/lattice.rs

@@ -818,7 +818,6 @@ mod lattice_test {
     use num_traits::ConstOne;
     use num_traits::Zero;
     use rand::random;
-    use rand::thread_rng;
     use rand::RngCore;
     use sha3::Digest as Sha3Digest;
     use sha3::Sha3_256;
@@ -875,7 +874,7 @@ mod lattice_test {
 
     #[test]
     fn test_embedding() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let msg: [u8; 32] = (0..32)
             .map(|_| (rng.next_u32() % 256) as u8)
             .collect_vec()
@@ -889,7 +888,7 @@ mod lattice_test {
 
     #[test]
     fn test_module_distributivity() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let randomness = (0..(2 * 3 + 2 * 3 + 3) * 64 * 9)
             .map(|_| (rng.next_u32() % 256) as u8)
             .collect_vec();
@@ -912,7 +911,7 @@ mod lattice_test {
 
     #[test]
     fn test_module_multiply() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let randomness = (0..(2 * 3 + 2 * 3 + 3) * 64 * 9)
             .map(|_| (rng.next_u32() % 256) as u8)
             .collect_vec();
@@ -931,7 +930,7 @@ mod lattice_test {
 
     #[test]
     fn test_kem() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let mut key_randomness: [u8; 32] = [0u8; 32];
         rng.fill_bytes(&mut key_randomness);
         let mut ctxt_randomness: [u8; 32] = [0u8; 32];
@@ -978,7 +977,7 @@ mod lattice_test {
     fn serialization_deserialization_test() {
         // This is tested here since the serialization for these objects is a bit more complicated
         // than the standard serde stuff. So to be sure that it works, we just run this test here.
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let mut key_randomness: [u8; 32] = [0u8; 32];
         rng.fill_bytes(&mut key_randomness);
         let mut ctxt_randomness: [u8; 32] = [0u8; 32];

twenty-first/src/math/mds.rs

@@ -498,14 +498,13 @@ pub fn generated_function(input: &[u64]) -> [u64; 16] {
 #[cfg(test)]
 mod tests {
     use itertools::Itertools;
-    use rand::thread_rng;
     use rand::RngCore;
 
     use super::*;
 
     #[test]
     fn test_karatsuba() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let n = 8;
         let a = (0..n)
             .map(|_| (rng.next_u32() % (1 << 20)) as u64)
@@ -525,7 +524,7 @@ mod tests {
 
     #[test]
     fn test_negacyclic_mul() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let n = 8;
         let a = (0..n)
             .map(|_| (rng.next_u32() % (1 << 20)) as u64)
@@ -548,7 +547,7 @@ mod tests {
 
     #[test]
     fn test_recursive_cyclic_mul() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let n = 16;
         let a = (0..n).map(|_| rng.next_u32() as u64).collect_vec();
         let b = (0..n)

twenty-first/src/math/other.rs

@@ -1,8 +1,8 @@
-use rand::distributions::Distribution;
-use rand::distributions::Standard;
+use rand::distr::Distribution;
+use rand::distr::StandardUniform;
 use rand::Rng;
 
-/// Generate `n` random elements using [`rand::thread_rng()`].
+/// Generate `n` random elements using [`rand::rng()`].
 ///
 /// For example implementations of the [`Distribution`] trait for [`Standard`], see
 /// [`BFieldElement`][bfe] or [`XFieldElement`][xfe].
@@ -11,7 +11,7 @@ use rand::Rng;
 /// [xfe]: crate::prelude::XFieldElement
 pub fn random_elements<T>(n: usize) -> Vec<T>
 where
-    Standard: Distribution<T>,
+    StandardUniform: Distribution<T>,
 {
-    rand::thread_rng().sample_iter(Standard).take(n).collect()
+    rand::rng().sample_iter(StandardUniform).take(n).collect()
 }

twenty-first/src/math/tip5.rs

@@ -706,7 +706,6 @@ pub(crate) mod tip5_tests {
     use prop::sample::size_range;
     use proptest::prelude::*;
     use proptest_arbitrary_interop::arb;
-    use rand::thread_rng;
     use rand::Rng;
     use rand::RngCore;
     use rayon::prelude::IntoParallelIterator;
@@ -720,8 +719,8 @@ pub(crate) mod tip5_tests {
     impl Tip5 {
         pub(crate) fn randomly_seeded() -> Self {
             let mut sponge = Self::init();
-            let mut rng = thread_rng();
-            sponge.absorb(rng.gen());
+            let mut rng = rand::rng();
+            sponge.absorb(rng.random());
             sponge
         }
     }
@@ -1061,7 +1060,7 @@ pub(crate) mod tip5_tests {
 
     #[test]
     fn test_complex_product() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let mut random_small_i64 = || (rng.next_u32() % (1 << 16)) as i64;
         for _ in 0..1000 {
             let f = (random_small_i64(), random_small_i64());
@@ -1088,9 +1087,9 @@ pub(crate) mod tip5_tests {
 
     #[test]
     fn test_mds_agree() {
-        let mut rng = thread_rng();
+        let mut rng = rand::rng();
         let initial_state: [BFieldElement; STATE_SIZE] = (0..STATE_SIZE)
-            .map(|_| BFieldElement::new(rng.gen_range(0..10)))
+            .map(|_| BFieldElement::new(rng.random_range(0..10)))
             .collect_vec()
             .try_into()
             .unwrap();