Merge pull request #282 from matrix-org/erikj/missing_keys

Fix bug where we sometimes didn't fetch all the keys requested for a server.
This commit is contained in:
Erik Johnston 2015-09-23 09:22:01 +01:00
commit d2fc591619

View file

@ -228,10 +228,9 @@ class Keyring(object):
def do_iterations(): def do_iterations():
merged_results = {} merged_results = {}
missing_keys = { missing_keys = {}
group.server_name: set(group.key_ids) for group in group_id_to_group.values():
for group in group_id_to_group.values() missing_keys.setdefault(group.server_name, set()).union(group.key_ids)
}
for fn in key_fetch_fns: for fn in key_fetch_fns:
results = yield fn(missing_keys.items()) results = yield fn(missing_keys.items())