From 69f1bea89bf7becf45ae2fdb0a2fe60606413be2 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Thu, 17 Apr 2025 14:51:38 +0100 Subject: [PATCH] Update dependency @matrix-org/matrix-sdk-crypto-wasm to v14.1.0 (#4811) * Convert import/export room key tests to snapshots * Update dependency @matrix-org/matrix-sdk-crypto-wasm to v14.1.0 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../__snapshots__/rust-crypto.spec.ts.snap | 31 +++++++++++++++++++ spec/unit/rust-crypto/rust-crypto.spec.ts | 14 +++------ yarn.lock | 6 ++-- 3 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 spec/unit/rust-crypto/__snapshots__/rust-crypto.spec.ts.snap diff --git a/spec/unit/rust-crypto/__snapshots__/rust-crypto.spec.ts.snap b/spec/unit/rust-crypto/__snapshots__/rust-crypto.spec.ts.snap new file mode 100644 index 000000000..1890fd2e9 --- /dev/null +++ b/spec/unit/rust-crypto/__snapshots__/rust-crypto.spec.ts.snap @@ -0,0 +1,31 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`RustCrypto importing and exporting room keys should import and export keys 1`] = ` +{ + "algorithm": "m.megolm.v1.aes-sha2", + "forwarding_curve25519_key_chain": [], + "org.matrix.msc3061.shared_history": false, + "room_id": "!room:id", + "sender_claimed_keys": { + "ed25519": "QdgHgdpDgihgovpPzUiThXur1fbErTFh7paFvNKSgN0", + }, + "sender_key": "WimPd2udAU/1S/+YBpPbmr9L+0H5H+BnAVHSwDxlPGc", + "session_id": "FYOoKQSwe4d9jhTZ/LQCZFJINjPEqZ7Or4Z08reP92M", + "session_key": "AQAAAABZ0jXQOprFfXe41tIFmAtHxflJp4O2hM/vzQQpOazOCFeWSoW5P3Z9Q+voU3eXehMwyP8/hm/Q8xLP6/PmJdy+71se/17kdFwcDGgLxBWfa4ODM9zlI4EjKbNqmiii5loJ7rBhA/XXaw80m0hfU6zTDX/KrO55J0Pt4vJ0LDa3LBWDqCkEsHuHfY4U2fy0AmRSSDYzxKmezq+GdPK3j/dj", +} +`; + +exports[`RustCrypto importing and exporting room keys should import and export keys as JSON 1`] = ` +{ + "algorithm": "m.megolm.v1.aes-sha2", + "forwarding_curve25519_key_chain": [], + "org.matrix.msc3061.shared_history": false, + "room_id": "!room:id", + "sender_claimed_keys": { + "ed25519": "QdgHgdpDgihgovpPzUiThXur1fbErTFh7paFvNKSgN0", + }, + "sender_key": "WimPd2udAU/1S/+YBpPbmr9L+0H5H+BnAVHSwDxlPGc", + "session_id": "FYOoKQSwe4d9jhTZ/LQCZFJINjPEqZ7Or4Z08reP92M", + "session_key": "AQAAAABZ0jXQOprFfXe41tIFmAtHxflJp4O2hM/vzQQpOazOCFeWSoW5P3Z9Q+voU3eXehMwyP8/hm/Q8xLP6/PmJdy+71se/17kdFwcDGgLxBWfa4ODM9zlI4EjKbNqmiii5loJ7rBhA/XXaw80m0hfU6zTDX/KrO55J0Pt4vJ0LDa3LBWDqCkEsHuHfY4U2fy0AmRSSDYzxKmezq+GdPK3j/dj", +} +`; diff --git a/spec/unit/rust-crypto/rust-crypto.spec.ts b/spec/unit/rust-crypto/rust-crypto.spec.ts index bacbc54ce..987de13ea 100644 --- a/spec/unit/rust-crypto/rust-crypto.spec.ts +++ b/spec/unit/rust-crypto/rust-crypto.spec.ts @@ -514,11 +514,8 @@ describe("RustCrypto", () => { expect(Array.isArray(keys)).toBeTruthy(); expect(keys.length).toBe(someRoomKeys.length); - const aSession = someRoomKeys[0]; - - const exportedKey = keys.find((k) => k.session_id == aSession.session_id); - - expect(aSession).toStrictEqual(exportedKey); + const exportedKey = keys.find((k) => k.session_id == someRoomKeys[0].session_id); + expect(exportedKey).toMatchSnapshot(); }); it("should import and export keys as JSON", async () => { @@ -539,11 +536,8 @@ describe("RustCrypto", () => { expect(Array.isArray(keys)).toBeTruthy(); expect(keys.length).toBe(someRoomKeys.length); - const aSession = someRoomKeys[0]; - - const exportedKey = keys.find((k) => k.session_id == aSession.session_id); - - expect(aSession).toStrictEqual(exportedKey); + const exportedKey = keys.find((k) => k.session_id == someRoomKeys[0].session_id); + expect(exportedKey).toMatchSnapshot(); }); }); diff --git a/yarn.lock b/yarn.lock index 1705d25db..184bb8ae5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1619,9 +1619,9 @@ "@jridgewell/sourcemap-codec" "^1.4.14" "@matrix-org/matrix-sdk-crypto-wasm@^14.0.1": - version "14.0.1" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.0.1.tgz#e258ef84bcc7889f0e7eb3a7dbecf0830a6dd606" - integrity sha512-CgLpHs6nTw5pjSsMBi9xbQnBXf2l8YhImQP9cv8nbGSCYdYjFI0FilMXffzjWV5HThpNHri/3pF20ahZtuS3VA== + version "14.1.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.1.0.tgz#843574ab3e3408162acf1af62e7d0e919e7fb871" + integrity sha512-vcSxHJIr6lP0Fgo8jl0sTHg+OZxZn+skGjiyB62erfgw/R2QqJl0ZVSY8SRcbk9LtHo/ZGld1tnaOyjL2e3cLQ== "@matrix-org/olm@3.2.15": version "3.2.15"