Merge pull request #4307 from matrix-org/erikj/v2_rooms

Add v2 room version
This commit is contained in:
Richard van der Hoff 2018-12-24 10:48:59 +01:00 committed by GitHub
commit cd018e3543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions

View file

@ -607,7 +607,9 @@ 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 in (RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST):
elif room_version in (
RoomVersions.VDH_TEST, RoomVersions.STATE_V2_TEST, RoomVersions.V2,
):
return v2.resolve_events_with_store(
state_sets, event_map, state_res_store,
)