diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-09-20 01:32:42 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-09-20 01:32:42 +0100 |
| commit | fde63b880d32937b52a80815a08342449d9c4842 (patch) | |
| tree | 73429bfec9f67a7783b1c3ac75088ffadc6b32a8 /synapse/crypto | |
| parent | pull out handle_key_deferred to top level (diff) | |
| download | synapse-fde63b880d32937b52a80815a08342449d9c4842.tar.xz | |
Replace `server_and_json` with `verify_requests`
This is a precursor to factoring some of this code out.
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/keyring.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 0033ba06ba..32b107b17d 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -123,8 +123,8 @@ class Keyring(object): verify_requests.append(verify_request) server_to_deferred = { - server_name: defer.Deferred() - for server_name, _ in server_and_json + rq.server_name: defer.Deferred() + for rq in verify_requests } with PreserveLoggingContext(): @@ -132,7 +132,7 @@ class Keyring(object): # We want to wait for any previous lookups to complete before # proceeding. wait_on_deferred = self.wait_for_previous_lookups( - [server_name for server_name, _ in server_and_json], + [rq.server_name for rq in verify_requests], server_to_deferred, ) |