diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-11 11:12:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-11 11:12:37 +0100 |
| commit | 4902db1fc978d1c9a3681720cffc4dbb9d72dbea (patch) | |
| tree | ee78b86f62119a7605ab2fdd1bc8afd3953e7978 /synapse/storage/keys.py | |
| parent | Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-4902db1fc978d1c9a3681720cffc4dbb9d72dbea.tar.xz | |
Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse v0.20.0
Diffstat (limited to 'synapse/storage/keys.py')
| -rw-r--r-- | synapse/storage/keys.py | 5 |
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: |