From 1e456d0e0f3aa0325d817349f9e8d0a83ba207fe Mon Sep 17 00:00:00 2001
From: Marta Mularczyk <mulmarta@amazon.com>
Date: Thu, 5 Dec 2024 19:05:25 +0100
Subject: [PATCH] Fixup

---
 mls-rs-crypto-webcrypto/src/aead.rs     |  4 ++--
 mls-rs-crypto-webcrypto/src/key_type.rs |  4 ++--
 mls-rs/src/group/mod.rs                 | 21 ++++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/mls-rs-crypto-webcrypto/src/aead.rs b/mls-rs-crypto-webcrypto/src/aead.rs
index d13c2b61..dac50879 100644
--- a/mls-rs-crypto-webcrypto/src/aead.rs
+++ b/mls-rs-crypto-webcrypto/src/aead.rs
@@ -83,9 +83,9 @@ impl Aead {
             .then_some(())
             .ok_or(CryptoError::WrongKeyLength)?;
 
-        let params = AesGcmParams::new(key_type.algorithm(), &Uint8Array::from(nonce));
+        let mut params = AesGcmParams::new(key_type.algorithm(), &Uint8Array::from(nonce));
         let aad = Uint8Array::from(aad.unwrap_or_default());
-        params.set_additional_data(&aad);
+        params.additional_data(&aad);
         let key = key_type.import(&crypto, key).await?;
 
         let out = match key_type {
diff --git a/mls-rs-crypto-webcrypto/src/key_type.rs b/mls-rs-crypto-webcrypto/src/key_type.rs
index a69794eb..381cf1bc 100644
--- a/mls-rs-crypto-webcrypto/src/key_type.rs
+++ b/mls-rs-crypto-webcrypto/src/key_type.rs
@@ -86,8 +86,8 @@ impl KeyType {
             | KeyType::EcdhSecret(curve)
             | KeyType::EcdsaPublic(curve)
             | KeyType::EcdsaSecret(curve) => {
-                let params = EcKeyImportParams::new(self.algorithm());
-                params.set_named_curve(curve);
+                let mut params = EcKeyImportParams::new(self.algorithm());
+                params.named_curve(curve);
 
                 crypto.import_key_with_object(self.format(), &key, &params, true, &key_usages)?
             }
diff --git a/mls-rs/src/group/mod.rs b/mls-rs/src/group/mod.rs
index ae745a75..57ff5628 100644
--- a/mls-rs/src/group/mod.rs
+++ b/mls-rs/src/group/mod.rs
@@ -2318,7 +2318,7 @@ mod tests {
     }
 
     #[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
-    async fn test_reused_key_package() -> Result<(), MlsError> {
+    async fn test_reused_key_package() {
         let mut alice_group = test_group(TEST_PROTOCOL_VERSION, TEST_CIPHER_SUITE).await;
         let (bob_client, bob_key_package) =
             test_client_with_key_pkg(TEST_PROTOCOL_VERSION, TEST_CIPHER_SUITE, "bob").await;
@@ -2328,24 +2328,29 @@ mod tests {
         let commit_output = alice_group
             .group
             .commit_builder()
-            .add_member(bob_key_package.clone())?
+            .add_member(bob_key_package.clone())
+            .unwrap()
             .build()
-            .await?;
+            .await
+            .unwrap();
 
         // Bob joins group.
         let (mut bob_group, _) = bob_client
             .join_group(None, &commit_output.welcome_messages[0])
-            .await?;
+            .await
+            .unwrap();
         // This deletes the key package used to join the group.
-        bob_group.write_to_storage().await?;
+        bob_group.write_to_storage().await.unwrap();
 
         // Carla adds Bob, reusing the same key package.
         let commit_output = carla_group
             .group
             .commit_builder()
-            .add_member(bob_key_package.clone())?
+            .add_member(bob_key_package.clone())
+            .unwrap()
             .build()
-            .await?;
+            .await
+            .unwrap();
 
         // Bob cannot join Carla's group.
         let bob_group = bob_client
@@ -2353,8 +2358,6 @@ mod tests {
             .await
             .map(|_| ());
         assert_matches!(bob_group, Err(MlsError::WelcomeKeyPackageNotFound));
-
-        Ok(())
     }
 
     #[cfg(feature = "last_resort_key_package_ext")]