Skip to content

Commit f4d7a4b

Browse files
hughnshughns
committed
Test correct protocol version
1 parent c48e819 commit f4d7a4b

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

‎spec/unit/rendezvous/rendezvous.spec.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import MockHttpBackend from "matrix-mock-request";
1919
import "../../olm-loader";
2020
import { MSC3906Rendezvous, RendezvousCode, RendezvousFailureReason, RendezvousIntent } from "../../../src/rendezvous";
2121
import {
22-
ECDHv1RendezvousCode,
22+
ECDHv2RendezvousCode as ECDHRendezvousCode,
2323
MSC3903ECDHPayload,
24-
MSC3903ECDHv1RendezvousChannel,
24+
MSC3903ECDHv2RendezvousChannel as MSC3903ECDHRendezvousChannel,
2525
} from "../../../src/rendezvous/channels";
2626
import { MatrixClient } from "../../../src";
2727
import {
@@ -126,7 +126,7 @@ describe("Rendezvous", function () {
126126
fallbackRzServer: "https://fallbackserver/rz",
127127
fetchFn,
128128
});
129-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport);
129+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport);
130130
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
131131

132132
expect(aliceRz.code).toBeUndefined();
@@ -181,19 +181,19 @@ describe("Rendezvous", function () {
181181
msc3882Enabled: false,
182182
msc3886Enabled: false,
183183
});
184-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport, undefined, aliceOnFailure);
184+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport, undefined, aliceOnFailure);
185185
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
186186
aliceTransport.onCancelled = aliceOnFailure;
187187
await aliceRz.generateCode();
188-
const code = JSON.parse(aliceRz.code!) as ECDHv1RendezvousCode;
188+
const code = JSON.parse(aliceRz.code!) as ECDHRendezvousCode;
189189

190190
expect(code.rendezvous.key).toBeDefined();
191191

192192
const aliceStartProm = aliceRz.startAfterShowingCode();
193193

194194
// bob is try to sign in and scans the code
195195
const bobOnFailure = jest.fn();
196-
const bobEcdh = new MSC3903ECDHv1RendezvousChannel(
196+
const bobEcdh = new MSC3903ECDHRendezvousChannel(
197197
bobTransport,
198198
decodeBase64(code.rendezvous.key), // alice's public key
199199
bobOnFailure,
@@ -235,19 +235,19 @@ describe("Rendezvous", function () {
235235
msc3882Enabled: true,
236236
msc3886Enabled: false,
237237
});
238-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport, undefined, aliceOnFailure);
238+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport, undefined, aliceOnFailure);
239239
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
240240
aliceTransport.onCancelled = aliceOnFailure;
241241
await aliceRz.generateCode();
242-
const code = JSON.parse(aliceRz.code!) as ECDHv1RendezvousCode;
242+
const code = JSON.parse(aliceRz.code!) as ECDHRendezvousCode;
243243

244244
expect(code.rendezvous.key).toBeDefined();
245245

246246
const aliceStartProm = aliceRz.startAfterShowingCode();
247247

248248
// bob is try to sign in and scans the code
249249
const bobOnFailure = jest.fn();
250-
const bobEcdh = new MSC3903ECDHv1RendezvousChannel(
250+
const bobEcdh = new MSC3903ECDHRendezvousChannel(
251251
bobTransport,
252252
decodeBase64(code.rendezvous.key), // alice's public key
253253
bobOnFailure,
@@ -293,19 +293,19 @@ describe("Rendezvous", function () {
293293
msc3882Enabled: true,
294294
msc3886Enabled: false,
295295
});
296-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport, undefined, aliceOnFailure);
296+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport, undefined, aliceOnFailure);
297297
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
298298
aliceTransport.onCancelled = aliceOnFailure;
299299
await aliceRz.generateCode();
300-
const code = JSON.parse(aliceRz.code!) as ECDHv1RendezvousCode;
300+
const code = JSON.parse(aliceRz.code!) as ECDHRendezvousCode;
301301

302302
expect(code.rendezvous.key).toBeDefined();
303303

