diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go index c91c59ebc..297618c9d 100644 --- a/roomserver/storage/postgres/storage.go +++ b/roomserver/storage/postgres/storage.go @@ -20,8 +20,6 @@ import ( "database/sql" "encoding/json" - roomserverVersion "github.com/matrix-org/dendrite/roomserver/version" - // Import the postgres database driver. _ "github.com/lib/pq" "github.com/matrix-org/dendrite/roomserver/api" @@ -146,7 +144,7 @@ func extractRoomVersionFromCreateEvent(event gomatrixserverlib.Event) ( if event.Type() != gomatrixserverlib.MRoomCreate { return gomatrixserverlib.RoomVersion(""), nil } - roomVersion = roomserverVersion.DefaultRoomVersion() + roomVersion = gomatrixserverlib.RoomVersionV1 var createContent gomatrixserverlib.CreateContent // The m.room.create event contains an optional "room_version" key in // the event content, so we need to unmarshal that first. diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go index f6c692fd1..fdd1d0015 100644 --- a/roomserver/storage/sqlite3/storage.go +++ b/roomserver/storage/sqlite3/storage.go @@ -22,8 +22,6 @@ import ( "errors" "net/url" - roomserverVersion "github.com/matrix-org/dendrite/roomserver/version" - "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/types" @@ -175,7 +173,7 @@ func extractRoomVersionFromCreateEvent(event gomatrixserverlib.Event) ( if event.Type() != gomatrixserverlib.MRoomCreate { return gomatrixserverlib.RoomVersion(""), nil } - roomVersion = roomserverVersion.DefaultRoomVersion() + roomVersion = gomatrixserverlib.RoomVersionV1 var createContent gomatrixserverlib.CreateContent // The m.room.create event contains an optional "room_version" key in // the event content, so we need to unmarshal that first.