diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-20 06:39:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 06:39:55 -0400 |
| commit | 76c43f086a3c5feeab1fd0f916086930d44fb1cf (patch) | |
| tree | d03c010db83df55d6ae5f403d57aad46cedf0c93 /synapse/crypto/keyring.py | |
| parent | Close the database connection we create during startup (#8131) (diff) | |
| download | synapse-76c43f086a3c5feeab1fd0f916086930d44fb1cf.tar.xz | |
Do not assume calls to runInteraction return Deferreds. (#8133)
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 28ef7cfdb9..81c4b430b2 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -757,9 +757,8 @@ class ServerKeyFetcher(BaseV2KeyFetcher): except Exception: logger.exception("Error getting keys %s from %s", key_ids, server_name) - return await yieldable_gather_results( - get_key, keys_to_fetch.items() - ).addCallback(lambda _: results) + await yieldable_gather_results(get_key, keys_to_fetch.items()) + return results async def get_server_verify_key_v2_direct(self, server_name, key_ids): """ @@ -769,7 +768,7 @@ class ServerKeyFetcher(BaseV2KeyFetcher): key_ids (iterable[str]): Returns: - Deferred[dict[str, FetchKeyResult]]: map from key ID to lookup result + dict[str, FetchKeyResult]: map from key ID to lookup result Raises: KeyLookupError if there was a problem making the lookup |