everything is a provider now

xmtp · Apr 26, 2024 · 8ecba62 · 8ecba62
1 parent 0791f9d
commit 8ecba62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/openmls/src/group/core_group/mod.rs b/openmls/src/group/core_group/mod.rs
@@ -1145,7 +1145,7 @@ impl CoreGroup {
         framing_parameters: FramingParameters,
         extensions: Extensions,
         signer: &impl Signer,
-    ) -> Result<AuthenticatedContent, CreateGroupContextExtProposalError<KeyStore::Error>> {
+    ) -> Result<AuthenticatedContent, CreateGroupContextExtProposalError<Provider::StorageError>> {
         // Ensure that the group supports all the extensions that are wanted.
         let required_extension = extensions
             .iter()

diff --git a/openmls/src/group/core_group/test_proposals.rs b/openmls/src/group/core_group/test_proposals.rs
@@ -515,7 +515,7 @@ fn test_group_context_extension_proposal_fails(
 }
 
 #[apply(ciphersuites_and_providers)]
-fn test_group_context_extension_proposal<KeyStore: OpenMlsKeyStore>(
+fn test_group_context_extension_proposal<Provider: OpenMlsProvider>(
     ciphersuite: Ciphersuite,
     provider: &impl crate::storage::OpenMlsProvider,
 ) {
@@ -589,7 +589,7 @@ fn test_group_context_extension_proposal<KeyStore: OpenMlsKeyStore>(
             &[CredentialType::Basic],
         ));
     let gce_proposal = alice_group
-        .create_group_context_ext_proposal::<KeyStore>(
+        .create_group_context_ext_proposal::<Provider>(
             framing_parameters,
             Extensions::single(required_application_id),
             &alice_signer,

diff --git a/openmls/src/group/mls_group/proposal.rs b/openmls/src/group/mls_group/proposal.rs
@@ -363,7 +363,7 @@ impl MlsGroup {
     ) -> Result<(MlsMessageOut, ProposalRef), ProposalError<Provider::StorageError>> {
         self.is_operational()?;
 
-        let proposal = self.group.create_group_context_ext_proposal::<KeyStore>(
+        let proposal = self.group.create_group_context_ext_proposal::<Provider>(
             self.framing_parameters(),
             extensions,
             signer,
@@ -392,14 +392,14 @@ impl MlsGroup {
     /// Returns an error when the group does not support all the required capabilities
     /// in the new `extensions`.
     #[allow(clippy::type_complexity)]
-    pub fn update_group_context_extensions<KeyStore: OpenMlsKeyStore>(
+    pub fn update_group_context_extensions<Provider: OpenMlsProvider>(
         &mut self,
-        provider: &impl OpenMlsProvider<KeyStoreProvider = KeyStore>,
+        provider: &impl OpenMlsProvider,
         extensions: Extensions,
         signer: &impl Signer,
     ) -> Result<
         (MlsMessageOut, Option<MlsMessageOut>, Option<GroupInfo>),
-        CreateGroupContextExtProposalError<KeyStore::Error>,
+        CreateGroupContextExtProposalError<Provider::StorageError>,
     > {
         self.is_operational()?;