From cc187f933796a8151f0d11c03ef6faa8d1949256 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 23 May 2019 11:46:05 +0100
Subject: [PATCH] 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.
---
 changelog.d/5235.misc     | 1 +
 synapse/crypto/keyring.py | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 changelog.d/5235.misc

diff --git a/changelog.d/5235.misc b/changelog.d/5235.misc
new file mode 100644
index 000000000..2296ad2a4
--- /dev/null
+++ 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
index badb5254e..ea910a2f2 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"]