304304
const aliceStartProm = aliceRz.startAfterShowingCode();
305305

306306
// bob is try to sign in and scans the code
307307
const bobOnFailure = jest.fn();
308-
const bobEcdh = new MSC3903ECDHv1RendezvousChannel(
308+
const bobEcdh = new MSC3903ECDHRendezvousChannel(
309309
bobTransport,
310310
decodeBase64(code.rendezvous.key), // alice's public key
311311
bobOnFailure,
@@ -351,19 +351,19 @@ describe("Rendezvous", function () {
351351
msc3882Enabled: true,
352352
msc3886Enabled: false,
353353
});
354-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport, undefined, aliceOnFailure);
354+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport, undefined, aliceOnFailure);
355355
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
356356
aliceTransport.onCancelled = aliceOnFailure;
357357
await aliceRz.generateCode();
358-
const code = JSON.parse(aliceRz.code!) as ECDHv1RendezvousCode;
358+
const code = JSON.parse(aliceRz.code!) as ECDHRendezvousCode;
359359

360360
expect(code.rendezvous.key).toBeDefined();
361361

362362
const aliceStartProm = aliceRz.startAfterShowingCode();
363363

364364
// bob is try to sign in and scans the code
365365
const bobOnFailure = jest.fn();
366-
const bobEcdh = new MSC3903ECDHv1RendezvousChannel(
366+
const bobEcdh = new MSC3903ECDHRendezvousChannel(
367367
bobTransport,
368368
decodeBase64(code.rendezvous.key), // alice's public key
369369
bobOnFailure,
@@ -411,19 +411,19 @@ describe("Rendezvous", function () {
411411
msc3882Enabled: true,
412412
msc3886Enabled: false,
413413
});
414-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport, undefined, aliceOnFailure);
414+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport, undefined, aliceOnFailure);
415415
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
416416
aliceTransport.onCancelled = aliceOnFailure;
417417
await aliceRz.generateCode();
418-
const code = JSON.parse(aliceRz.code!) as ECDHv1RendezvousCode;
418+
const code = JSON.parse(aliceRz.code!) as ECDHRendezvousCode;
419419

420420
expect(code.rendezvous.key).toBeDefined();
421421

422422
const aliceStartProm = aliceRz.startAfterShowingCode();
423423

424424
// bob is try to sign in and scans the code
425425
const bobOnFailure = jest.fn();
426-
const bobEcdh = new MSC3903ECDHv1RendezvousChannel(
426+
const bobEcdh = new MSC3903ECDHRendezvousChannel(
427427
bobTransport,
428428
decodeBase64(code.rendezvous.key), // alice's public key
429429
bobOnFailure,
@@ -485,19 +485,19 @@ describe("Rendezvous", function () {
485485
master: "mmmmm",
486486
},
487487
});
488-
const aliceEcdh = new MSC3903ECDHv1RendezvousChannel(aliceTransport, undefined, aliceOnFailure);
488+
const aliceEcdh = new MSC3903ECDHRendezvousChannel(aliceTransport, undefined, aliceOnFailure);
489489
const aliceRz = new MSC3906Rendezvous(aliceEcdh, alice);
490490
aliceTransport.onCancelled = aliceOnFailure;
491491
await aliceRz.generateCode();
492-
const code = JSON.parse(aliceRz.code!) as ECDHv1RendezvousCode;
492+
const code = JSON.parse(aliceRz.code!) as ECDHRendezvousCode;
493493

494494
expect(code.rendezvous.key).toBeDefined();
495495

496496
const aliceStartProm = aliceRz.startAfterShowingCode();
497497

498498
// bob is try to sign in and scans the code
499499
const bobOnFailure = jest.fn();
500-
const bobEcdh = new MSC3903ECDHv1RendezvousChannel(
500+
const bobEcdh = new MSC3903ECDHRendezvousChannel(
501501
bobTransport,
502502
decodeBase64(code.rendezvous.key), // alice's public key
503503
bobOnFailure,

0 commit comments

Comments
 (0)