All of the sendables

Author: expede

keyhive_core/src/event.rs

@@ -58,7 +58,7 @@ impl<F: FutureForm, S: AsyncSigner<F>, T: ContentRef, L: MembershipListener<F, S
 {
     #[allow(clippy::type_complexity)]
     #[instrument(level = "debug", skip(ciphertext_store))]
-    pub async fn now_decryptable<P, C: CiphertextStore<T, P>>(
+    pub async fn now_decryptable<P, C: CiphertextStore<F, T, P>>(
         new_events: &[Event<F, S, T, L>],
         ciphertext_store: &C,
     ) -> Result<HashMap<DocumentId, Vec<Arc<EncryptedContent<P, T>>>>, C::GetCiphertextError> {

keyhive_core/src/invocation.rs

@@ -11,6 +11,7 @@ use keyhive_crypto::{
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
+#[allow(clippy::type_complexity)]
 #[derive(Debug, PartialEq, Eq, Hash)]
 #[derive_where(Clone; T)]
 pub struct Invocation<

keyhive_core/src/keyhive.rs

@@ -40,7 +40,10 @@ use crate::{
     },
     stats::Stats,
     store::{
-        ciphertext::{memory::MemoryCiphertextStore, CausalDecryptionState, CiphertextStore},
+        ciphertext::{
+            memory::MemoryCiphertextStore, CausalDecryptionState, CiphertextStore,
+            CiphertextStoreExt,
+        },
         delegation::DelegationStore,
         revocation::RevocationStore,
     },
@@ -82,7 +85,7 @@ pub struct Keyhive<
     S: AsyncSigner<F> + Clone,
     T: ContentRef = [u8; 32],
     P: for<'de> Deserialize<'de> = Vec<u8>,
-    C: CiphertextStore<T, P> + Clone = MemoryCiphertextStore<T, P>,
+    C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P> + Clone = MemoryCiphertextStore<T, P>,
     L: MembershipListener<F, S, T> = NoListener,
     R: rand::CryptoRng = rand::rngs::OsRng,
 > {
@@ -129,7 +132,7 @@ impl<
         S: AsyncSigner<F> + Clone,
         T: ContentRef,
         P: for<'de> Deserialize<'de>,
-        C: CiphertextStore<T, P> + Clone,
+        C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P> + Clone,
         L: MembershipListener<F, S, T>,
         R: rand::CryptoRng + rand::RngCore,
     > Keyhive<F, S, T, P, C, L, R>
@@ -529,7 +532,7 @@ impl<
         &self,
         doc: Arc<Mutex<Document<F, S, T, L>>>,
         encrypted: &EncryptedContent<P, T>,
-    ) -> Result<CausalDecryptionState<T, P>, DocCausalDecryptionError<T, P, C>>
+    ) -> Result<CausalDecryptionState<T, P>, DocCausalDecryptionError<F, T, P, C>>
     where
         T: for<'de> Deserialize<'de>,
         P: Serialize + Clone,
@@ -562,6 +565,7 @@ impl<
     }
 
     #[instrument(skip_all)]
+    #[allow(clippy::type_complexity)]
     pub async fn reachable_members(
         &self,
         membered: Membered<F, S, T, L>,
@@ -597,6 +601,7 @@ impl<
         caps
     }
 
+    #[allow(clippy::type_complexity)]
     #[instrument(skip_all)]
     pub async fn membered_reachable_by_agent(
         &self,
@@ -1181,6 +1186,7 @@ impl<
         None
     }
 
+    #[allow(clippy::type_complexity)]
     #[instrument(skip_all)]
     pub async fn static_event_to_event(
         &self,
@@ -1209,6 +1215,7 @@ impl<
         }
     }
 
+    #[allow(clippy::type_complexity)]
     #[instrument(skip_all)]
     async fn static_delegation_to_delegation(
         &self,
@@ -2210,7 +2217,7 @@ impl<
         S: AsyncSigner<F> + Clone,
         T: ContentRef + Debug,
         P: for<'de> Deserialize<'de>,
-        C: CiphertextStore<T, P> + Clone,
+        C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P> + Clone,
         L: MembershipListener<F, S, T>,
         R: rand::CryptoRng + rand::RngCore,
     > Debug for Keyhive<F, S, T, P, C, L, R>
@@ -2234,7 +2241,7 @@ impl<
         S: AsyncSigner<F> + Clone,
         T: ContentRef + Clone,
         P: for<'de> Deserialize<'de> + Clone,
-        C: CiphertextStore<T, P> + Clone,
+        C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P> + Clone,
         L: MembershipListener<F, S, T>,
         R: rand::CryptoRng + rand::RngCore + Clone,
     > ForkAsync for Keyhive<F, S, T, P, C, L, R>
@@ -2263,7 +2270,7 @@ impl<
         S: AsyncSigner<F> + Clone,
         T: ContentRef + Clone,
         P: for<'de> Deserialize<'de> + Clone,
-        C: CiphertextStore<T, P> + Clone,
+        C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P> + Clone,
         L: MembershipListener<F, S, T>,
         R: rand::CryptoRng + rand::RngCore + Clone,
     > MergeAsync for Arc<Mutex<Keyhive<F, S, T, P, C, L, R>>>
@@ -2315,7 +2322,7 @@ impl<
         S: AsyncSigner<F> + Clone,
         T: ContentRef,
         P: for<'de> Deserialize<'de>,
-        C: CiphertextStore<T, P> + Clone,
+        C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P> + Clone,
         L: MembershipListener<F, S, T>,
         R: rand::CryptoRng + rand::RngCore,
     > Verifiable for Keyhive<F, S, T, P, C, L, R>

keyhive_core/src/lib.rs

@@ -8,6 +8,7 @@
     nonstandard_style
 )]
 #![deny(unreachable_pub)]
