Replace server_and_json with verify_requests

This is a precursor to factoring some of this code out.
This commit is contained in:
Richard van der Hoff 2017-09-20 01:32:42 +01:00
parent 2d511defd9
commit fde63b880d

View file

@ -123,8 +123,8 @@ class Keyring(object):
verify_requests.append(verify_request) verify_requests.append(verify_request)
server_to_deferred = { server_to_deferred = {
server_name: defer.Deferred() rq.server_name: defer.Deferred()
for server_name, _ in server_and_json for rq in verify_requests
} }
with PreserveLoggingContext(): with PreserveLoggingContext():
@ -132,7 +132,7 @@ class Keyring(object):
# We want to wait for any previous lookups to complete before # We want to wait for any previous lookups to complete before
# proceeding. # proceeding.
wait_on_deferred = self.wait_for_previous_lookups( 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, server_to_deferred,
) )