summary refs log tree commit diff
path: root/synapse/storage/keys.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-04-08 12:47:09 +0100
committerGitHub <noreply@github.com>2019-04-08 12:47:09 +0100
commit7fc1e17f4cccaabfa9240db1f5b3ef53322432b6 (patch)
treed662dca85c377fd0dc370c874384a225bc66db4f /synapse/storage/keys.py
parentAdd config option to block users from looking up 3PIDs (#5010) (diff)
parentchangelog (diff)
downloadsynapse-7fc1e17f4cccaabfa9240db1f5b3ef53322432b6.tar.xz
Merge pull request #5001 from matrix-org/rav/keyring_cleanups
Cleanups in the Keyring
Diffstat (limited to 'synapse/storage/keys.py')
-rw-r--r--synapse/storage/keys.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index 030cd1e5a3..f24ab3eedd 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -188,8 +188,8 @@ class KeyStore(SQLBaseStore):
         Args:
             server_keys (list): List of (server_name, key_id, source) triplets.
         Returns:
-            Dict mapping (server_name, key_id, source) triplets to dicts with
-            "ts_valid_until_ms" and "key_json" keys.
+            Deferred[dict[Tuple[str, str, str|None], list[dict]]]:
+                Dict mapping (server_name, key_id, source) triplets to lists of dicts
         """
 
         def _get_server_keys_json_txn(txn):