mls: update to use GroupId for mls_group_ids and [u8; 32] for nostr_group_ids

- Updates all the mls crates to use `GroupId` values for the mls_group_ids in all types and method signatures.
- Updates all `nostr_group_id` values to use `&[u8; 32]` values instead of a mix of strings and byte arrays.

Pull-Request: #849
Signed-off-by: Yuki Kishimoto <[email protected]>

Author: erskingardner

Cargo.lock

@@ -15,5 +15,6 @@ keywords = ["nostr", "mls", "openmls", "memory"]
 lru.workspace = true
 nostr = { workspace = true, features = ["std"] }
 nostr-mls-storage.workspace = true
+openmls = { git = "https://github.com/openmls/openmls", rev = "4cc0f594b11262083ad9827b3b2033052c6ef99f", default-features = false }
 openmls_memory_storage = { git = "https://github.com/openmls/openmls", rev = "4cc0f594b11262083ad9827b3b2033052c6ef99f", default-features = false }
 parking_lot = "0.12"

crates/nostr-mls-memory-storage/Cargo.toml

@@ -7,18 +7,10 @@ use nostr_mls_storage::groups::error::{GroupError, InvalidGroupState};
 use nostr_mls_storage::groups::types::*;
 use nostr_mls_storage::groups::GroupStorage;
 use nostr_mls_storage::messages::types::Message;
+use openmls::group::GroupId;
 
 use crate::NostrMlsMemoryStorage;
 
-/// Creates a compound key from an MLS group ID and epoch
-///
-/// The key is created by concatenating the MLS group ID and the epoch as bytes
-fn create_compound_key(mls_group_id: &[u8], epoch: u64) -> Vec<u8> {
-    let mut key = mls_group_id.to_vec();
-    key.extend_from_slice(&epoch.to_be_bytes());
-    key
-}
-
 impl GroupStorage for NostrMlsMemoryStorage {
     fn save_group(&self, group: Group) -> Result<(), GroupError> {
         // Store in the MLS group ID cache
@@ -30,7 +22,7 @@ impl GroupStorage for NostrMlsMemoryStorage {
         // Store in the Nostr group ID cache
         {
             let mut cache = self.groups_by_nostr_id_cache.write();
-            cache.put(group.nostr_group_id.clone(), group);
+            cache.put(group.nostr_group_id, group);
         }
 
         Ok(())
@@ -43,20 +35,23 @@ impl GroupStorage for NostrMlsMemoryStorage {
         Ok(groups)
     }
 
-    fn find_group_by_mls_group_id(&self, mls_group_id: &[u8]) -> Result<Option<Group>, GroupError> {
+    fn find_group_by_mls_group_id(
+        &self,
+        mls_group_id: &GroupId,
+    ) -> Result<Option<Group>, GroupError> {
         let cache = self.groups_cache.read();
         Ok(cache.peek(mls_group_id).cloned())
     }
 
     fn find_group_by_nostr_group_id(
         &self,
-        nostr_group_id: &str,
+        nostr_group_id: &[u8; 32],
     ) -> Result<Option<Group>, GroupError> {
         let cache = self.groups_by_nostr_id_cache.read();
         Ok(cache.peek(nostr_group_id).cloned())
     }
 
-    fn messages(&self, mls_group_id: &[u8]) -> Result<Vec<Message>, GroupError> {
+    fn messages(&self, mls_group_id: &GroupId) -> Result<Vec<Message>, GroupError> {
         // Check if the group exists first
         self.find_group_by_mls_group_id(mls_group_id)?;
 
@@ -68,14 +63,14 @@ impl GroupStorage for NostrMlsMemoryStorage {
         }
     }
 
-    fn admins(&self, mls_group_id: &[u8]) -> Result<BTreeSet<PublicKey>, GroupError> {
+    fn admins(&self, mls_group_id: &GroupId) -> Result<BTreeSet<PublicKey>, GroupError> {
         match self.find_group_by_mls_group_id(mls_group_id)? {
             Some(group) => Ok(group.admin_pubkeys),
             None => Err(GroupError::InvalidState(InvalidGroupState::NoAdmins)),
         }
     }
 
-    fn group_relays(&self, mls_group_id: &[u8]) -> Result<BTreeSet<GroupRelay>, GroupError> {
+    fn group_relays(&self, mls_group_id: &GroupId) -> Result<BTreeSet<GroupRelay>, GroupError> {
         // Check if the group exists first
         self.find_group_by_mls_group_id(mls_group_id)?;
 
@@ -114,16 +109,15 @@ impl GroupStorage for NostrMlsMemoryStorage {
 
     fn get_group_exporter_secret(
         &self,
-        mls_group_id: &[u8],
+        mls_group_id: &GroupId,
         epoch: u64,
     ) -> Result<Option<GroupExporterSecret>, GroupError> {
         // Check if the group exists first
         self.find_group_by_mls_group_id(mls_group_id)?;
 
         let cache = self.group_exporter_secrets_cache.read();
-        // Create a compound key from mls_group_id and epoch
-        let key = create_compound_key(mls_group_id, epoch);
-        Ok(cache.peek(&key).cloned())
+        // Use tuple (GroupId, epoch) as key
+        Ok(cache.peek(&(mls_group_id.clone(), epoch)).cloned())
     }
 
     fn save_group_exporter_secret(
@@ -134,9 +128,9 @@ impl GroupStorage for NostrMlsMemoryStorage {
         self.find_group_by_mls_group_id(&group_exporter_secret.mls_group_id)?;
 
         let mut cache = self.group_exporter_secrets_cache.write();
-        // Create a compound key from mls_group_id and epoch
-        let key = create_compound_key(
-            &group_exporter_secret.mls_group_id,
+        // Use tuple (GroupId, epoch) as key
+        let key = (
+            group_exporter_secret.mls_group_id.clone(),
             group_exporter_secret.epoch,
         );
         cache.put(key, group_exporter_secret);