Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit b2a8915

Browse files
authored
Remove redundant call to setCrypto (#12738)
Since matrix-org/matrix-js-sdk#4292, this thing is a no-op.
1 parent 2a26afe commit b2a8915

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ module.exports = {
120120
"!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
121121
"!matrix-js-sdk/src/crypto",
122122
"!matrix-js-sdk/src/crypto/aes",
123-
"!matrix-js-sdk/src/crypto/crypto",
124123
"!matrix-js-sdk/src/crypto/keybackup",
125124
"!matrix-js-sdk/src/crypto/deviceinfo",
126125
"!matrix-js-sdk/src/crypto/key_passphrase",

test/Lifecycle-test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { Crypto } from "@peculiar/webcrypto";
1818
import { logger } from "matrix-js-sdk/src/logger";
1919
import * as MatrixJs from "matrix-js-sdk/src/matrix";
2020
import { decodeBase64, encodeUnpaddedBase64 } from "matrix-js-sdk/src/matrix";
21-
import { setCrypto } from "matrix-js-sdk/src/crypto/crypto";
2221
import * as MatrixCryptoAes from "matrix-js-sdk/src/crypto/aes";
2322
import { mocked, MockedObject } from "jest-mock";
2423
import fetchMock from "fetch-mock-jest";
@@ -79,7 +78,6 @@ describe("Lifecycle", () => {
7978
delete global.localStorage;
8079
global.localStorage = realLocalStorage;
8180

82-
setCrypto(webCrypto);
8381
// @ts-ignore mocking
8482
delete window.crypto;
8583
window.crypto = webCrypto;
@@ -88,8 +86,6 @@ describe("Lifecycle", () => {
8886
});
8987

9088
afterAll(() => {
91-
setCrypto(windowCrypto);
92-
9389
// @ts-ignore unmocking
9490
delete window.crypto;
9591
window.crypto = windowCrypto;

0 commit comments

Comments
 (0)