Merge pull request #452 from matrix-org/paul/SYN-558

Actually look up required remote server key IDs
matrix-org · Dec 21, 2015 · 42a7a09 · 42a7a09
2 parents f85949b + a6ba41e
commit 42a7a09
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
@@ -230,7 +230,9 @@ def do_iterations():
 
             missing_keys = {}
             for group in group_id_to_group.values():
-                missing_keys.setdefault(group.server_name, set()).union(group.key_ids)
+                missing_keys.setdefault(group.server_name, set()).update(
+                    group.key_ids
+                )
 
             for fn in key_fetch_fns:
                 results = yield fn(missing_keys.items())