huskies: merge 977

server/src/crdt_state/ops.rs

@@ -198,9 +198,8 @@ mod tests {
     use super::super::write::write_item_str;
     use super::*;
     use bft_json_crdt::json_crdt::OpState;
-    use bft_json_crdt::keypair::make_keypair;
+    use bft_json_crdt::keypair::{Ed25519KeyPair, make_keypair};
     use bft_json_crdt::op::ROOT_ID;
-    use fastcrypto::ed25519::Ed25519KeyPair;
     use serde_json::json;
 
     #[test]
@@ -438,8 +437,6 @@ mod tests {
 
     #[test]
     fn delta_sync_multi_author() {
-        use fastcrypto::traits::KeyPair;
-
         let kp_a = make_keypair();
         let kp_b = make_keypair();
         let mut crdt_a = BaseCrdt::<PipelineDoc>::new(&kp_a);
@@ -454,7 +451,7 @@ mod tests {
 
         // Peer has seen all of A's ops but none of B's.
         let mut peer_clock = VectorClock::new();
-        let author_a_hex = hex::encode(&kp_a.public().0.to_bytes());
+        let author_a_hex = hex::encode(&kp_a.verifying_key().to_bytes());
         peer_clock.insert(author_a_hex, 30);
 
         let delta = local_ops_since(&all_ops, &peer_clock);
@@ -468,14 +465,12 @@ mod tests {
 
     #[test]
     fn build_vector_clock_from_ops() {
-        use fastcrypto::traits::KeyPair;
-
         let kp = make_keypair();
         let mut crdt = BaseCrdt::<PipelineDoc>::new(&kp);
         let ops = make_ops(&kp, &mut crdt, 10, "631_vc");
 
         let clock = build_clock(&ops);
-        let author_hex = hex::encode(&kp.public().0.to_bytes());
+        let author_hex = hex::encode(&kp.verifying_key().to_bytes());
 
         assert_eq!(clock.len(), 1, "single author should produce 1 clock entry");
         assert_eq!(clock[&author_hex], 10, "clock should show 10 ops");

server/src/crdt_state/presence.rs

@@ -6,7 +6,6 @@ use super::read::read_item;
 use bft_json_crdt::json_crdt::*;
 use bft_json_crdt::lww_crdt::LwwRegisterCrdt;
 use bft_json_crdt::op::ROOT_ID;
-use fastcrypto::traits::{Signer, ToFromBytes};
 use serde_json::json;
 
 use super::state::{apply_and_persist, get_crdt, rebuild_node_index};

server/src/crdt_state/state/init.rs

@@ -10,9 +10,7 @@ use std::path::Path;
 use std::sync::Mutex;
 
 use bft_json_crdt::json_crdt::{BaseCrdt, CrdtNode, JsonValue, SignedOp};
-use bft_json_crdt::keypair::make_keypair;
-use fastcrypto::ed25519::Ed25519KeyPair;
-use fastcrypto::traits::ToFromBytes;
+use bft_json_crdt::keypair::{Ed25519KeyPair, make_keypair};
 use sqlx::SqlitePool;
 use sqlx::sqlite::SqliteConnectOptions;
 use tokio::sync::{broadcast, mpsc};
@@ -192,14 +190,14 @@ async fn load_or_create_keypair(pool: &SqlitePool) -> Result<Ed25519KeyPair, sql
 
     if let Some((seed,)) = row {
         // Reconstruct from stored seed.  The seed is the 32-byte private key.
-        if let Ok(kp) = Ed25519KeyPair::from_bytes(&seed) {
-            return Ok(kp);
+        if let Ok(arr) = TryInto::<[u8; 32]>::try_into(seed) {
+            return Ok(Ed25519KeyPair::from_bytes(&arr));
         }
         slog!("[crdt] Stored keypair invalid, regenerating");
     }
 
     let kp = make_keypair();
-    let seed = kp.as_bytes().to_vec();
+    let seed = kp.to_bytes().to_vec();
     sqlx::query("INSERT INTO crdt_node_identity (id, seed) VALUES (1, ?1) ON CONFLICT(id) DO UPDATE SET seed = excluded.seed")
         .bind(&seed)
         .execute(pool)

server/src/crdt_state/state/mod.rs

@@ -10,8 +10,7 @@ use std::collections::{HashMap, HashSet};
 use std::sync::{Mutex, OnceLock};
 
 use bft_json_crdt::json_crdt::{BaseCrdt, SignedOp};
-use bft_json_crdt::keypair::make_keypair;
-use fastcrypto::ed25519::Ed25519KeyPair;
+use bft_json_crdt::keypair::{Ed25519KeyPair, make_keypair};
 use tokio::sync::{broadcast, mpsc};
 
 use super::VectorClock;