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.
matrix-org · May 23, 2019 · cc187f9 · cc187f9
1 parent 2e05211
commit cc187f9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/changelog.d/5235.misc b/changelog.d/5235.misc
@@ -0,0 +1 @@
+Remove unused VerifyKey.expired and .time_added fields.
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
@@ -589,7 +589,6 @@ def process_v2_response(self, from_server, response_json, requested_ids=[]):
  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 @@ def process_v2_response(self, from_server, response_json, requested_ids=[]):
  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"]