summary refs log tree commit diff
path: root/synapse/storage/keys.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-03-22 17:12:55 +0000
committerGitHub <noreply@github.com>2017-03-22 17:12:55 +0000
commit35e0cfb54d530e82800281958d8c64288ad718c5 (patch)
tree3dd2cb34ec509c5d81565305725684f05cfd5eab /synapse/storage/keys.py
parentMerge pull request #2042 from matrix-org/rav/fix_key_caching (diff)
parentfix up some key verif docstrings (diff)
downloadsynapse-35e0cfb54d530e82800281958d8c64288ad718c5.tar.xz
Merge pull request #2044 from matrix-org/rav/crypto_docs
fix up some key verif docstrings
Diffstat (limited to 'synapse/storage/keys.py')
-rw-r--r--synapse/storage/keys.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index 86b37b9ddd..3b5e0a4fb9 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -101,9 +101,10 @@ class KeyStore(SQLBaseStore):
         key_ids
         Args:
             server_name (str): The name of the server.
-            key_ids (list of str): List of key_ids to try and look up.
+            key_ids (iterable[str]): key_ids to try and look up.
         Returns:
-            (list of VerifyKey): The verification keys.
+            Deferred: resolves to dict[str, VerifyKey]: map from
+               key_id to verification key.
         """
         keys = {}
         for key_id in key_ids: