more bad merge items

xmtp · May 16, 2024 · e174158 · e174158
1 parent d3aa3cc
commit e174158
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/memory_storage/src/lib.rs b/memory_storage/src/lib.rs
@@ -1,5 +1,4 @@
 use openmls_traits::storage::*;
-
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, sync::RwLock};
 
@@ -894,7 +893,7 @@ impl StorageProvider<CURRENT_VERSION> for MemoryStorage {
         aad: &[u8],
     ) -> Result<(), Self::Error> {
         let key = serde_json::to_vec(group_id)?;
-        self.write::<CURRENT_VERSION>(AAD_LABEL, &key, serde_json::to_vec(aad).unwrap())
+        self.write::<CURRENT_VERSION>(AAD_LABEL, &key, aad.to_vec())
     }
 
     fn delete_aad<GroupId: traits::GroupId<CURRENT_VERSION>>(

diff --git a/openmls/src/ciphersuite/mod.rs b/openmls/src/ciphersuite/mod.rs
@@ -15,7 +15,7 @@ use std::hash::Hash;
 
 mod aead;
 mod codec;
-pub mod hpke;
+pub(crate) mod hpke;
 mod kdf_label;
 mod mac;
 mod reuse_guard;

diff --git a/openmls/src/key_packages/mod.rs b/openmls/src/key_packages/mod.rs
@@ -401,11 +401,6 @@ impl KeyPackage {
     pub fn last_resort(&self) -> bool {
         self.payload.extensions.contains(ExtensionType::LastResort)
     }
-
-    /// Get the lifetime of the KeyPackage
-    pub fn life_time(&self) -> &Lifetime {
-        self.payload.leaf_node.life_time().unwrap()
-    }
 }
 
 /// Crate visible `KeyPackage` functions.

diff --git a/openmls/src/messages/proposals.rs b/openmls/src/messages/proposals.rs
@@ -468,7 +468,7 @@ pub struct AppAckProposal {
     TlsSize,
 )]
 pub struct GroupContextExtensionProposal {
-    pub(crate) extensions: Extensions,
+    extensions: Extensions,
 }
 
 impl GroupContextExtensionProposal {
@@ -478,7 +478,7 @@ impl GroupContextExtensionProposal {
     }
 
     /// Get the extensions of the proposal
-    pub fn extensions(&self) -> &Extensions {
+    pub(crate) fn extensions(&self) -> &Extensions {
         &self.extensions
     }
 }