summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-05-23 11:46:05 +0100
committerGitHub <noreply@github.com>2019-05-23 11:46:05 +0100
commitcc187f933796a8151f0d11c03ef6faa8d1949256 (patch)
tree8d53e4c7b171062cee193a2a775f365372c97f1a /synapse
parentRewrite store_server_verify_key to store several keys at once (#5234) (diff)
downloadsynapse-cc187f933796a8151f0d11c03ef6faa8d1949256.tar.xz
Remove unused VerifyKey.expired and .time_added fields (#5235)
These were never used, and poking arbitary data into objects from other
packages seems confusing at best.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/crypto/keyring.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index badb5254ea..ea910a2f21 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -589,7 +589,6 @@ class Keyring(object):
                 key_base64 = key_data["key"]
                 key_bytes = decode_base64(key_base64)
                 verify_key = decode_verify_key_bytes(key_id, key_bytes)
-                verify_key.time_added = time_now_ms
                 verify_keys[key_id] = verify_key
 
         old_verify_keys = {}
@@ -598,8 +597,6 @@ class Keyring(object):
                 key_base64 = key_data["key"]
                 key_bytes = decode_base64(key_base64)
                 verify_key = decode_verify_key_bytes(key_id, key_bytes)
-                verify_key.expired = key_data["expired_ts"]
-                verify_key.time_added = time_now_ms
                 old_verify_keys[key_id] = verify_key
 
         server_name = response_json["server_name"]