chore(jvm): adapt tests to new keypackage api

Author: coriolinus

crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/E2EITest.kt

@@ -220,7 +220,7 @@ internal class E2EITest : HasMockDeliveryService() {
 
             bob.transaction { ctx -> ctx.createConversation(id, CREDENTIAL_TYPE_DEFAULT, CONVERSATION_CONFIGURATION_DEFAULT) }
 
-            val aliceKp = alice.transaction { ctx -> ctx.clientKeypackages(CIPHERSUITE_DEFAULT, CREDENTIAL_TYPE_DEFAULT, 1U).first() }
+            val aliceKp = alice.transaction { ctx -> ctx.clientKeypackagesShort(1u).first() }
             bob.transaction { ctx -> ctx.addClientsToConversation(id, listOf(aliceKp)) }
             val welcome = HasMockDeliveryService.mockDeliveryService.getLatestWelcome()
             val groupId = alice.transaction { ctx -> ctx.processWelcomeMessage(welcome, CUSTOM_CONFIGURATION_DEFAULT).id }

crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/MLSTest.kt

@@ -153,15 +153,15 @@ class MLSTest : HasMockDeliveryService() {
         // by default, no key packages are generated
         assertThat(
             alice.transaction { ctx ->
-                ctx.clientValidKeypackagesCount(CIPHERSUITE_DEFAULT, CREDENTIAL_TYPE_DEFAULT)
+                ctx.getKeypackages().size
             }
-        ).isEqualTo(0.toULong())
+        ).isEqualTo(0)
         assertThat(alice.transaction { ctx -> ctx.clientKeypackagesShort(200U) }).isNotEmpty().hasSize(200)
         assertThat(
             alice.transaction { ctx ->
-                ctx.clientValidKeypackagesCount(CIPHERSUITE_DEFAULT, CREDENTIAL_TYPE_DEFAULT)
+                ctx.getKeypackages().size
             }
-        ).isEqualTo(200.toULong())
+        ).isEqualTo(200)
     }
 
     @Test

crypto-ffi/bindings/jvm/src/test/kotlin/com/wire/crypto/testutils/TestUtils.kt

@@ -105,5 +105,19 @@ suspend fun CoreCryptoContext.createConversationShort(
     id: ConversationId
 ) = createConversation(id, CREDENTIAL_TYPE_DEFAULT, CONVERSATION_CONFIGURATION_DEFAULT)
 
-/** Shorthand for getting keypackages with defaults */
-suspend fun CoreCryptoContext.clientKeypackagesShort(amount: UInt) = clientKeypackages(CIPHERSUITE_DEFAULT, CREDENTIAL_TYPE_DEFAULT, amount)
+/** Shorthand for generating keypackages with defaults */
+suspend fun CoreCryptoContext.clientKeypackagesShort(amount: UInt): List<Keypackage> {
+    val credentials = findCredentials(
+        clientId = null,
+        publicKey = null,
+        ciphersuite = CIPHERSUITE_DEFAULT,
+        credentialType = CREDENTIAL_TYPE_DEFAULT,
+        earliestValidity = null
+    )
+    val credential = credentials.last()
+
+    return List(amount.toInt()) { _ ->
+        // cycle through credentials if amount > credentials.size
+        generateKeypackage(credential)
+    }
+}