summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-01-31 10:57:03 +0000
committerGitHub <noreply@github.com>2020-01-31 10:57:03 +0000
commita5afdd15e570e29d98ea7ea71c72b0380fb885f6 (patch)
tree9d983f0d42cfe743d75c51ebfa0fcbeab8c9f7c5 /tests/handlers
parentMerge pull request #6820 from matrix-org/rav/get_room_version_id (diff)
parentchangelog (diff)
downloadsynapse-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 'tests/handlers')
-rw-r--r--tests/handlers/test_presence.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index e92e090c3c..c171038df8 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -19,7 +19,7 @@ from mock import Mock, call
 from signedjson.key import generate_signing_key
 
 from synapse.api.constants import EventTypes, Membership, PresenceState
-from synapse.events import room_version_to_event_format
+from synapse.api.room_versions import KNOWN_ROOM_VERSIONS
 from synapse.events.builder import EventBuilder
 from synapse.handlers.presence import (
     EXTERNAL_PROCESS_EXPIRY,
@@ -597,7 +597,7 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
             clock=self.clock,
             hostname=hostname,
             signing_key=self.random_signing_key,
-            format_version=room_version_to_event_format(room_version),
+            room_version=KNOWN_ROOM_VERSIONS[room_version],
             room_id=room_id,
             type=EventTypes.Member,
             sender=user_id,