From f99601cb92a5e133471c1eb00d56150a0c3240b2 Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <peter.goodspeed-niklaus@wire.com>
Date: Fri, 22 Nov 2024 14:15:25 +0100
Subject: [PATCH] test(jvm): cause jvm kotlin tests to pass

---
 crypto-ffi/Cargo.toml                                      | 7 -------
 .../jvm/src/test/kotlin/com/wire/crypto/client/MLSTest.kt  | 5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/crypto-ffi/Cargo.toml b/crypto-ffi/Cargo.toml
index 0595502ae..ba8b8a4e8 100644
--- a/crypto-ffi/Cargo.toml
+++ b/crypto-ffi/Cargo.toml
@@ -29,16 +29,9 @@ tls_codec.workspace = true
 async-lock.workspace = true
 log.workspace = true
 log-reload.workspace = true
-<<<<<<< HEAD
 serde_json.workspace = true
-=======
 proteus-wasm = { workspace = true, optional = true }
 core-crypto-keystore = { workspace = true, optional = true}
-<<<<<<< HEAD
->>>>>>> 75bea838 (feat: refactor WASM error types)
-=======
-serde_json.workspace = true
->>>>>>> 9da395e8 (feat: support logs with a context of key/value pairs)
 
 # see https://github.com/RustCrypto/hashes/issues/404
 [target.'cfg(not(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86")))'.dependencies]
diff --git a/crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/client/MLSTest.kt b/crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/client/MLSTest.kt
index 05b5e9267..b2769970b 100644
--- a/crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/client/MLSTest.kt
+++ b/crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/client/MLSTest.kt
@@ -19,6 +19,7 @@
 package com.wire.crypto.client
 
 import com.wire.crypto.CoreCryptoException
+import com.wire.crypto.MlsException
 import java.nio.file.Files
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -68,11 +69,11 @@ class MLSTest {
         cc.transaction { ctx -> context = ctx }
 
         val expectedException =
-            assertFailsWith<CoreCryptoException.CryptoException> {
+            assertFailsWith<CoreCryptoException.Mls> {
                 context!!.mlsInit(aliceId.toClientId())
             }
 
-        assertIs<CryptoError.InvalidContext>(expectedException.error)
+        assertIs<MlsException.Other>(expectedException.v1)
     }
 
     @Test