imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some references to internal js-sdk classes (#12363)

Browse source 
* Fix references to `crypto-api/verification`

This is supposed to be an internal module; use the front door instead.

* `IRecoveryKey` -> `GeneratedSecretStorageKey`

`IRecoveryKey` is just a backwards-compatibility alias for
`GeneratedSecretStorageKey`

* `ISecretStorageKeyInfo` -> `SecretStorage.SecretStorageKeyDescription`

Again, same thing

* `IPassphraseInfo` -> `SecretStorage.PassphraseInfo`

* Remove unused import restriction exceptions
This commit is contained in:
Richard van der Hoff 2024-03-22 12:28:13 +00:00 • committed by GitHub
parent 79f9a130fa
commit d36c1b39fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/components/views/VerificationShowSas-test.tsx
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { EmojiMapping } from "matrix-js-sdk/src/crypto-api/verification";
import { EmojiMapping } from "matrix-js-sdk/src/crypto-api";
import { tEmoji } from "../../../src/components/views/verification/VerificationShowSas";

5
test/components/views/dialogs/AccessSecretStorageDialog-test.tsx
View file

@ -15,10 +15,9 @@ limitations under the License.
*/
import React, { ComponentProps } from "react";
import { IPassphraseInfo } from "matrix-js-sdk/src/crypto/api";
import { SecretStorage, MatrixClient } from "matrix-js-sdk/src/matrix";
import { act, fireEvent, render, screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { MatrixClient } from "matrix-js-sdk/src/matrix";
import { Mocked } from "jest-mock";
import { getMockClientWithEventEmitter, mockPlatformPeg } from "../../../test-utils";
@ -117,7 +116,7 @@ describe("AccessSecretStorageDialog", () => {
passphrase: {
// this type is weird in js-sdk
// cast 'm.pbkdf2' to itself
algorithm: "m.pbkdf2" as IPassphraseInfo["algorithm"],
algorithm: "m.pbkdf2" as SecretStorage.PassphraseInfo["algorithm"],
iterations: 2,
salt: "nonempty",
},

2
test/components/views/dialogs/IncomingSasDialog-test.tsx
View file

@ -23,7 +23,7 @@ import {
Verifier,
VerifierEvent,
VerifierEventHandlerMap,
} from "matrix-js-sdk/src/crypto-api/verification";
} from "matrix-js-sdk/src/crypto-api";
import { TypedEventEmitter } from "matrix-js-sdk/src/matrix";
import IncomingSasDialog from "../../../../src/components/views/dialogs/IncomingSasDialog";

2
test/components/views/right_panel/VerificationPanel-test.tsx
View file

@ -27,7 +27,7 @@ import {
Verifier,
VerifierEvent,
VerifierEventHandlerMap,
} from "matrix-js-sdk/src/crypto-api/verification";
} from "matrix-js-sdk/src/crypto-api";
import VerificationPanel from "../../../../src/components/views/right_panel/VerificationPanel";
import { flushPromises, stubClient } from "../../../test-utils";