rand

Author: taddes

Cargo.lock

@@ -62,7 +62,7 @@ log = { version = "0.4", features = [
     "release_max_level_info",
 ] }
 protobuf = "=2.25.2" # pin to 2.25.2 to prevent side updating
-rand = "0.8"
+rand = "0.10"
 regex = "1.12"
 reqwest = { version = "0.12", default-features = false, features = [
   "rustls-tls",

Cargo.toml

@@ -15,7 +15,6 @@ use hawk::{self, Credentials, Key, RequestBuilder};
 use hmac::{Hmac, Mac};
 use http::StatusCode;
 use lazy_static::lazy_static;
-use rand::{Rng, thread_rng};
 use serde::de::DeserializeOwned;
 use serde_json::{Value, json};
 use sha2::Sha256;
@@ -36,7 +35,7 @@ lazy_static! {
     static ref SERVER_LIMITS: Arc<ServerLimits> = Arc::new(ServerLimits::default());
     static ref SECRETS: Arc<Secrets> =
         Arc::new(Secrets::new("foo").expect("Could not get Secrets in server/test.rs"));
-    static ref RAND_UID: u32 = thread_rng().gen_range(0..10000);
+    static ref RAND_UID: u32 = rand::random_range(0..10000);
 }
 
 const TEST_HOST: &str = "localhost";

syncserver/src/server/test.rs

@@ -14,7 +14,6 @@ use glean::server_events::GleanEventsLogger;
 use hawk::{Credentials, Key, RequestBuilder};
 use hmac::{Hmac, Mac};
 use lazy_static::lazy_static;
-use rand::{Rng, thread_rng};
 use sha2::Sha256;
 use tokio::sync::RwLock;
 
@@ -29,7 +28,7 @@ use crate::{server::ServerState, web::auth::HawkPayload};
 lazy_static! {
     static ref SERVER_LIMITS: Arc<ServerLimits> = Arc::new(ServerLimits::default());
     pub static ref SECRETS: Arc<Secrets> = Arc::new(Secrets::new("Ted Koppel is a robot").unwrap());
-    pub static ref USER_ID: u64 = thread_rng().gen_range(0..10000);
+    pub static ref USER_ID: u64 = rand::random_range(0..10000);
     pub static ref USER_ID_STR: String = USER_ID.to_string();
 }
 

syncserver/src/web/extractors/test_utils.rs

@@ -1,8 +1,8 @@
 #![allow(clippy::cognitive_complexity)]
-use std::collections::HashMap;
-
 use lazy_static::lazy_static;
-use rand::{Rng, distributions::Alphanumeric, thread_rng};
+use rand::rng;
+use rand::{RngExt, distr::Alphanumeric};
+use std::collections::HashMap;
 use syncserver_settings::Settings;
 use syncstorage_db_common::{
     DEFAULT_BSO_TTL, Sorting, error::DbErrorIntrospect, params, util::SyncTimestamp,
@@ -17,7 +17,7 @@ use crate::{Db, DbError, tests::support::test_db};
 const MAX_TIMESTAMP: u64 = 4_070_937_600_000;
 
 lazy_static! {
-    static ref UID: u32 = thread_rng().gen_range(0..10000);
+    static ref UID: u32 = rng().random_range(0..10000);
 }
 
 #[tokio::test]
@@ -623,8 +623,8 @@ async fn get_collection_usage() -> Result<(), DbError> {
 
         for &coll in ["bookmarks", "history", "prefs"].iter() {
             for i in 0..5 {
-                let size = 50 + thread_rng().gen_range(0..100);
-                let payload = thread_rng()
+                let size = 50 + rng().random_range(0..100);
+                let payload = rng()
                     .sample_iter(&Alphanumeric)
                     .take(size)
                     .collect::<Vec<u8>>();
@@ -681,7 +681,7 @@ async fn test_quota() -> Result<(), DbError> {
         let coll = "bookmarks";
 
         let size = 5000;
-        let random = thread_rng()
+        let random = rng()
             .sample_iter(&Alphanumeric)
             .take(size)
             .collect::<Vec<u8>>();
@@ -714,10 +714,10 @@ async fn get_collection_counts() -> Result<(), DbError> {
     with_test_transaction(None, async |db: &mut dyn Db<Error = DbError>| {
         let uid = *UID;
         let mut expected = HashMap::new();
-        let mut rng = thread_rng();
+        let mut rng = rng();
 
         for &coll in ["bookmarks", "history", "prefs"].iter() {
-            let count = 5 + rng.gen_range(0..5);
+            let count = 5 + rng.random_range(0..5);
             expected.insert(coll.to_owned(), count);
             for i in 0..count {
                 db.put_bso(pbso(uid, coll, &format!("b{}", i), Some("x"), None, None))

syncstorage-db/src/tests/db.rs

@@ -5,7 +5,6 @@ use std::{
     time::{Duration, Instant},
 };
 
-use rand::{Rng, thread_rng};
 use serde::{Deserialize, Serialize};
 use syncserver_common::{self, MAX_SPANNER_LOAD_SIZE};
 
@@ -56,7 +55,7 @@ impl From<&Settings> for Deadman {
             // ttl w/ a 10% jitter results in a random final ttl between 60-66s
             let ttl = lbheartbeat_ttl as f32;
             let max_jitter = ttl * (settings.lbheartbeat_ttl_jitter as f32 * 0.01);
-            let ttl = thread_rng().gen_range(ttl..ttl + max_jitter);
+            let ttl = rand::random_range(ttl..ttl + max_jitter);
             Instant::now() + Duration::from_secs(ttl as u64)
         });
         Deadman {