diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-31 10:57:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 10:57:03 +0000 |
| commit | a5afdd15e570e29d98ea7ea71c72b0380fb885f6 (patch) | |
| tree | 9d983f0d42cfe743d75c51ebfa0fcbeab8c9f7c5 /synapse/federation | |
| parent | Merge pull request #6820 from matrix-org/rav/get_room_version_id (diff) | |
| parent | changelog (diff) | |
| download | synapse-a5afdd15e570e29d98ea7ea71c72b0380fb885f6.tar.xz | |
Merge pull request #6806 from matrix-org/rav/redact_changes/3
Pass room_version into add_hashes_and_signatures
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 4ac3d81cba..f99d17a7de 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -470,8 +470,6 @@ class FederationClient(FederationBase): if not room_version: raise UnsupportedRoomVersionError() - event_format = room_version_to_event_format(room_version_id) - pdu_dict = ret.get("event", None) if not isinstance(pdu_dict, dict): raise InvalidResponseError("Bad 'event' field in response") @@ -490,7 +488,7 @@ class FederationClient(FederationBase): self._clock, self.hostname, self.signing_key, - format_version=event_format, + room_version=room_version, event_dict=pdu_dict, ) |