cleanup rng usage

Author: dignifiedquire

iroh-base/src/key.rs

@@ -288,8 +288,7 @@ impl SecretKey {
     ///
     /// ```rust
     /// // use the OsRng option for OS depedndent most secure RNG.
-    /// use rand::{TryRngCore, rngs::OsRng};
-    /// let _key = iroh_base::SecretKey::generate(&mut OsRng.unwrap_err());
+    /// let _key = iroh_base::SecretKey::generate(&mut rand::rng());
     /// ```
     pub fn generate<R: CryptoRng + ?Sized>(csprng: &mut R) -> Self {
         let secret = SigningKey::generate(csprng);

iroh-dns-server/examples/publish.rs

@@ -11,7 +11,6 @@ use iroh::{
     node_info::{IROH_TXT_NAME, NodeIdExt, NodeInfo},
 };
 use n0_snafu::{Result, ResultExt};
-use rand::TryRngCore;
 use url::Url;
 
 const DEV_PKARR_RELAY_URL: &str = "http://localhost:8080/pkarr";
@@ -64,7 +63,7 @@ async fn main() -> Result<()> {
         Ok(s) => SecretKey::from_str(&s)
             .context("failed to parse IROH_SECRET environment variable as iroh secret key")?,
         Err(_) => {
-            let s = SecretKey::generate(&mut rand::rngs::OsRng.unwrap_err());
+            let s = SecretKey::generate(&mut rand::rng());
             println!("Generated a new node secret. To reuse, set");
             println!(
                 "\tIROH_SECRET={}",

iroh/src/key.rs

@@ -51,7 +51,7 @@ impl SharedSecret {
 
     /// Seals the provided cleartext.
     pub fn seal(&self, buffer: &mut dyn Buffer) {
-        let nonce = crypto_box::ChaChaBox::try_generate_nonce_with_rng(&mut rand::rngs::OsRng)
+        let nonce = crypto_box::ChaChaBox::try_generate_nonce_with_rng(&mut rand::rng())
             .expect("not enough randomness");
 
         self.0
@@ -94,7 +94,7 @@ mod tests {
 
     #[test]
     fn test_seal_open_roundtrip() {
-        let mut rng = rand::rng();
+        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(0u64);
         let key_a = iroh_base::SecretKey::generate(&mut rng);
         let key_b = iroh_base::SecretKey::generate(&mut rng);
 
@@ -123,7 +123,8 @@ mod tests {
 
     #[test]
     fn test_roundtrip_public_key() {
-        let key = crypto_box::SecretKey::generate(&mut rand::rng());
+        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(0u64);
+        let key = crypto_box::SecretKey::generate(&mut rng);
         let public_bytes = *key.public_key().as_bytes();
         let public_key_back = crypto_box::PublicKey::from(public_bytes);
         assert_eq!(key.public_key(), public_key_back);
@@ -141,7 +142,7 @@ mod tests {
 
     #[test]
     fn test_same_public_key_low_level() {
-        let mut rng = rand::rng();
+        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(0u64);
         let key = ed25519_dalek::SigningKey::generate(&mut rng);
         let public_key1 = {
             let m = key.verifying_key().to_montgomery();

iroh/src/magicsock.rs

@@ -2986,7 +2986,7 @@ mod tests {
 
             println!("-- [m2 changes] larger data");
             let mut data = vec![0u8; 10 * 1024];
-            rand::rng().fill_bytes(&mut data);
+            rng.fill_bytes(&mut data);
             run_roundtrip(m1.clone(), m2.clone(), &data, ExpectedLoss::YeahSure).await;
             run_roundtrip(m2.clone(), m1.clone(), &data, ExpectedLoss::YeahSure).await;
         }
@@ -2997,6 +2997,7 @@ mod tests {
         let m1_m2_network_change_guard = {
             let m1 = m1.clone();
             let m2 = m2.clone();
+            let mut rng = rng.clone();
             let task = tokio::spawn(async move {
                 println!("-- [m1] network change");
                 m1.endpoint.magic_sock().force_network_change(true).await;
@@ -3014,7 +3015,7 @@ mod tests {
 
             println!("-- [m1 & m2 changes] larger data");
             let mut data = vec![0u8; 10 * 1024];
-            rand::rng().fill_bytes(&mut data);
+            rng.fill_bytes(&mut data);
             run_roundtrip(m1.clone(), m2.clone(), &data, ExpectedLoss::YeahSure).await;
             run_roundtrip(m2.clone(), m1.clone(), &data, ExpectedLoss::YeahSure).await;
         }

iroh/src/magicsock/node_map.rs

@@ -744,7 +744,7 @@ mod tests {
     async fn restore_from_vec() {
         let node_map = NodeMap::default();
 
-        let mut rng = rand::rng();
+        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(0u64);
         let node_a = SecretKey::generate(&mut rng).public();
         let node_b = SecretKey::generate(&mut rng).public();
         let node_c = SecretKey::generate(&mut rng).public();