From dbf6c9c8f80bd09a960cccf66a300a756c11a889 Mon Sep 17 00:00:00 2001
From: Michael Weimann <michaelw@matrix.org>
Date: Thu, 5 Jan 2023 13:55:26 +0100
Subject: [PATCH] Fix thousands of key requests after new session login

---
 .../setDeviceVerification.spec.ts             | 56 -------------------
 src/crypto/index.ts                           |  3 -
 2 files changed, 59 deletions(-)
 delete mode 100644 spec/unit/crypto/verification/setDeviceVerification.spec.ts

diff --git a/spec/unit/crypto/verification/setDeviceVerification.spec.ts b/spec/unit/crypto/verification/setDeviceVerification.spec.ts
deleted file mode 100644
index e1c07222663..00000000000
--- a/spec/unit/crypto/verification/setDeviceVerification.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2022 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 "../../../olm-loader";
-
-import { CRYPTO_ENABLED, MatrixClient } from "../../../../src/client";
-import { TestClient } from "../../../TestClient";
-
-const Olm = global.Olm;
-
-describe("crypto.setDeviceVerification", () => {
-    const userId = "@alice:example.com";
-    const deviceId1 = "device1";
-    let client: MatrixClient;
-
-    if (!CRYPTO_ENABLED) {
-        return;
-    }
-
-    beforeAll(async () => {
-        await Olm.init();
-    });
-
-    beforeEach(async () => {
-        client = new TestClient(userId, deviceId1).client;
-        await client.initCrypto();
-    });
-
-    it("client should provide crypto", () => {
-        expect(client.crypto).not.toBeUndefined();
-    });
-
-    describe("when setting an own device as verified", () => {
-        beforeEach(async () => {
-            jest.spyOn(client.crypto!, "cancelAndResendAllOutgoingKeyRequests");
-            await client.crypto!.setDeviceVerification(userId, deviceId1, true);
-        });
-
-        it("cancelAndResendAllOutgoingKeyRequests should be called", () => {
-            expect(client.crypto!.cancelAndResendAllOutgoingKeyRequests).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/src/crypto/index.ts b/src/crypto/index.ts
index 458132e75bb..441d569c4ac 100644
--- a/src/crypto/index.ts
+++ b/src/crypto/index.ts
@@ -2225,9 +2225,6 @@ export class Crypto extends TypedEventEmitter<CryptoEvent, CryptoEventHandlerMap
                 await upload({ shouldEmit: true });
                 // XXX: we'll need to wait for the device list to be updated
             }
-
-            // redo key requests after verification
-            this.cancelAndResendAllOutgoingKeyRequests();
         }
 
         const deviceObj = DeviceInfo.fromStorage(dev, deviceId);