summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-12-18 21:36:42 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-12-18 21:36:42 +0000
commita6ba41e0785f8f597713bd023e1f6dc3a3d966ea (patch)
treeb662216569581796de50fb4a4f309e0bee3242ce
parentMerge pull request #451 from matrix-org/markjh/branch_coverage (diff)
downloadsynapse-a6ba41e0785f8f597713bd023e1f6dc3a3d966ea.tar.xz
Actually look up required remote server key IDs
set.union() is a side-effect-free function that returns the union of two
sets. This clearly wanted .update(), which is the side-effecting mutator
version.
Diffstat (limited to '')
-rw-r--r--synapse/crypto/keyring.py4
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())