cleanup

xmtp_mls/src/client.rs

@@ -638,7 +638,7 @@ where
         target_inbox_id: String,
     ) -> Result<MlsGroup<Self>, ClientError> {
         let conn = self.store().conn()?;
-        match conn.find_dm_group(DmMembers {
+        match conn.find_dm_group(&DmMembers {
             member_one_inbox_id: self.inbox_id(),
             member_two_inbox_id: &target_inbox_id,
         })? {

xmtp_mls/src/groups/group_metadata.rs

@@ -161,23 +161,42 @@ where
     }
 }
 
-impl<Id> From<DmMembers<Id>> for String
+impl<Id> From<&DmMembers<Id>> for String
 where
     Id: AsRef<str>,
 {
-    fn from(members: DmMembers<Id>) -> Self {
-        let inbox_ids = [
+    fn from(members: &DmMembers<Id>) -> Self {
+        let mut inbox_ids = [
             members.member_one_inbox_id.as_ref(),
             members.member_two_inbox_id.as_ref(),
         ]
         .into_iter()
         .map(str::to_lowercase)
         .collect::<Vec<_>>();
+        inbox_ids.sort();
 
         format!("dm:{}", inbox_ids.join(":"))
     }
 }
 
+impl<Id> From<DmMembers<Id>> for String
+where
+    Id: AsRef<str>,
+{
+    fn from(members: DmMembers<Id>) -> Self {
+        String::from(&members)
+    }
+}
+
+impl<Id> ToString for DmMembers<Id>
+where
+    Id: AsRef<str>,
+{
+    fn to_string(&self) -> String {
+        String::from(self)
+    }
+}
+
 impl TryFrom<DmMembersProto> for DmMembers<InboxId> {
     type Error = GroupMetadataError;
 

xmtp_mls/src/storage/encrypted_store/group.rs

@@ -19,7 +19,6 @@ use diesel::{
 };
 use serde::{Deserialize, Serialize};
 use xmtp_common::time::now_ns;
-use xmtp_id::InboxIdRef;
 
 pub type ID = Vec<u8>;
 
@@ -346,9 +345,9 @@ impl DbConnection {
 
     pub fn find_dm_group(
         &self,
-        members: DmMembers<&str>,
+        members: &DmMembers<&str>,
     ) -> Result<Option<StoredGroup>, StorageError> {
-        let dm_id = String::from(members.clone());
+        let dm_id = String::from(members);
 
         let query = dsl::groups
             .order(dsl::created_at_ns.asc())
@@ -745,7 +744,7 @@ pub(crate) mod tests {
             // test find_dm_group
 
             let dm_result = conn
-                .find_dm_group(DmMembers {
+                .find_dm_group(&DmMembers {
                     member_one_inbox_id: "placeholder_inbox_id_1",
                     member_two_inbox_id: "placeholder_inbox_id_2",
                 })