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

Actually look up required remote server key IDs

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py

index bc5bb5cdb1..1fea568eed 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -230,7 +230,9 @@ class Keyring(object):
 
             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())