wip

wireapp · Dec 22, 2023 · 64e0319 · 64e0319
1 parent 3e51112
commit 64e0319
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/crypto/src/mls/external_commit.rs b/crypto/src/mls/external_commit.rs
@@ -14,22 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see http://www.gnu.org/licenses/.
 
-use openmls::prelude::{
-    group_info::VerifiableGroupInfo, LeafNodeTbs, MlsGroup, MlsMessageOut, Proposal, Sender, SignContent, StagedCommit,
-};
+use openmls::prelude::{group_info::VerifiableGroupInfo, MlsGroup, MlsMessageOut, Proposal, Sender, StagedCommit};
 use openmls_traits::OpenMlsCryptoProvider;
 
-use core_crypto_keystore::entities::MlsPendingMessage;
-use core_crypto_keystore::{entities::PersistedMlsPendingGroup, CryptoKeystoreMls};
-use tls_codec::{Serialize, VLBytes};
+use core_crypto_keystore::{entities::MlsPendingMessage, entities::PersistedMlsPendingGroup, CryptoKeystoreMls};
+use tls_codec::Serialize;
 
-use crate::prelude::decrypt::MlsBufferedConversationDecryptMessage;
 use crate::{
     group_store::GroupStoreValue,
     prelude::{
-        id::ClientId, ConversationId, CoreCryptoCallbacks, CryptoError, CryptoResult, MlsCentral, MlsCiphersuite,
-        MlsConversation, MlsConversationConfiguration, MlsCredentialType, MlsCustomConfiguration, MlsError,
-        MlsGroupInfoBundle,
+        decrypt::MlsBufferedConversationDecryptMessage, id::ClientId, ConversationId, CoreCryptoCallbacks, CryptoError,
+        CryptoResult, MlsCentral, MlsCiphersuite, MlsConversation, MlsConversationConfiguration, MlsCredentialType,
+        MlsCustomConfiguration, MlsError, MlsGroupInfoBundle,
     },
 };
 

diff --git a/crypto/src/mls/external_proposal.rs b/crypto/src/mls/external_proposal.rs
@@ -1,11 +1,9 @@
 use std::collections::HashSet;
 
-use openmls::prelude::{JoinProposal, LeafNodeIndex};
 use openmls::{
     group::QueuedProposal,
-    prelude::{GroupEpoch, GroupId, MlsMessageOut, Proposal, Sender},
+    prelude::{GroupEpoch, GroupId, JoinProposal, LeafNodeIndex, MlsMessageOut, Proposal, Sender},
 };
-use openmls_traits::OpenMlsCryptoProvider;
 
 use crate::{
     group_store::GroupStoreValue,
@@ -137,9 +135,7 @@ impl MlsCentral {
             .generate_one_keypackage_from_credential_bundle(&self.mls_backend, ciphersuite, cb)
             .await?;
 
-        let ext_proposal = JoinProposal::new(kp, group_id, epoch, self.mls_backend.crypto(), &cb.signature_key)
-            .map_err(MlsError::from)?;
-        Ok(ext_proposal)
+        Ok(JoinProposal::new(kp, group_id, epoch, &cb.signature_key).map_err(MlsError::from)?)
     }
 }