rebase

Author: expede

keyhive_core/benches/bench_cgka_propagation.rs

@@ -3,6 +3,7 @@
 mod bench_utils;
 
 use dupe::Dupe;
+use future_form::Sendable;
 use futures::lock::Mutex;
 use keyhive_core::{
     access::Access,
@@ -18,8 +19,8 @@ fn main() {
     divan::main();
 }
 
-type BenchMembered = Membered<MemorySigner, [u8; 32], NoListener>;
-type BenchAgent = Agent<MemorySigner, [u8; 32], NoListener>;
+type BenchMembered = Membered<Sendable, MemorySigner, [u8; 32], NoListener>;
+type BenchAgent = Agent<Sendable, MemorySigner, [u8; 32], NoListener>;
 
 /// Create a fresh peer keyhive, exchange contact cards with alice, and return
 /// the peer's agent as seen by alice.

keyhive_core/benches/bench_reverse_topsort.rs

@@ -6,6 +6,7 @@
 //! cargo bench --bench bench_reverse_topsort --features test_utils
 
 use dupe::Dupe;
+use future_form::Sendable;
 use futures::lock::Mutex;
 use keyhive_core::{
     access::Access,
@@ -33,9 +34,10 @@ fn reverse_topsort_via_toggle(bencher: divan::Bencher, prior_toggles: usize) {
         let sk = MemorySigner::generate(&mut csprng);
         let store = Arc::new(Mutex::new(MemoryCiphertextStore::<[u8; 32], Vec<u8>>::new()));
 
-        let kh = Keyhive::generate(sk.clone(), store.clone(), NoListener, rand::rngs::OsRng)
-            .await
-            .expect("keyhive generation should succeed");
+        let kh: Keyhive<Sendable, MemorySigner, [u8; 32], Vec<u8>, _, NoListener, _> =
+            Keyhive::generate(sk.clone(), store.clone(), NoListener, rand::rngs::OsRng)
+                .await
+                .expect("keyhive generation should succeed");
 
         kh.register_individual(Arc::new(Mutex::new(Public.individual())))
             .await;
@@ -47,7 +49,7 @@ fn reverse_topsort_via_toggle(bencher: divan::Bencher, prior_toggles: usize) {
 
         let doc_id = doc.lock().await.doc_id();
         let membered_doc = Membered::Document(doc_id, doc.dupe());
-        let public_agent: Agent<MemorySigner> = Public.individual().into();
+        let public_agent: Agent<Sendable, MemorySigner> = Public.individual().into();
         let public_id = Public.id();
 
         // Build up history of prior toggles

keyhive_core/benches/bench_utils.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use dupe::Dupe;
+use future_form::Sendable;
 use futures::lock::Mutex;
 use keyhive_core::{
     access::Access,
@@ -16,14 +17,15 @@ use keyhive_crypto::signer::memory::MemorySigner;
 use nonempty::nonempty;
 
 pub type BenchKeyhive = Keyhive<
+    Sendable,
     MemorySigner,
     [u8; 32],
     Vec<u8>,
     MemoryCiphertextStore<[u8; 32], Vec<u8>>,
     NoListener,
     rand::rngs::OsRng,
 >;
-pub type BenchAgent = Agent<MemorySigner, [u8; 32], NoListener>;
+pub type BenchAgent = Agent<Sendable, MemorySigner, [u8; 32], NoListener>;
 
 pub struct Scenario {
     pub keyhive: BenchKeyhive,