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

remove references to VerificationBase (#10996)

Browse source
This commit is contained in:
Richard van der Hoff 2023-06-09 16:49:44 +01:00 • committed by GitHub
parent 53b42e3217
commit 47ab99f908
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/dialogs/IncomingSasDialog.tsx
View file

@ -15,8 +15,7 @@ limitations under the License.
*/ */
import React, { ReactNode } from "react"; import React, { ReactNode } from "react";
import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base"; import { GeneratedSas, ShowSasCallbacks, Verifier, VerifierEvent } from "matrix-js-sdk/src/crypto-api/verification";
import { GeneratedSas, ShowSasCallbacks, VerifierEvent } from "matrix-js-sdk/src/crypto-api/verification";
import { logger } from "matrix-js-sdk/src/logger"; import { logger } from "matrix-js-sdk/src/logger";
import { MatrixClientPeg } from "../../../MatrixClientPeg"; import { MatrixClientPeg } from "../../../MatrixClientPeg";
@ -37,7 +36,7 @@ const PHASE_VERIFIED = 3;
const PHASE_CANCELLED = 4; const PHASE_CANCELLED = 4;
interface IProps { interface IProps {
verifier: VerificationBase<VerifierEvent, any>; verifier: Verifier;
onFinished(verified?: boolean): void; onFinished(verified?: boolean): void;
} }

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

@ -17,10 +17,10 @@ limitations under the License.
import { act, render } from "@testing-library/react"; import { act, render } from "@testing-library/react";
import React from "react"; import React from "react";
import { Mocked } from "jest-mock"; import { Mocked } from "jest-mock";
import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
import { import {
EmojiMapping, EmojiMapping,
ShowSasCallbacks, ShowSasCallbacks,
Verifier,
VerifierEvent, VerifierEvent,
VerifierEventHandlerMap, VerifierEventHandlerMap,
} from "matrix-js-sdk/src/crypto-api/verification"; } from "matrix-js-sdk/src/crypto-api/verification";
@ -58,16 +58,16 @@ describe("IncomingSasDialog", () => {
}); });
}); });
function renderComponent(verifier: VerificationBase, onFinished = () => true) { function renderComponent(verifier: Verifier, onFinished = () => true) {
return render(<IncomingSasDialog verifier={verifier} onFinished={onFinished} />); return render(<IncomingSasDialog verifier={verifier} onFinished={onFinished} />);
} }
function makeMockVerifier(): Mocked<VerificationBase> { function makeMockVerifier(): Mocked<Verifier> {
const verifier = new TypedEventEmitter<VerifierEvent, VerifierEventHandlerMap>(); const verifier = new TypedEventEmitter<VerifierEvent, VerifierEventHandlerMap>();
Object.assign(verifier, { Object.assign(verifier, {
cancel: jest.fn(), cancel: jest.fn(),
}); });
return verifier as unknown as Mocked<VerificationBase>; return verifier as unknown as Mocked<Verifier>;
} }
function makeMockSasCallbacks(): ShowSasCallbacks { function makeMockSasCallbacks(): ShowSasCallbacks {

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

@ -24,10 +24,10 @@ import {
import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter"; import { TypedEventEmitter } from "matrix-js-sdk/src/models/typed-event-emitter";
import { User } from "matrix-js-sdk/src/models/user"; import { User } from "matrix-js-sdk/src/models/user";
import { Mocked } from "jest-mock"; import { Mocked } from "jest-mock";
import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
import { import {
EmojiMapping, EmojiMapping,
ShowSasCallbacks, ShowSasCallbacks,
Verifier,
VerifierEvent, VerifierEvent,
VerifierEventHandlerMap, VerifierEventHandlerMap,
} from "matrix-js-sdk/src/crypto-api/verification"; } from "matrix-js-sdk/src/crypto-api/verification";
@ -94,13 +94,13 @@ describe("<VerificationPanel />", () => {
}); });
describe("'Verify by emoji' flow", () => { describe("'Verify by emoji' flow", () => {
let mockVerifier: Mocked<VerificationBase>; let mockVerifier: Mocked<Verifier>;
let mockRequest: Mocked<VerificationRequest>; let mockRequest: Mocked<VerificationRequest>;
beforeEach(() => { beforeEach(() => {
mockVerifier = makeMockVerifier(); mockVerifier = makeMockVerifier();
mockRequest = makeMockVerificationRequest({ mockRequest = makeMockVerificationRequest({
verifier: mockVerifier, verifier: mockVerifier as unknown as VerificationRequest["verifier"],
chosenMethod: "m.sas.v1", chosenMethod: "m.sas.v1",
}); });
}); });
@ -158,7 +158,7 @@ function makeMockVerificationRequest(props: Partial<VerificationRequest> = {}):
return request as unknown as Mocked<VerificationRequest>; return request as unknown as Mocked<VerificationRequest>;
} }
function makeMockVerifier(): Mocked<VerificationBase> { function makeMockVerifier(): Mocked<Verifier> {
const verifier = new TypedEventEmitter<VerifierEvent, VerifierEventHandlerMap>(); const verifier = new TypedEventEmitter<VerifierEvent, VerifierEventHandlerMap>();
Object.assign(verifier, { Object.assign(verifier, {
cancel: jest.fn(), cancel: jest.fn(),
@ -166,7 +166,7 @@ function makeMockVerifier(): Mocked<VerificationBase> {
getShowSasCallbacks: jest.fn(), getShowSasCallbacks: jest.fn(),
getReciprocateQrCodeCallbacks: jest.fn(), getReciprocateQrCodeCallbacks: jest.fn(),
}); });
return verifier as unknown as Mocked<VerificationBase>; return verifier as unknown as Mocked<Verifier>;
} }
function makeMockSasCallbacks(): ShowSasCallbacks { function makeMockSasCallbacks(): ShowSasCallbacks {