refactor(server): moved shared module crypto into arbiter-crypto

server/crates/arbiter-server/tests/client/auth.rs

@@ -1,3 +1,7 @@
+use arbiter_crypto::{
+    authn::{self, CLIENT_CONTEXT, format_challenge},
+    safecell::{SafeCell, SafeCellHandle as _},
+};
 use arbiter_proto::ClientMetadata;
 use arbiter_proto::transport::{Receiver, Sender};
 use arbiter_server::{
@@ -6,10 +10,8 @@ use arbiter_server::{
         client::{ClientConnection, ClientCredentials, auth, connect_client},
         keyholder::Bootstrap,
     },
-    crypto::authn,
     crypto::integrity,
     db::{self, schema},
-    safe_cell::{SafeCell, SafeCellHandle as _},
 };
 use diesel::{ExpressionMethods as _, NullableExpressionMethods as _, QueryDsl as _, insert_into};
 use diesel_async::RunQueryDsl;
@@ -72,9 +74,9 @@ fn sign_client_challenge(
     nonce: i32,
     pubkey: &authn::PublicKey,
 ) -> authn::Signature {
-    let challenge = arbiter_proto::format_challenge(nonce, &pubkey.to_bytes());
+    let challenge = format_challenge(nonce, &pubkey.to_bytes());
     key.signing_key()
-        .sign_deterministic(&challenge, arbiter_proto::CLIENT_CONTEXT)
+        .sign_deterministic(&challenge, CLIENT_CONTEXT)
         .unwrap()
         .into()
 }

server/crates/arbiter-server/tests/common/mod.rs

@@ -2,8 +2,9 @@ use arbiter_proto::transport::{Bi, Error, Receiver, Sender};
 use arbiter_server::{
     actors::keyholder::KeyHolder,
     db::{self, schema},
-    safe_cell::{SafeCell, SafeCellHandle as _},
 };
+use arbiter_crypto::{authn::{self, format_challenge, CLIENT_CONTEXT}, safecell::{SafeCell, SafeCellHandle as _}};
+
 use async_trait::async_trait;
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;

server/crates/arbiter-server/tests/keyholder/concurrency.rs

@@ -3,8 +3,10 @@ use std::collections::{HashMap, HashSet};
 use arbiter_server::{
     actors::keyholder::{CreateNew, Error, KeyHolder},
     db::{self, models, schema},
-    safe_cell::{SafeCell, SafeCellHandle as _},
+   
 };
+use arbiter_crypto::{authn::{self, format_challenge, CLIENT_CONTEXT}, safecell::{SafeCell, SafeCellHandle as _}};
+
 use diesel::{ExpressionMethods as _, QueryDsl, SelectableHelper, dsl::sql_query};
 use diesel_async::RunQueryDsl;
 use kameo::actor::{ActorRef, Spawn as _};

server/crates/arbiter-server/tests/keyholder/lifecycle.rs

@@ -2,8 +2,9 @@ use arbiter_server::{
     actors::keyholder::{Error, KeyHolder},
     crypto::encryption::v1::{Nonce, ROOT_KEY_TAG},
     db::{self, models, schema},
-    safe_cell::{SafeCell, SafeCellHandle as _},
 };
+use arbiter_crypto::{authn::{self, format_challenge, CLIENT_CONTEXT}, safecell::{SafeCell, SafeCellHandle as _}};
+
 use diesel::{QueryDsl, SelectableHelper};
 use diesel_async::RunQueryDsl;
 

server/crates/arbiter-server/tests/keyholder/storage.rs

@@ -4,8 +4,10 @@ use arbiter_server::{
     actors::keyholder::Error,
     crypto::encryption::v1::Nonce,
     db::{self, models, schema},
-    safe_cell::{SafeCell, SafeCellHandle as _},
+    
 };
+use arbiter_crypto::{authn::{self, format_challenge, CLIENT_CONTEXT}, safecell::{SafeCell, SafeCellHandle as _}};
+
 use diesel::{ExpressionMethods as _, QueryDsl, SelectableHelper, dsl::update};
 use diesel_async::RunQueryDsl;
 

server/crates/arbiter-server/tests/user_agent/auth.rs

@@ -1,3 +1,5 @@
+use arbiter_crypto::{authn::{self, format_challenge, USERAGENT_CONTEXT}, safecell::{SafeCell, SafeCellHandle as _}};
+
 use arbiter_proto::transport::{Receiver, Sender};
 use arbiter_server::{
     actors::{
@@ -6,10 +8,8 @@ use arbiter_server::{
         keyholder::Bootstrap,
         user_agent::{UserAgentConnection, UserAgentCredentials, auth},
     },
-    crypto::authn,
     crypto::integrity,
     db::{self, schema},
-    safe_cell::{SafeCell, SafeCellHandle as _},
 };
 use diesel::{ExpressionMethods as _, QueryDsl, insert_into};
 use diesel_async::RunQueryDsl;
@@ -22,9 +22,9 @@ fn sign_useragent_challenge(
     nonce: i32,
     pubkey_bytes: &[u8],
 ) -> authn::Signature {
-    let challenge = arbiter_proto::format_challenge(nonce, pubkey_bytes);
+    let challenge = format_challenge(nonce, pubkey_bytes);
     key.signing_key()
-        .sign_deterministic(&challenge, arbiter_proto::USERAGENT_CONTEXT)
+        .sign_deterministic(&challenge, USERAGENT_CONTEXT)
         .unwrap()
         .into()
 }

server/crates/arbiter-server/tests/user_agent/unseal.rs

@@ -8,8 +8,10 @@ use arbiter_server::{
         },
     },
     db,
-    safe_cell::{SafeCell, SafeCellHandle as _},
+   
 };
+use arbiter_crypto::{authn::{self, format_challenge, CLIENT_CONTEXT}, safecell::{SafeCell, SafeCellHandle as _}};
+
 use chacha20poly1305::{AeadInPlace, XChaCha20Poly1305, XNonce, aead::KeyInit};
 use diesel::{ExpressionMethods as _, QueryDsl as _, insert_into};
 use diesel_async::RunQueryDsl;