diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 042a640f0a..302e1e2f1f 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -105,7 +105,6 @@ class RoomVersions(object):
V1 = "1"
V2 = "2"
V3 = "3" # Not currently fully supported, so we don't add to known versions below
- VDH_TEST = "vdh-test-version"
STATE_V2_TEST = "state-v2-test"
@@ -117,7 +116,6 @@ DEFAULT_ROOM_VERSION = RoomVersions.V1
KNOWN_ROOM_VERSIONS = {
RoomVersions.V1,
RoomVersions.V2,
- RoomVersions.VDH_TEST,
RoomVersions.STATE_V2_TEST,
}
diff --git a/synapse/event_auth.py b/synapse/event_auth.py
index a95d142f0c..df30c2cea7 100644
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -448,7 +448,7 @@ def check_redaction(room_version, event, auth_events):
if user_level >= redact_level:
return False
- if room_version in (RoomVersions.V1, RoomVersions.V2, RoomVersions.VDH_TEST):
+ if room_version in (RoomVersions.V1, RoomVersions.V2,):
redacter_domain = get_domain_from_id(event.event_id)
redactee_domain = get_domain_from_id(event.redacts)
if redacter_domain == redactee_domain:
diff --git a/synapse/events/builder.py b/synapse/events/builder.py
index 7e63371095..9ca405b56b 100644
--- a/synapse/events/builder.py
+++ b/synapse/events/builder.py
@@ -38,7 +38,6 @@ def get_event_builder(room_version, key_values={}, internal_metadata_dict={}):
if room_version in {
RoomVersions.V1,
RoomVersions.V2,
- RoomVersions.VDH_TEST,
RoomVersions.STATE_V2_TEST,
}:
return EventBuilder(key_values, internal_metadata_dict)
@@ -101,7 +100,6 @@ class EventBuilderFactory(object):
if room_version not in {
RoomVersions.V1,
RoomVersions.V2,
- RoomVersions.VDH_TEST,
RoomVersions.STATE_V2_TEST,
}:
raise Exception(
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py
index 2fca51d0b2..125635b01a 100644
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
@@ -608,7 +608,7 @@ def resolve_events_with_store(room_version, state_sets, event_map, state_res_sto
state_sets, event_map, state_res_store.get_events,
)
elif room_version in (
- RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2,
+ RoomVersions.STATE_V2_TEST, RoomVersions.V2,
):
return v2.resolve_events_with_store(
room_version, state_sets, event_map, state_res_store,
|
