From 3d741acefb5bf33f8c8d0ed9bd9ffe6581cfa6e9 Mon Sep 17 00:00:00 2001
From: dave <futurechimp@users.noreply.github.com>
Date: Thu, 14 May 2026 14:25:20 +0000
Subject: [PATCH] huskies: merge 1043

---
 Cargo.lock                                | 4 ++--
 Cargo.toml                                | 2 +-
 crates/bft-json-crdt/src/keypair.rs       | 2 +-
 crates/bft-json-crdt/tests/commutative.rs | 2 +-
 server/src/node_identity.rs               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 963b4257..61f75cb6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -317,7 +317,7 @@ dependencies = [
  "criterion",
  "ed25519-dalek",
  "indexmap 2.14.0",
- "rand 0.9.4",
+ "rand 0.10.1",
  "random_color",
  "serde",
  "serde_json",
@@ -1938,7 +1938,7 @@ dependencies = [
  "poem",
  "portable-pty",
  "pulldown-cmark",
- "rand 0.9.4",
+ "rand 0.10.1",
  "regex",
  "reqwest",
  "rust-embed",
diff --git a/Cargo.toml b/Cargo.toml
index 531bad11..2835339b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ reqwest = { version = "0.13.3", features = ["json", "stream"] }
 rust-embed = "8"
 ed25519-dalek = { version = "2", default-features = false, features = ["rand_core"] }
 indexmap = { version = "2.14.0", features = ["serde"] }
-rand = "0.9"
+rand = "0.10"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_urlencoded = "0.7"
diff --git a/crates/bft-json-crdt/src/keypair.rs b/crates/bft-json-crdt/src/keypair.rs
index 23094f78..7a52d857 100644
--- a/crates/bft-json-crdt/src/keypair.rs
+++ b/crates/bft-json-crdt/src/keypair.rs
@@ -53,7 +53,7 @@ pub fn sha256(input: String) -> [u8; 32] {
 
 /// Generate a random Ed25519 keypair from OS rng
 pub fn make_keypair() -> Ed25519KeyPair {
-    use rand::RngCore as _;
+    use rand::Rng as _;
     let mut seed = [0u8; 32];
     rand::rng().fill_bytes(&mut seed);
     Ed25519KeyPair::from_bytes(&seed)
diff --git a/crates/bft-json-crdt/tests/commutative.rs b/crates/bft-json-crdt/tests/commutative.rs
index a698da09..a6c648d8 100644
--- a/crates/bft-json-crdt/tests/commutative.rs
+++ b/crates/bft-json-crdt/tests/commutative.rs
@@ -7,7 +7,7 @@ use bft_json_crdt::{
 };
 use rand::{
     seq::{IndexedRandom, SliceRandom},
-    Rng,
+    Rng, RngExt,
 };
 
 fn random_op<T: CrdtNode>(arr: &[Op<T>], rng: &mut impl Rng) -> OpId {
diff --git a/server/src/node_identity.rs b/server/src/node_identity.rs
index c02f4347..5ed0ea34 100644
--- a/server/src/node_identity.rs
+++ b/server/src/node_identity.rs
@@ -41,7 +41,7 @@
 //!    `verify_challenge` primitive but leaves the allow-list to story 480.
 
 use bft_json_crdt::keypair::{Ed25519KeyPair, Ed25519Signature, sign};
-use rand::RngCore;
+use rand::Rng;
 use std::sync::OnceLock;
 
 // ── Types ─────────────────────────────────────────────────────────────