Remove SignedCurve25519 variant of DeviceKeyAlgorithm

Author: andybalaam

src/identifiers.rs

@@ -163,17 +163,14 @@ impl DeviceKeyAlgorithm {
 #[derive(Debug)]
 pub enum DeviceKeyAlgorithmName {
     /// The Ed25519 signature algorithm.
-    Ed25519,
+    Ed25519 = 0,
 
     /// The Curve25519 ECDH algorithm.
-    Curve25519,
-
-    /// The Curve25519 ECDH algorithm, but the key also contains
-    /// signatures.
-    SignedCurve25519,
+    Curve25519 = 1,
 
+    // SignedCurve25519 = 2 used to exist but was removed from Ruma
     /// An unknown device key algorithm.
-    Unknown,
+    Unknown = 3,
 }
 
 impl TryFrom<DeviceKeyAlgorithmName> for ruma::DeviceKeyAlgorithm {
@@ -185,7 +182,6 @@ impl TryFrom<DeviceKeyAlgorithmName> for ruma::DeviceKeyAlgorithm {
         Ok(match value {
             Ed25519 => Self::Ed25519,
             Curve25519 => Self::Curve25519,
-            SignedCurve25519 => Self::SignedCurve25519,
             Unknown => {
                 return Err(JsError::new(
                     "The `DeviceKeyAlgorithmName.Unknown` variant cannot be converted",
@@ -202,7 +198,6 @@ impl From<ruma::DeviceKeyAlgorithm> for DeviceKeyAlgorithmName {
         match value {
             Ed25519 => Self::Ed25519,
             Curve25519 => Self::Curve25519,
-            SignedCurve25519 => Self::SignedCurve25519,
             _ => Self::Unknown,
         }
     }

tests/identifiers.test.js

@@ -61,14 +61,6 @@ describe(DeviceKeyId.name, () => {
             deviceId: "foobar",
         },
 
-        {
-            name: "signed curve25519",
-            id: "signed_curve25519:foobar",
-            algorithmName: DeviceKeyAlgorithmName.SignedCurve25519,
-            algorithm: "signed_curve25519",
-            deviceId: "foobar",
-        },
-
         {
             name: "unknown",
             id: "hello:foobar",
@@ -92,7 +84,6 @@ describe("DeviceKeyAlgorithmName", () => {
     test("has the correct variants", () => {
         expect(DeviceKeyAlgorithmName.Ed25519).toStrictEqual(0);
         expect(DeviceKeyAlgorithmName.Curve25519).toStrictEqual(1);
-        expect(DeviceKeyAlgorithmName.SignedCurve25519).toStrictEqual(2);
         expect(DeviceKeyAlgorithmName.Unknown).toStrictEqual(3);
     });
 });