From d8b878a9744f0789ee4cc83d021ef6a434bcb4ff Mon Sep 17 00:00:00 2001
From: tuddman <tuddman@users.noreply.github.com>
Date: Mon, 8 Apr 2024 22:12:20 +0200
Subject: [PATCH 1/2] fix: fixes some clippy lints

---
 xmtp_api_grpc/src/auth_token.rs      | 3 +--
 xmtp_mls/src/groups/members.rs       | 3 +--
 xmtp_mls/src/groups/subscriptions.rs | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/xmtp_api_grpc/src/auth_token.rs b/xmtp_api_grpc/src/auth_token.rs
index af82e143e..b2eb43f6b 100644
--- a/xmtp_api_grpc/src/auth_token.rs
+++ b/xmtp_api_grpc/src/auth_token.rs
@@ -55,8 +55,7 @@ impl Authenticator {
         let mut token_bytes = Vec::new();
         let _ = token.encode(&mut token_bytes);
 
-        let token_base64 = base64::engine::general_purpose::STANDARD.encode(&token_bytes);
-        token_base64
+        base64::engine::general_purpose::STANDARD.encode(&token_bytes)
     }
 
     fn sign(&self, bytes_to_sign: &[u8]) -> Signature {
diff --git a/xmtp_mls/src/groups/members.rs b/xmtp_mls/src/groups/members.rs
index 6f80650c2..2610b2c3a 100644
--- a/xmtp_mls/src/groups/members.rs
+++ b/xmtp_mls/src/groups/members.rs
@@ -39,8 +39,7 @@ pub fn aggregate_member_list(openmls_group: &OpenMlsGroup) -> Result<Vec<GroupMe
         .members()
         .filter_map(|member| {
             let basic_credential = BasicCredential::try_from(&member.credential)
-                .ok()
-                .map(|basic_credential| (basic_credential))?;
+                .ok()?;
             Identity::get_validated_account_address(
                 basic_credential.identity(),
                 &member.signature_key,
diff --git a/xmtp_mls/src/groups/subscriptions.rs b/xmtp_mls/src/groups/subscriptions.rs
index 41122d3fa..918a24cd0 100644
--- a/xmtp_mls/src/groups/subscriptions.rs
+++ b/xmtp_mls/src/groups/subscriptions.rs
@@ -95,7 +95,6 @@ where
 mod tests {
     use prost::Message;
     use xmtp_cryptography::utils::generate_local_wallet;
-    use xmtp_proto::xmtp::mls::api::v1::GroupMessage;
 
     use crate::{builder::ClientBuilder, storage::group_message::GroupMessageKind};
     use futures::StreamExt;

From cd1bd25e8d603fd513295e00e9df9dd16b18f4c0 Mon Sep 17 00:00:00 2001
From: tuddman <tuddman@users.noreply.github.com>
Date: Mon, 8 Apr 2024 22:27:17 +0200
Subject: [PATCH 2/2] fix: fmt

---
 xmtp_mls/src/groups/members.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xmtp_mls/src/groups/members.rs b/xmtp_mls/src/groups/members.rs
index 2610b2c3a..1cc79cd92 100644
--- a/xmtp_mls/src/groups/members.rs
+++ b/xmtp_mls/src/groups/members.rs
@@ -38,8 +38,7 @@ pub fn aggregate_member_list(openmls_group: &OpenMlsGroup) -> Result<Vec<GroupMe
     let member_map: HashMap<String, GroupMember> = openmls_group
         .members()
         .filter_map(|member| {
-            let basic_credential = BasicCredential::try_from(&member.credential)
-                .ok()?;
+            let basic_credential = BasicCredential::try_from(&member.credential).ok()?;
             Identity::get_validated_account_address(
                 basic_credential.identity(),
                 &member.signature_key,