chore(ts): adjust tests to use only new keypackage api

Author: coriolinus

crypto-ffi/bindings/js/test/bun/utils.ts

@@ -153,11 +153,15 @@ export async function invite(
     cc2: CoreCrypto,
     conversationId: ConversationId
 ): Promise<GroupInfoBundle> {
-    const [kp] = await cc2.transaction((ctx) =>
-        ctx.clientKeypackages(DEFAULT_CIPHERSUITE, CredentialType.Basic, 1)
-    );
+    const kp = await cc2.transaction(async (ctx) => {
+        const [credentialRef] = await ctx.findCredentials({
+            ciphersuite: DEFAULT_CIPHERSUITE,
+            credentialType: CredentialType.Basic,
+        });
+        return await ctx.generateKeypackage(credentialRef!);
+    });
     await cc1.transaction((ctx) =>
-        ctx.addClientsToConversation(conversationId, [kp!])
+        ctx.addClientsToConversation(conversationId, [kp.serialize()])
     );
     const { groupInfo, welcome } =
         await DELIVERY_SERVICE.getLatestCommitBundle();

crypto-ffi/bindings/js/test/wdio/clientIdentity.test.ts

@@ -26,21 +26,26 @@ describe("client identity", () => {
         expect(result).toBe(32);
     });
 
-    it("requesting client key packages should work", async () => {
+    it("requesting client key package should work", async () => {
         const alice = crypto.randomUUID();
         await ccInit(alice);
-        const result = await browser.execute(async (clientName) => {
+        const error = await browser.execute(async (clientName) => {
             const cc = window.ensureCcDefined(clientName);
-            return (
-                await cc.transaction(async (ctx) => {
-                    return await ctx.clientKeypackages(
-                        window.defaultCipherSuite,
-                        window.ccModule.CredentialType.Basic,
-                        20 // Count of requested key packages
-                    );
-                })
-            ).length;
+            let error = false;
+            try {
+                const keypackage = await cc.transaction(async (ctx) => {
+                    const [credentialRef] = await ctx.findCredentials({
+                        ciphersuite: window.defaultCipherSuite,
+                        credentialType: window.ccModule.CredentialType.Basic,
+                    });
+                    return await ctx.generateKeypackage(credentialRef!);
+                });
+                keypackage.serialize();
+            } catch {
+                error = true;
+            }
+            return error;
         }, alice);
-        expect(result).toBe(20);
+        expect(error).toBe(false);
     });
 });

crypto-ffi/bindings/js/test/wdio/transactionContext.test.ts

@@ -53,11 +53,10 @@ describe("transaction context", () => {
             });
 
             try {
-                await context!.clientKeypackages(
-                    window.defaultCipherSuite,
-                    window.ccModule.CredentialType.Basic,
-                    1
-                );
+                await context!.findCredentials({
+                    ciphersuite: window.defaultCipherSuite,
+                    credentialType: window.ccModule.CredentialType.Basic,
+                });
             } catch (err) {
                 const e = err as { context?: { context?: { msg?: string } } };
                 return {

crypto-ffi/bindings/js/test/wdio/utils.ts

@@ -296,19 +296,19 @@ export async function invite(
             const cc1 = window.ensureCcDefined(client1);
             const cc2 = window.ensureCcDefined(client2);
 
-            const [kp] = await cc2.transaction((ctx) =>
-                ctx.clientKeypackages(
-                    window.defaultCipherSuite,
-                    window.ccModule.CredentialType.Basic,
-                    1
-                )
-            );
+            const kp = await cc2.transaction(async (ctx) => {
+                const [credentialRef] = await ctx.findCredentials({
+                    ciphersuite: window.defaultCipherSuite,
+                    credentialType: window.ccModule.CredentialType.Basic,
+                });
+                return await ctx.generateKeypackage(credentialRef!);
+            });
 
             const cid = new window.ccModule.ConversationId(
                 new TextEncoder().encode(conversationId).buffer
             );
             await cc1.transaction((ctx) =>
-                ctx.addClientsToConversation(cid, [kp!])
+                ctx.addClientsToConversation(cid, [kp.serialize()])
             );
             const commitBundle =
                 await window.deliveryService.getLatestCommitBundle();