test: ffi: ts: adjust test utils

Author: fewerner

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

@@ -7,7 +7,7 @@ import {
     CredentialType,
     DatabaseKey,
     type HistorySecret,
-    MlsTransportData,
+    type MlsTransportData,
     type GroupInfoBundle,
     type MlsTransport,
     type MlsTransportResponse,
@@ -27,7 +27,7 @@ const CC_INSTANCES: CoreCrypto[] = [];
 const logLevel = Number(process.env["CC_TEST_LOG_LEVEL"] || "0");
 
 const DEFAULT_CIPHERSUITE =
-    Ciphersuite.MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519;
+    Ciphersuite.Mls128Dhkemx25519Chacha20poly1305Sha256Ed25519;
 
 interface DeliveryService extends MlsTransport {
     getLatestCommitBundle: () => Promise<CommitBundle>;
@@ -49,7 +49,7 @@ class TestDeliveryService implements DeliveryService {
 
     prepareForTransport(secret: HistorySecret): Promise<MlsTransportData> {
         return Promise.resolve(
-            new MlsTransportData(secret.clientId.copyBytes())
+            secret.clientId.copyBytes()
         );
     }
 
@@ -94,12 +94,12 @@ export async function teardown() {
  */
 export async function ccInit(clientName: string): Promise<CoreCrypto> {
     const encoder = new TextEncoder();
-    const clientId = new ClientId(encoder.encode(clientName));
+    const clientId = new ClientId(encoder.encode(clientName).buffer);
 
     const key = new Uint8Array(32);
     crypto.getRandomValues(key);
 
-    const database = await openDatabase(clientName, new DatabaseKey(key));
+    const database = await openDatabase(clientName, new DatabaseKey(key.buffer));
 
     const instance = await CoreCrypto.init(database);
     await instance.transaction(async (ctx) => {
@@ -177,8 +177,8 @@ export async function roundTripMessage(
     cc1: CoreCrypto,
     cc2: CoreCrypto,
     conversationId: ConversationId,
-    message: Uint8Array
-): Promise<(Uint8Array | null)[]> {
+    message: ArrayBuffer
+): Promise<(ArrayBuffer | null)[]> {
     const encryptedByClient1 = await cc1.transaction(async (ctx) => {
         return await ctx.encryptMessage(conversationId, message);
     });
@@ -216,7 +216,7 @@ export async function proteusInit(clientName: string): Promise<CoreCrypto> {
     const key = new Uint8Array(32);
     crypto.getRandomValues(key);
 
-    const database = await openDatabase(clientName, new DatabaseKey(key));
+    const database = await openDatabase(clientName, new DatabaseKey(key.buffer));
 
     const instance = await CoreCrypto.init(database);
     await instance.transaction(async (ctx) => {
@@ -271,8 +271,8 @@ export async function newProteusSessionFromMessage(
     cc1: CoreCrypto,
     cc2: CoreCrypto,
     sessionId: string,
-    messageBytes: Uint8Array
-): Promise<Uint8Array> {
+    messageBytes: ArrayBuffer
+): Promise<ArrayBuffer> {
     const encrypted = await cc1.transaction(async (ctx) => {
         return await ctx.proteusEncrypt(sessionId, messageBytes);
     });

crypto-ffi/src/bundles/group_info.rs

@@ -1,6 +1,6 @@
 use core_crypto::MlsGroupInfoBundle;
 
-use crate::core_crypto_context::mls::{group_info_coerce_maybe_arc, GroupInfoMaybeArc};
+use crate::core_crypto_context::mls::{GroupInfoMaybeArc, group_info_coerce_maybe_arc};
 
 #[derive(Debug, Clone, Copy, uniffi::Enum)]
 #[repr(u8)]

crypto-ffi/src/bundles/welcome.rs

@@ -1,4 +1,4 @@
-use crate::{conversation_id_coerce_maybe_arc, crl::NewCrlDistributionPoints, ConversationIdMaybeArc};
+use crate::{ConversationIdMaybeArc, conversation_id_coerce_maybe_arc, crl::NewCrlDistributionPoints};
 
 /// see [core_crypto::WelcomeBundle]
 #[derive(Debug, uniffi::Record)]

crypto-ffi/src/configuration.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use core_crypto::MlsCustomConfiguration;
 
-use crate::{core_crypto_context::mls::ExternalSenderKeyMaybeArc, Ciphersuite};
+use crate::{Ciphersuite, core_crypto_context::mls::ExternalSenderKeyMaybeArc};
 
 /// See [core_crypto::MlsWirePolicy]
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, uniffi::Enum)]

crypto-ffi/src/core_crypto/command/mod.rs

@@ -2,7 +2,6 @@ pub(crate) mod transaction_helper;
 
 use std::sync::Arc;
 
-
 use crate::{CoreCryptoContext, CoreCryptoFfi, CoreCryptoResult};
 
 /// A `CoreCryptoCommand` has an `execute` method which accepts a `CoreCryptoContext` and returns nothing.

crypto-ffi/src/core_crypto/e2ei/identities.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use core_crypto::{RecursiveError, mls::conversation::Conversation as _};
+
 use crate::{ConversationId, CoreCryptoFfi, CoreCryptoResult, WireIdentity, client_id::ClientIdMaybeArc};
 
 type DeviceIdentities = Vec<WireIdentity>;

crypto-ffi/src/core_crypto/e2ei/mod.rs

@@ -1,4 +1,5 @@
 use core_crypto::RecursiveError;
+
 use crate::{Ciphersuite, CoreCryptoFfi, CoreCryptoResult};
 
 pub(crate) mod identities;

crypto-ffi/src/core_crypto/logger.rs

@@ -5,8 +5,8 @@ use std::{
 };
 
 use log::{
-    kv::{Key, Value, VisitSource},
     Level, LevelFilter, Metadata, Record,
+    kv::{Key, Value, VisitSource},
 };
 use log_reload::ReloadLog;
 

crypto-ffi/src/core_crypto/mod.rs

@@ -19,7 +19,6 @@ use crate::{
 /// In uniffi, a vector is the natural way to communicate a byte slice
 pub(crate) type EntropySeed = Vec<u8>;
 
-
 #[expect(dead_code)]
 // Will be needed when implementing WPB-19570
 pub(crate) fn entropy_seed_map(e: EntropySeed) -> Vec<u8> {

crypto-ffi/src/core_crypto_context/e2ei.rs

@@ -1,5 +1,4 @@
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 use core_crypto::{mls::conversation::Conversation as _, transaction_context::Error as TransactionError};