diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-29 22:54:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 22:54:25 +0000 |
| commit | 7740eddd04504af1f60a96dda08d01904a238e0b (patch) | |
| tree | 4cc0284a797c9d240c10b8d4912bba1132ff289c /synapse/federation/federation_client.py | |
| parent | Merge pull request #4483 from matrix-org/erikj/event_v2 (diff) | |
| parent | Update comment (diff) | |
| download | synapse-7740eddd04504af1f60a96dda08d01904a238e0b.tar.xz | |
Merge pull request #4514 from matrix-org/erikj/remove_event_id
Remove usages of event ID's domain
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 9b4acd2ed7..4e4f58b418 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -205,7 +205,7 @@ class FederationClient(FederationBase): # FIXME: We should handle signature failures more gracefully. pdus[:] = yield logcontext.make_deferred_yieldable(defer.gatherResults( - self._check_sigs_and_hashes(pdus), + self._check_sigs_and_hashes(room_version, pdus), consumeErrors=True, ).addErrback(unwrapFirstError)) @@ -268,7 +268,7 @@ class FederationClient(FederationBase): pdu = pdu_list[0] # Check signatures are correct. - signed_pdu = yield self._check_sigs_and_hash(pdu) + signed_pdu = yield self._check_sigs_and_hash(room_version, pdu) break @@ -757,7 +757,7 @@ class FederationClient(FederationBase): pdu = event_from_pdu_json(pdu_dict, format_ver) # Check signatures are correct. - pdu = yield self._check_sigs_and_hash(pdu) + pdu = yield self._check_sigs_and_hash(room_version, pdu) # FIXME: We should handle signature failures more gracefully. |