From 66f7c9f564a723ed9f9efb75821a2217d9ea761b Mon Sep 17 00:00:00 2001
From: Michael Weimann <michaelw@matrix.org>
Date: Tue, 19 Jul 2022 18:02:38 +0200
Subject: [PATCH] Remove obsolete crypto e2e test scenario (#9077)

It has been replaced by cypress tests
---
 test/end-to-end-tests/src/scenario.ts         |  2 -
 .../src/scenarios/e2e-encryption.ts           | 53 -------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 test/end-to-end-tests/src/scenarios/e2e-encryption.ts

diff --git a/test/end-to-end-tests/src/scenario.ts b/test/end-to-end-tests/src/scenario.ts
index 6c6495fef1..f7479d17cb 100644
--- a/test/end-to-end-tests/src/scenario.ts
+++ b/test/end-to-end-tests/src/scenario.ts
@@ -17,7 +17,6 @@ limitations under the License.
 
 import { signup } from './usecases/signup';
 import { toastScenarios } from './scenarios/toast';
-import { e2eEncryptionScenarios } from './scenarios/e2e-encryption';
 import { ElementSession } from "./session";
 
 export async function scenario(createSession: (s: string) => Promise<ElementSession>): Promise<void> {
@@ -38,5 +37,4 @@ export async function scenario(createSession: (s: string) => Promise<ElementSess
     const bob = await createUser("bob");
 
     await toastScenarios(alice, bob);
-    await e2eEncryptionScenarios(alice, bob);
 }
diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.ts b/test/end-to-end-tests/src/scenarios/e2e-encryption.ts
deleted file mode 100644
index 17aa4bcc2f..0000000000
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { strict as assert } from 'assert';
-
-import { ElementSession } from "../session";
-import { sendMessage } from '../usecases/send-message';
-import { acceptInvite } from '../usecases/accept-invite';
-import { receiveMessage } from '../usecases/timeline';
-import { createDm } from '../usecases/create-room';
-import { checkRoomSettings } from '../usecases/room-settings';
-import { startSasVerification, acceptSasVerification } from '../usecases/verify';
-import { setupSecureBackup } from '../usecases/security';
-import { measureStart, measureStop } from '../util';
-
-export async function e2eEncryptionScenarios(alice: ElementSession, bob: ElementSession) {
-    console.log(" creating an e2e encrypted DM and join through invite:");
-    await createDm(bob, ['@alice:localhost']);
-    await checkRoomSettings(bob, { encryption: true }); // for sanity, should be e2e-by-default
-    await acceptInvite(alice, 'bob');
-    // do sas verification
-    bob.log.step(`starts SAS verification with ${alice.username}`);
-    await measureStart(bob, "mx_VerifyE2EEUser");
-    const bobSasPromise = startSasVerification(bob, alice.username);
-    const aliceSasPromise = acceptSasVerification(alice, bob.username);
-    // wait in parallel, so they don't deadlock on each other
-    // the logs get a bit messy here, but that's fine enough for debugging (hopefully)
-    const [bobSas, aliceSas] = await Promise.all([bobSasPromise, aliceSasPromise]);
-    assert.deepEqual(bobSas, aliceSas);
-    await measureStop(bob, "mx_VerifyE2EEUser");
-    bob.log.done(`done (match for ${bobSas.join(", ")})`);
-    const aliceMessage = "Guess what I just heard?!";
-    await sendMessage(alice, aliceMessage);
-    await receiveMessage(bob, { sender: "alice", body: aliceMessage, encrypted: true });
-    const bobMessage = "You've got to tell me!";
-    await sendMessage(bob, bobMessage);
-    await receiveMessage(alice, { sender: "bob", body: bobMessage, encrypted: true });
-    await setupSecureBackup(alice);
-}