huskies: merge 1043

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)

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 {