diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
| commit | 28f09fcdd51796dd5036cb74e62b7a74d753f4be (patch) | |
| tree | 40f098938d04cf93c8f7bb7aa82af879479b3334 /synapse/federation/federation_client.py | |
| parent | more comments (diff) | |
| parent | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam... (diff) | |
| download | synapse-28f09fcdd51796dd5036cb74e62b7a74d753f4be.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 2761ffae07..87a92f6ea9 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -391,7 +391,7 @@ class FederationClient(FederationBase): """ if return_local: seen_events = yield self.store.get_events(event_ids, allow_rejected=True) - signed_events = seen_events.values() + signed_events = list(seen_events.values()) else: seen_events = yield self.store.have_seen_events(event_ids) signed_events = [] @@ -589,7 +589,7 @@ class FederationClient(FederationBase): } valid_pdus = yield self._check_sigs_and_hash_and_fetch( - destination, pdus.values(), + destination, list(pdus.values()), outlier=True, ) |