huskies: merge 826

crates/bft-json-crdt/Cargo.toml

@@ -16,18 +16,17 @@ bft = []
 [dependencies]
 bft-crdt-derive = { path = "bft-crdt-derive" }
 colored = "2.0.0"
-fastcrypto = "0.1.8"
+fastcrypto = "0.1.9"
 indexmap = { version = "2.2.6", features = ["serde"] }
-rand = "0.8.5"
+rand = "0.8"
 random_color = "0.6.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0.85", features = ["preserve_order"] }
-serde_with = "3.8.1"
+serde_with = "3.18"
 sha2 = "0.10.6"
 
 [dev-dependencies]
-criterion = { version = "0.4", features = ["html_reports"] }
-time = "0.1"
+criterion = { version = "0.5", features = ["html_reports"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0.85", features = ["preserve_order"] }
 

crates/bft-json-crdt/bft-crdt-derive/Cargo.toml

@@ -10,6 +10,6 @@ proc-macro = true
 [dependencies]
 indexmap = { version = "2.2.6", features = ["serde"] }
 proc-macro2 = "1.0.47"
-proc-macro-crate = "1.2.1"
+proc-macro-crate = "3"
 quote = "1.0.21"
-syn = { version = "1.0.103", features = ["full"] }
+syn = { version = "2", features = ["full"] }

crates/bft-json-crdt/tests/kleppmann_trace.rs

@@ -1,8 +1,9 @@
+//! Integration tests that replay the Kleppmann editing trace to validate list-CRDT correctness and performance.
+
 use bft_json_crdt::keypair::make_author;
 use bft_json_crdt::list_crdt::ListCrdt;
 use bft_json_crdt::op::{OpId, ROOT_ID};
-use std::{fs::File, io::Read};
-use time::PreciseTime;
+use std::{fs::File, io::Read, time::Instant};
 
 use serde::Deserialize;
 
@@ -47,7 +48,7 @@ fn test_editing_trace() {
     let mut list = ListCrdt::<char>::new(make_author(1), vec![]);
     let mut ops: Vec<OpId> = Vec::new();
     ops.push(ROOT_ID);
-    let start = PreciseTime::now();
+    let start = Instant::now();
     let edits = t.edits;
     for (i, op) in edits.into_iter().enumerate() {
         let origin = ops[op.pos];
@@ -61,17 +62,13 @@ fn test_editing_trace() {
 
         match i {
             10_000 | 100_000 => {
-                let end = PreciseTime::now();
-                let runtime_sec = start.to(end);
-                println!("took {runtime_sec:?} to run {i} ops");
+                println!("took {:?} to run {i} ops", start.elapsed());
             }
             _ => {}
         };
     }
 
-    let end = PreciseTime::now();
-    let runtime_sec = start.to(end);
-    println!("took {runtime_sec:?} to finish");
+    println!("took {:?} to finish", start.elapsed());
     let result = list.iter().collect::<String>();
     let expected = t.final_text;
     assert_eq!(result.len(), expected.len());