summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-11-01 11:43:46 +0000
committerErik Johnston <erik@matrix.org>2018-11-01 11:43:46 +0000
commitb3dd6fa98199f58804df903195b6c5a1cc4686d7 (patch)
treeb8fc1c8941bab72ef5827b9442a04b4b734a2509 /synapse/state
parentMerge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff)
downloadsynapse-b3dd6fa98199f58804df903195b6c5a1cc4686d7.tar.xz
Add STATE_V2_TEST room version
Diffstat (limited to 'synapse/state')
-rw-r--r--synapse/state/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index 9b40b18d5b..943d5d6bb5 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -607,7 +607,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
         return v1.resolve_events_with_store(
             state_sets, event_map, state_res_store.get_events,
         )
-    elif room_version == RoomVersions.VDH_TEST:
+    elif room_version in (RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST):
         return v2.resolve_events_with_store(
             state_sets, event_map, state_res_store,
         )