Remove Features.RustCrypto

src/MatrixClientPeg.ts

@@ -35,13 +35,11 @@ import IdentityAuthClient from "./IdentityAuthClient";
 import { crossSigningCallbacks } from "./SecurityManager";
 import { SlidingSyncManager } from "./SlidingSyncManager";
 import { _t, UserFriendlyError } from "./languageHandler";
-import { SettingLevel } from "./settings/SettingLevel";
 import MatrixClientBackedController from "./settings/controllers/MatrixClientBackedController";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
 import PlatformPeg from "./PlatformPeg";
 import { formatList } from "./utils/FormattingUtils";
 import SdkConfig from "./SdkConfig";
-import { Features } from "./settings/Settings";
 import { setDeviceIsolationMode } from "./settings/controllers/DeviceIsolationModeController.ts";
 
 export interface IMatrixClientCreds {
@@ -333,11 +331,6 @@ class MatrixClientPegClass implements IMatrixClientPeg {
             logger.error("Warning! Not using an encryption key for rust crypto store.");
         }
 
-        // Record the fact that we used the Rust crypto stack with this client. This just guards against people
-        // rolling back to versions of EW that did not default to Rust crypto (which would lead to an error, since
-        // we cannot migrate from Rust to Legacy crypto).
-        await SettingsStore.setValue(Features.RustCrypto, null, SettingLevel.DEVICE, true);
-
         await this.matrixClient.initRustCrypto({
             storageKey: rustCryptoStoreKey,
             storagePassword: rustCryptoStorePassword,

src/settings/Settings.tsx

@@ -90,13 +90,6 @@ export enum Features {
     NotificationSettings2 = "feature_notification_settings2",
     OidcNativeFlow = "feature_oidc_native_flow",
     ReleaseAnnouncement = "feature_release_announcement",
-
-    /** If true, use the Rust crypto implementation.
-     *
-     * This is no longer read, but we continue to populate it on all devices, to guard against people rolling back to
-     * old versions of EW that do not use rust crypto by default.
-     */
-    RustCrypto = "feature_rust_crypto",
 }
 
 export const labGroupNames: Record<LabGroup, TranslationKey> = {
@@ -469,10 +462,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         description: _td("labs|oidc_native_flow_description"),
         default: false,
     },
-    [Features.RustCrypto]: {
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: true,
-    },
     /**
      * @deprecated in favor of {@link fontSizeDelta}
      */

test/unit-tests/MatrixClientPeg-test.ts

@@ -11,8 +11,6 @@ import fetchMockJest from "fetch-mock-jest";
 
 import { advanceDateAndTime, stubClient } from "../test-utils";
 import { IMatrixClientPeg, MatrixClientPeg as peg } from "../../src/MatrixClientPeg";
-import SettingsStore from "../../src/settings/SettingsStore";
-import { SettingLevel } from "../../src/settings/SettingLevel";
 
 jest.useFakeTimers();
 
@@ -81,27 +79,18 @@ describe("MatrixClientPeg", () => {
         });
 
         it("should initialise the rust crypto library by default", async () => {
-            const mockSetValue = jest.spyOn(SettingsStore, "setValue").mockResolvedValue(undefined);
-
             const mockInitRustCrypto = jest.spyOn(testPeg.safeGet(), "initRustCrypto").mockResolvedValue(undefined);
 
             const cryptoStoreKey = new Uint8Array([1, 2, 3, 4]);
             await testPeg.start({ rustCryptoStoreKey: cryptoStoreKey });
             expect(mockInitRustCrypto).toHaveBeenCalledWith({ storageKey: cryptoStoreKey });
-
-            // we should have stashed the setting in the settings store
-            expect(mockSetValue).toHaveBeenCalledWith("feature_rust_crypto", null, SettingLevel.DEVICE, true);
         });
 
         it("Should migrate existing login", async () => {
-            const mockSetValue = jest.spyOn(SettingsStore, "setValue").mockResolvedValue(undefined);
             const mockInitRustCrypto = jest.spyOn(testPeg.safeGet(), "initRustCrypto").mockResolvedValue(undefined);
 
             await testPeg.start();
             expect(mockInitRustCrypto).toHaveBeenCalledTimes(1);
-
-            // we should have stashed the setting in the settings store
-            expect(mockSetValue).toHaveBeenCalledWith("feature_rust_crypto", null, SettingLevel.DEVICE, true);
         });
     });
 });