diff --git a/spec/integ/crypto/crypto.spec.ts b/spec/integ/crypto/crypto.spec.ts index 613769e4968..d72b3d6a262 100644 --- a/spec/integ/crypto/crypto.spec.ts +++ b/spec/integ/crypto/crypto.spec.ts @@ -91,7 +91,6 @@ import { OnlySignedDevicesIsolationMode, } from "../../../src/crypto-api"; import { E2EKeyResponder } from "../../test-utils/E2EKeyResponder"; -import { IKeyBackup } from "../../../src/crypto/backup"; import { createOlmAccount, createOlmSession, @@ -106,6 +105,7 @@ import { ToDevicePayload } from "../../../src/models/ToDeviceMessage"; import { AccountDataAccumulator } from "../../test-utils/AccountDataAccumulator"; import { UNSIGNED_MEMBERSHIP_FIELD } from "../../../src/@types/event"; import { KnownMembership } from "../../../src/@types/membership"; +import { KeyBackup } from "../../../src/rust-crypto/backup.ts"; afterEach(() => { // reset fake-indexeddb after each test, to make sure we don't leak connections @@ -3138,11 +3138,11 @@ describe.each(Object.entries(CRYPTO_BACKENDS))("crypto (%s)", (backend: string, // Import a new key that should be uploaded const newKey = testData.MEGOLM_SESSION_DATA; - const awaitKeyUploaded = new Promise((resolve) => { + const awaitKeyUploaded = new Promise((resolve) => { fetchMock.put( "path:/_matrix/client/v3/room_keys/keys", (url, request) => { - const uploadPayload: IKeyBackup = JSON.parse(request.body?.toString() ?? "{}"); + const uploadPayload: KeyBackup = JSON.parse(request.body?.toString() ?? "{}"); resolve(uploadPayload); return { status: 200, diff --git a/spec/integ/crypto/megolm-backup.spec.ts b/spec/integ/crypto/megolm-backup.spec.ts index bc36f940ffc..55cdd76b1f1 100644 --- a/spec/integ/crypto/megolm-backup.spec.ts +++ b/spec/integ/crypto/megolm-backup.spec.ts @@ -42,10 +42,10 @@ import { } from "../../test-utils/test-utils"; import * as testData from "../../test-utils/test-data"; import { KeyBackupInfo, KeyBackupSession } from "../../../src/crypto-api/keybackup"; -import { IKeyBackup } from "../../../src/crypto/backup"; import { flushPromises } from "../../test-utils/flushPromises"; import { defer, IDeferred } from "../../../src/utils"; import { DecryptionFailureCode } from "../../../src/crypto-api"; +import { KeyBackup } from "../../../src/rust-crypto/backup.ts"; const ROOM_ID = testData.TEST_ROOM_ID; @@ -91,7 +91,7 @@ function mockUploadEmitter( }, }; } - const uploadPayload: IKeyBackup = JSON.parse(request.body?.toString() ?? "{}"); + const uploadPayload: KeyBackup = JSON.parse(request.body?.toString() ?? "{}"); let count = 0; for (const [roomId, value] of Object.entries(uploadPayload.rooms)) { for (const sessionId of Object.keys(value.sessions)) { diff --git a/src/rust-crypto/index.ts b/src/rust-crypto/index.ts index 61f15a192a1..bf391bdca0d 100644 --- a/src/rust-crypto/index.ts +++ b/src/rust-crypto/index.ts @@ -20,7 +20,6 @@ import { StoreHandle } from "@matrix-org/matrix-sdk-crypto-wasm"; import { RustCrypto } from "./rust-crypto.ts"; import { IHttpOpts, MatrixHttpApi } from "../http-api/index.ts"; import { ServerSideSecretStorage } from "../secret-storage.ts"; -import { ICryptoCallbacks } from "../crypto/index.ts"; import { Logger } from "../logger.ts"; import { CryptoStore, MigrationState } from "../crypto/store/base.ts"; import { @@ -28,6 +27,7 @@ import { migrateLegacyLocalTrustIfNeeded, migrateRoomSettingsFromLegacyCrypto, } from "./libolm_migration.ts"; +import { CryptoCallbacks } from "../crypto-api/index.ts"; /** * Create a new `RustCrypto` implementation @@ -55,7 +55,7 @@ export async function initRustCrypto(args: { secretStorage: ServerSideSecretStorage; /** Crypto callbacks provided by the application. */ - cryptoCallbacks: ICryptoCallbacks; + cryptoCallbacks: CryptoCallbacks; /** * The prefix to use on the indexeddbs created by rust-crypto. @@ -145,7 +145,7 @@ async function initOlmMachine( userId: string, deviceId: string, secretStorage: ServerSideSecretStorage, - cryptoCallbacks: ICryptoCallbacks, + cryptoCallbacks: CryptoCallbacks, storeHandle: StoreHandle, legacyCryptoStore?: CryptoStore, ): Promise {