+#![allow(clippy::type_complexity)]
 
 pub mod ability;
 pub mod access;

keyhive_core/src/principal/document.rs

@@ -20,7 +20,10 @@ use crate::{
         identifier::Identifier,
     },
     store::{
-        ciphertext::{CausalDecryptionError, CausalDecryptionState, CiphertextStore, ErrorReason},
+        ciphertext::{
+            CausalDecryptionError, CausalDecryptionState, CiphertextStore, CiphertextStoreExt,
+            ErrorReason,
+        },
         delegation::DelegationStore,
         revocation::RevocationStore,
     },
@@ -499,13 +502,13 @@ impl<F: FutureForm, S: AsyncSigner<F>, T: ContentRef, L: MembershipListener<F, S
 
     #[instrument(skip_all)]
     pub async fn try_causal_decrypt_content<
-        C: CiphertextStore<T, P>,
+        C: CiphertextStore<F, T, P> + CiphertextStoreExt<F, T, P>,
         P: for<'de> Deserialize<'de> + Serialize + Clone,
     >(
         &mut self,
         encrypted_content: &EncryptedContent<P, T>,
         store: C,
-    ) -> Result<CausalDecryptionState<T, P>, DocCausalDecryptionError<T, P, C>>
+    ) -> Result<CausalDecryptionState<T, P>, DocCausalDecryptionError<F, T, P, C>>
     where
         T: for<'de> Deserialize<'de>,
     {
@@ -516,7 +519,7 @@ impl<F: FutureForm, S: AsyncSigner<F>, T: ContentRef, L: MembershipListener<F, S
         let entrypoint_envelope: Envelope<T, Vec<u8>> = bincode::deserialize(
             raw_entrypoint.as_slice(),
         )
-        .map_err(|e| CausalDecryptionError::<T, P, C> {
+        .map_err(|e| CausalDecryptionError::<F, T, P, C> {
             progress: acc.clone(),
             cannot: HashMap::from_iter([(
                 encrypted_content.content_ref.clone(),
@@ -682,9 +685,9 @@ pub enum GenerateDocError {
 }
 
 #[derive(Debug, Error)]
-pub enum DocCausalDecryptionError<T: ContentRef, P, C: CiphertextStore<T, P>> {
+pub enum DocCausalDecryptionError<F: FutureForm, T: ContentRef, P, C: CiphertextStore<F, T, P>> {
     #[error(transparent)]
-    CausalDecryptionError(#[from] CausalDecryptionError<T, P, C>),
+    CausalDecryptionError(#[from] CausalDecryptionError<F, T, P, C>),
 
     #[error("{0}")]
     GetCiphertextError(C::GetCiphertextError),

keyhive_core/src/principal/group.rs

@@ -74,14 +74,10 @@ use thiserror::Error;
 /// A collection of agents with no associated content.
 ///
 /// Groups are stateful agents. It is possible the delegate control over them,
-
 /// and they can be delegated to. This produces transitives lines of authority
-
 /// through the network of [`Agent`]s.
-
 #[derive(Clone, Derivative)]
 #[derive_where(Debug; T)]
-
 pub struct Group<
     F: FutureForm,
     S: AsyncSigner<F>,