Merge branch '04-05-add_identity_update_builder' of github.com:xmtp/l…

…ibxmtp into 04-05-add_identity_update_builder

xmtp_id/src/associations/mod.rs

@@ -3,6 +3,7 @@ pub mod builder;
 mod hashes;
 mod member;
 mod signature;
+mod signer;
 mod state;
 #[cfg(test)]
 mod test_utils;

xmtp_id/src/associations/signer.rs

@@ -0,0 +1,35 @@
+use thiserror::Error;
+
+use super::{MemberIdentifier, Signature, SignatureKind};
+
+#[derive(Error, Debug)]
+pub enum SignerError {
+    #[error("Signature error {0}")]
+    Generic(String),
+}
+
+#[async_trait::async_trait]
+pub trait Signer: SignerClone {
+    fn signer_identity(&self) -> MemberIdentifier;
+    fn signature_kind(&self) -> SignatureKind;
+    fn sign(&self, text: &str) -> Result<Box<dyn Signature>, SignerError>;
+}
+
+pub trait SignerClone {
+    fn clone_box(&self) -> Box<dyn Signer>;
+}
+
+impl<T> SignerClone for T
+where
+    T: 'static + Signer + Clone,
+{
+    fn clone_box(&self) -> Box<dyn Signer> {
+        Box::new(self.clone())
+    }
+}
+
+impl Clone for Box<dyn Signer> {
+    fn clone(&self) -> Box<dyn Signer> {
+        self.clone_box()
+    }
+}

xmtp_id/src/associations/test_utils.rs

@@ -1,12 +1,6 @@
 use rand::{distributions::Alphanumeric, Rng};
 
-use super::{
-    // signer::{Signer, SignerClone, SignerError},
-    MemberIdentifier,
-    Signature,
-    SignatureError,
-    SignatureKind,
-};
+use super::{MemberIdentifier, Signature, SignatureError, SignatureKind};
 
 pub fn rand_string() -> String {
     let v: String = rand::thread_rng()
@@ -72,36 +66,3 @@ impl Signature for MockSignature {
         sig.as_bytes().to_vec()
     }
 }
-
-// #[derive(Clone)]
-// pub struct MockSigner {
-//     identity: MemberIdentifier,
-//     signature_kind: SignatureKind,
-// }
-
-// impl Signer for MockSigner {
-//     fn signature_kind(&self) -> SignatureKind {
-//         self.signature_kind.clone()
-//     }
-//     fn signer_identity(&self) -> MemberIdentifier {
-//         self.identity.clone()
-//     }
-
-//     fn sign(&self, text: &str) -> Result<Box<dyn Signature>, SignerError> {
-//         Ok(MockSignature::new_boxed(
-//             true,
-//             self.signer_identity(),
-//             self.signature_kind(),
-//             Some(text.to_string()),
-//         ))
-//     }
-// }
-
-// impl MockSigner {
-//     pub fn new_boxed(identity: MemberIdentifier, signature_kind: SignatureKind) -> Box<Self> {
-//         Box::new(Self {
-//             identity,
-//             signature_kind,
-//         })
-//     }
-// }