Merge pull request #1 from matrix-org/deleteunusedstuff

Delete unused method

Author: illicitonion

signedjson/key.py

@@ -73,25 +73,11 @@ def is_signing_algorithm_supported(key_id):
         return False
 
 
-def decode_verify_key_base64(algorithm, version, key_base64):
-    """Decode a base64 encoded verify key
-    Args:
-        algorithm (str): The algorithm the key is for (currently "ed25519").
-        version (str): Identifies this key out of the keys for this entity.
-        key_base64 (str): Base64 encoded bytes of the key.
-    Returns:
-        A VerifyKey object.
-    """
-    key_id = "%s:%s" % (algorithm, version)
-    key_bytes = decode_base64(key_base64)
-    return decode_verify_key_bytes(key_id, key_bytes)
-
-
 def decode_verify_key_bytes(key_id, key_bytes):
-    """Decode a base64 encoded verify key
+    """Decode a raw verify key
     Args:
         key_id (str): Identifies this key out of the keys for this entity.
-        key_base64 (str): Base64 encoded bytes of the key.
+        key_bytes (str): Raw bytes of the key.
     Returns:
         A VerifyKey object.
     """
@@ -130,7 +116,8 @@ def read_old_signing_keys(stream):
     keys = []
     for line in stream:
         algorithm, version, expired, key_base64 = line.split()
-        key = decode_verify_key_base64(algorithm, version, key_base64)
+        key_name = "%s:%s" % (algorithm, version,)
+        key = decode_verify_key_bytes(key_name, decode_base64(key_base64))
         key.expired = int(expired)
         keys.append(key)
     return keys

tests/test_key.py

@@ -5,10 +5,10 @@
     generate_signing_key,
     get_verify_key,
     decode_signing_key_base64,
+    decode_verify_key_bytes,
     encode_signing_key_base64,
     is_signing_algorithm_supported,
     encode_verify_key_base64,
-    decode_verify_key_base64,
     read_signing_keys,
     read_old_signing_keys,
     write_signing_keys
@@ -42,33 +42,14 @@ def test_decode_invalid_base64(self):
         with self.assertRaises(Exception):
             decode_signing_key_base64("ed25519", self.version, "not base 64")
 
-    def test_decode_invalid_algorithm(self):
+    def test_decode_signing_invalid_algorithm(self):
         with self.assertRaises(Exception):
             decode_signing_key_base64("not a valid alg", self.version, "")
 
     def test_decode_invalid_key(self):
         with self.assertRaises(Exception):
             decode_signing_key_base64("ed25519", self.version, "")
 
-    def test_decode_verify_key(self):
-        decoded_key = decode_verify_key_base64(
-            "ed25519", self.version, self.verify_key_base64
-        )
-        self.assertEquals(decoded_key.alg, "ed25519")
-        self.assertEquals(decoded_key.version, self.version)
-
-    def test_decode_verify_key_invalid_base64(self):
-        with self.assertRaises(Exception):
-            decode_verify_key_base64("ed25519", self.version, "not base 64")
-
-    def test_decode_verify_key_invalid_algorithm(self):
-        with self.assertRaises(Exception):
-            decode_verify_key_base64("not a valid alg", self.version, "")
-
-    def test_decode_verify_key_invalid_key(self):
-        with self.assertRaises(Exception):
-            decode_verify_key_base64("ed25519", self.version, "")
-
     def test_read_keys(self):
         stream = ["ed25519 %s %s" % (self.version, self.key_base64)]
         keys = read_signing_keys(stream)
@@ -79,6 +60,10 @@ def test_read_old_keys(self):
         keys = read_old_signing_keys(stream)
         self.assertEquals(len(keys), 1)
 
+    def test_decode_verify_invalid_algorithm(self):
+        with self.assertRaises(Exception):
+            decode_verify_key_bytes("not a valid alg", self.verify_key)
+
     def test_write_signing_keys(self):
         class MockStream(object):
             def write(self, data):