use signer trait

crates/community/src/rekey.rs

@@ -12,7 +12,6 @@ use concord::derive::{GroupKey, channel_rekey_group_key, epoch_key_commitment};
 use concord::state::{CommunityState, HeldKey};
 use concord::{ChannelId, CommunityId, Epoch};
 use nostr_sdk::prelude::*;
-use state::UniversalSigner;
 
 use crate::sync::{self, PlaneKind};
 
@@ -175,13 +174,16 @@ pub struct ChannelAdoption {
 }
 
 /// Read every rekey wrap the local database holds and adopt what is admissible.
-pub async fn adopt(
+pub async fn adopt<S>(
     client: &Client,
     state: &CommunityState,
     roles: &CommunityRoles,
-    signer: &UniversalSigner,
+    signer: &S,
     me: PublicKey,
-) -> Result<Adoptions> {
+) -> Result<Adoptions>
+where
+    S: AsyncNip44 + ?Sized,
+{
     let watches = watches(state)?;
 
     let mut authors: BTreeSet<PublicKey> = BTreeSet::new();
@@ -362,15 +364,18 @@ impl Rewrite {
 
 /// Publish this client's own rotation of one scope to its next epoch.
 #[allow(clippy::too_many_arguments)]
-pub async fn rotate(
+pub async fn rotate<S>(
     client: &Client,
     state: &CommunityState,
     roles: &CommunityRoles,
-    signer: &UniversalSigner,
+    signer: &S,
     me: PublicKey,
     rewrite: &Rewrite,
     at: Timestamp,
-) -> Result<Epoch> {
+) -> Result<Epoch>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+{
     if rewrite.excluded.contains(&me) {
         bail!("a rotation cannot cut off the member who publishes it");
     }
@@ -611,18 +616,21 @@ struct Delivery {
 
 /// Walk a scope's rotations forward, one epoch at a time, off the key held.
 #[allow(clippy::too_many_arguments)]
-async fn walk(
+async fn walk<S>(
     scope: RekeyScope,
     permissions: &[u64],
     mut held_epoch: Epoch,
     mut held_key: [u8; 32],
     state: &CommunityState,
     roles: &CommunityRoles,
-    signer: &UniversalSigner,
+    signer: &S,
     me: PublicKey,
     rotations: &[Rotation],
     published: &BTreeMap<RotationKey, u64>,
-) -> Result<Step> {
+) -> Result<Step>
+where
+    S: AsyncNip44 + ?Sized,
+{
     let mut step = Step::default();
     let mut stepped: Vec<HeldKey> = Vec::new();
     let ceiling = held_epoch.0 + REKEY_LOOKAHEAD;
@@ -794,6 +802,7 @@ mod tests {
     };
     use concord::state::{ChannelKeyRef, HeldRoot};
     use nostr_memory::MemoryDatabase;
+    use state::UniversalSigner;
 
     use super::*;
 

crates/community/src/sync.rs

@@ -14,7 +14,6 @@ use concord::state::{CommunityState, HeldKey, HeldRoot, list_entry};
 use concord::{ChannelId, CommunityId, Epoch, GroupKey, decode_hex_32};
 use gpui::AsyncApp;
 use nostr_sdk::prelude::*;
-use state::UniversalSigner;
 
 use crate::cache::{self, Observed};
 use crate::history::{CURSOR_OVERLAP, Window};
@@ -348,11 +347,10 @@ pub async fn subscribe_list(client: &Client, self_pk: PublicKey) -> Result<()> {
 ///
 /// A held membership is dropped only when the List carries a tombstone at least
 /// as new as it, because absence from the List is never a fact (§8).
-pub async fn load(
-    client: &Client,
-    signer: &UniversalSigner,
-    self_pk: PublicKey,
-) -> Result<Vec<CommunityState>> {
+pub async fn load<S>(client: &Client, signer: &S, self_pk: PublicKey) -> Result<Vec<CommunityState>>
+where
+    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
+{
     let list = match load_list(client, signer, self_pk).await? {
         Some(list) => list,
         None => return cache::load_states(client).await,
@@ -735,6 +733,7 @@ mod tests {
     use std::time::Duration;
 
     use nostr_memory::MemoryDatabase;
+    use state::UniversalSigner;
 
     use super::*;