Stream/General improvements (#1041)

Cargo.toml

@@ -26,12 +26,12 @@ version = "0.0.1"
 anyhow = "1.0"
 async-stream = "0.3"
 async-trait = "0.1.77"
+trait-variant = "0.1.2"
 chrono = "0.4.38"
 ctor = "0.2"
 ed25519 = "2.2.3"
 ed25519-dalek = "2.1.1"
 ethers = "2.0.11"
-ethers-core = "2.0.4"
 futures = "0.3.30"
 futures-core = "0.3.30"
 getrandom = { version = "0.2", default-features = false }

bindings_ffi/Cargo.toml

@@ -43,7 +43,6 @@ path = "src/bin.rs"
 
 [dev-dependencies]
 ethers = "2.0.13"
-ethers-core = "2.0.13"
 tempfile = "3.5.0"
 tokio = { version = "1.28.1", features = ["full"] }
 tokio-test = "0.4"

bindings_ffi/src/mls.rs

@@ -961,7 +961,7 @@ impl FfiGroup {
             self.created_at_ns,
         );
         let message = group
-            .process_streamed_group_message(envelope_bytes, self.inner_client.clone())
+            .process_streamed_group_message(envelope_bytes, &self.inner_client)
             .await?;
         let ffi_message = message.into();
 
@@ -1576,11 +1576,11 @@ mod tests {
     };
 
     use super::{create_client, FfiMessage, FfiMessageCallback, FfiXmtpClient};
-    use ethers::utils::hex;
-    use ethers_core::rand::{
+    use ethers::core::rand::{
         self,
         distributions::{Alphanumeric, DistString},
     };
+    use ethers::utils::hex;
     use tokio::{sync::Notify, time::error::Elapsed};
     use xmtp_cryptography::{signature::RecoverableSignature, utils::rng};
     use xmtp_id::associations::generate_inbox_id;

bindings_ffi/src/v2.rs

@@ -591,7 +591,7 @@ mod tests {
         let msg = "TestVector1";
         let sig_hash = "19d6bec562518e365d07ba3cce26d08a5fffa2cbb1e7fe03c1f2d6a722fd3a5e544097b91f8f8cd11d43b032659f30529139ab1a9ecb6c81ed4a762179e87db81c";
 
-        let sig_bytes = ethers_core::utils::hex::decode(sig_hash).unwrap();
+        let sig_bytes = ethers::core::utils::hex::decode(sig_hash).unwrap();
         let recovered_addr = crate::v2::recover_address(sig_bytes, msg.to_string()).unwrap();
         assert_eq!(recovered_addr, addr.to_lowercase());
     }