fix api changes

Author: mangas

Cargo.lock

@@ -94,6 +94,7 @@ wasmtime = "15.0.1"
 substreams = "=0.6.0"
 substreams-entity-change = "2"
 substreams-near-core = "=0.10.2"
+rand = { version = "0.9.1", features = ["os_rng"] }
 
 # Incremental compilation on Rust 1.58 causes an ICE on build. As soon as graph node builds again, these can be removed.
 [profile.test]

Cargo.toml

@@ -196,11 +196,9 @@ impl EthereumNetworkAdapters {
         required_capabilities: &NodeCapabilities,
         retest_percent: f64,
     ) -> Result<Arc<EthereumAdapter>, Error> {
-        let retest_rng: f64 = (&mut rand::thread_rng()).gen();
+        let retest_rng: f64 = (&mut rand::rng()).random();
 
-        let cheapest = input
-            .into_iter()
-            .choose_multiple(&mut rand::thread_rng(), 3);
+        let cheapest = input.into_iter().choose_multiple(&mut rand::rng(), 3);
         let cheapest = cheapest.iter();
 
         // If request falls below the retest threshold, use this request to try and
@@ -231,7 +229,7 @@ impl EthereumNetworkAdapters {
         let cheapest = self.all_unverified_cheapest_with(required_capabilities);
 
         Self::cheapest_from(
-            cheapest.choose_multiple(&mut rand::thread_rng(), 3),
+            cheapest.choose_multiple(&mut rand::rng(), 3),
             required_capabilities,
             self.retest_percent,
         )
@@ -245,7 +243,7 @@ impl EthereumNetworkAdapters {
         let cheapest = self
             .all_cheapest_with(required_capabilities)
             .await
-            .choose_multiple(&mut rand::thread_rng(), 3);
+            .choose_multiple(&mut rand::rng(), 3);
 
         Self::cheapest_from(cheapest, required_capabilities, self.retest_percent)
     }

chain/ethereum/src/network.rs

@@ -12,7 +12,9 @@ atomic_refcell = "0.1.13"
 # We require this precise version of bigdecimal. Updating to later versions
 # has caused PoI differences; if you update this version, you will need to
 # make sure that it does not cause PoI changes
-old_bigdecimal = { version = "=0.1.2", features = ["serde"], package = "bigdecimal" }
+old_bigdecimal = { version = "=0.1.2", features = [
+    "serde",
+], package = "bigdecimal" }
 bytes = "1.0.1"
 bs58 = { workspace = true }
 cid = "0.11.1"
@@ -40,7 +42,7 @@ lazy_static = "1.5.0"
 num-bigint = { version = "=0.2.6", features = ["serde"] }
 num-integer = { version = "=0.1.46" }
 num-traits = "=0.2.19"
-rand = "0.9.0"
+rand.workspace = true
 regex = "1.5.4"
 semver = { version = "1.0.23", features = ["serde"] }
 serde = { workspace = true }
@@ -93,7 +95,8 @@ defer = "0.2"
 # Our fork contains patches to make some fields optional for Celo and Fantom compatibility.
 # Without the "arbitrary_precision" feature, we get the error `data did not match any variant of untagged enum Response`.
 web3 = { git = "https://github.com/graphprotocol/rust-web3", branch = "graph-patches-onto-0.18", features = [
-    "arbitrary_precision", "test"
+    "arbitrary_precision",
+    "test",
 ] }
 serde_plain = "1.0.2"
 csv = "1.3.0"

graph/Cargo.toml

@@ -1,7 +1,7 @@
 //! Utilities to keep moving statistics about queries
 
 use prometheus::core::GenericCounter;
-use rand::{prelude::Rng, thread_rng};
+use rand::{prelude::Rng, rng};
 use std::collections::{HashMap, HashSet};
 use std::iter::FromIterator;
 use std::sync::{Arc, RwLock};
@@ -439,7 +439,7 @@ impl LoadManager {
         // that cause at least 20% of the effort
         let kill_rate = self.update_kill_rate(shard, kill_rate, last_update, overloaded, wait_ms);
         let decline =
-            thread_rng().gen_bool((kill_rate * query_effort / total_effort).min(1.0).max(0.0));
+            rng().random_bool((kill_rate * query_effort / total_effort).min(1.0).max(0.0));
         if decline {
             if ENV_VARS.load_simulate {
                 debug!(self.logger, "Declining query";

graph/src/data/graphql/load_manager.rs

@@ -4,7 +4,9 @@ use anyhow::{anyhow, bail, Error};
 use chrono::{DateTime, Utc};
 use hex;
 use rand::rngs::OsRng;
-use rand::Rng;
+use rand::TryRngCore as _;
+// use rand::rngs::OsRng;
+// use rand::Rng;
 use std::collections::BTreeSet;
 use std::str::FromStr;
 use std::{fmt, fmt::Display};
@@ -272,11 +274,9 @@ impl_stable_hash!(SubgraphError {
 });
 
 pub fn generate_entity_id() -> String {
-    // Fast crypto RNG from operating system
-    let mut rng = OsRng::default();
-
     // 128 random bits
-    let id_bytes: [u8; 16] = rng.gen();
+    let mut id_bytes = [0u8; 16];
+    OsRng.try_fill_bytes(&mut id_bytes).unwrap();
 
     // 32 hex chars
     // Comparable to uuidv4, but without the hyphens,

graph/src/data/subgraph/schema.rs

@@ -51,7 +51,7 @@ impl ExponentialBackoff {
         if delay > self.ceiling {
             delay = self.ceiling;
         }
-        let jitter = rand::Rng::gen_range(&mut rand::thread_rng(), -self.jitter..=self.jitter);
+        let jitter = rand::Rng::random_range(&mut rand::rng(), -self.jitter..=self.jitter);
         delay.mul_f64(1.0 + jitter)
     }
 

graph/src/util/backoff.rs

@@ -10,7 +10,7 @@ graph = { path = "../../graph" }
 graph-chain-ethereum = { path = "../../chain/ethereum" }
 graph-runtime-derive = { path = "../derive" }
 graph-runtime-wasm = { path = "../wasm" }
-rand = "0.9.0"
+rand.workspace = true
 
 
 [dev-dependencies]

runtime/test/Cargo.toml

@@ -8,8 +8,8 @@ const WASM_FILE_NAME: &str = "test_padding.wasm";
 
 //for tests, to run in parallel, sub graph name has be unique
 fn rnd_sub_graph_name(size: usize) -> String {
-    use rand::{distributions::Alphanumeric, Rng};
-    rand::thread_rng()
+    use rand::{distr::Alphanumeric, Rng};
+    rand::rng()
         .sample_iter(&Alphanumeric)
         .take(size)
         .map(char::from)

runtime/test/src/test_padding.rs

@@ -23,7 +23,7 @@ maybe-owned = "0.3.4"
 postgres = "0.19.1"
 openssl = "0.10.72"
 postgres-openssl = "0.5.1"
-rand = "0.9.0"
+rand.workspace = true
 serde = { workspace = true }
 serde_json = { workspace = true }
 stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", branch = "old", package = "stable-hash" }