chore(swift): adjust tests to the new api

Author: coriolinus

crypto-ffi/bindings/swift/WireCoreCrypto/WireCoreCryptoTests/WireCoreCryptoTests.swift

@@ -497,6 +497,7 @@ final class WireCoreCryptoTests: XCTestCase {
         XCTAssertTrue(resultAfter)
     }
 
+    // swiftlint:disable:next function_body_length
     func testUpdateKeyingMaterialShouldProcessTheCommitMessage() async throws {
         let conversationId = ConversationId(bytes: Data("conversation1".utf8))
         let ciphersuite = try ciphersuiteFromU16(discriminant: 2)
@@ -520,11 +521,18 @@ final class WireCoreCryptoTests: XCTestCase {
             )
         }
         let aliceKp = try await alice.transaction {
-            try await $0.clientKeypackages(
+            let credential = try await $0.findCredentials(
+                clientId: nil,
+                publicKey: nil,
                 ciphersuite: ciphersuite,
                 credentialType: .basic,
-                amountRequested: 1
+                earliestValidity: nil
             ).first!
+
+            try await $0.generateKeypackage(
+                credentialRef: credential,
+                lifetime: nil
+            )
         }
         try await bob.transaction {
             _ = try await $0.addClientsToConversation(
@@ -576,11 +584,18 @@ final class WireCoreCryptoTests: XCTestCase {
         }
 
         let aliceKp = try await alice.transaction {
-            try await $0.clientKeypackages(
+            let credential = try await $0.findCredentials(
+                clientId: nil,
+                publicKey: nil,
                 ciphersuite: ciphersuite,
                 credentialType: .basic,
-                amountRequested: 1
+                earliestValidity: nil
             ).first!
+
+            try await $0.generateKeypackage(
+                credentialRef: credential,
+                lifetime: nil
+            )
         }
         try await bob.transaction {
             _ = try await $0.addClientsToConversation(

interop/src/clients/InteropClient/InteropClient/InteropClientApp.swift

@@ -124,26 +124,26 @@ struct InteropClientApp: App {
         case .getKeyPackage(let ciphersuite):
             guard let coreCrypto else { throw InteropError.notInitialised }
 
-            let keyPackage = try await coreCrypto.transaction {
-                try await $0.clientKeypackages(
-                    ciphersuite: ciphersuiteFromU16(discriminant: ciphersuite),
-                    credentialType: .basic,
-                    amountRequested: 1)
-            }
+            let credential = try await $0.findCredentials(
+                clientId: nil,
+                publicKey: nil,
+                ciphersuite: ciphersuiteFromU16(discriminant: ciphersuite),
+                credentialType: .basic,
+                earliestValidity: nil
+            ).first!
+
+            let keyPackage = try await $0.generateKeypackage(
+                credentialRef: credential,
+                lifetime: nil
+            )
 
-            if let encodedKeyPackage = keyPackage.first.map({
-                $0.copyBytes().base64EncodedString()
-            }) {
-                return encodedKeyPackage
-            } else {
-                throw InteropError.encodingError
-            }
+            return try keyPackage.serialize().base64EncodedString()
 
         case .addClient(let conversationId, let ciphersuite, let keyPackage):
             guard let coreCrypto else { throw InteropError.notInitialised }
             let conversationId = ConversationId(bytes: conversationId)
             let ciphersuite = try ciphersuiteFromU16(discriminant: ciphersuite)
-            let keyPackage = KeyPackage(bytes: keyPackage)
+            let keyPackage = try Keypackage(bytes: keyPackage)
 
             try await coreCrypto.transaction { context in
                 if try await context.conversationExists(