mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 23:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove confusing DefaultForDefaultRoomVersion

Browse source
This commit is contained in:
Sam Wedgwood 2023-08-07 16:37:38 +01:00
parent 5eb20daf15
commit e54bd5536e
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clientapi/clientapi_test.go
View file

@ -923,13 +923,17 @@ func TestCapabilities(t *testing.T) {
} }
} }
var tempRoomServerCfg config.RoomServer
tempRoomServerCfg.Defaults(config.DefaultOpts{})
defaultRoomVersion := tempRoomServerCfg.DefaultRoomVersion
expectedMap := map[string]interface{}{ expectedMap := map[string]interface{}{
"capabilities": map[string]interface{}{ "capabilities": map[string]interface{}{
"m.change_password": map[string]bool{ "m.change_password": map[string]bool{
"enabled": true, "enabled": true,
}, },
"m.room_versions": map[string]interface{}{ "m.room_versions": map[string]interface{}{
"default": config.DefaultForDefaultRoomVersion(), "default": defaultRoomVersion,
"available": versionsMap, "available": versionsMap,
}, },
}, },

10
setup/config/config_roomserver.go
View file

@ -16,7 +16,7 @@ type RoomServer struct {
} }
func (c *RoomServer) Defaults(opts DefaultOpts) { func (c *RoomServer) Defaults(opts DefaultOpts) {
c.DefaultRoomVersion = DefaultForDefaultRoomVersion() c.DefaultRoomVersion = gomatrixserverlib.RoomVersionV10
if opts.Generate { if opts.Generate {
if !opts.SingleDatabase { if !opts.SingleDatabase {
c.Database.ConnectionString = "file:roomserver.db" c.Database.ConnectionString = "file:roomserver.db"
@ -35,11 +35,3 @@ func (c *RoomServer) Verify(configErrs *ConfigErrors) {
log.Warnf("WARNING: Provided default room version %q is unstable", c.DefaultRoomVersion) log.Warnf("WARNING: Provided default room version %q is unstable", c.DefaultRoomVersion)
} }
} }
// Returns the value that is the default for the room_server.default_room_version config key
//
// Do not use this if you want the default room version, use roomserverAPI.DefaultRoomVersion instead.
// This function exists for easier test writing.
func DefaultForDefaultRoomVersion() gomatrixserverlib.RoomVersion {
return gomatrixserverlib.RoomVersionV10
}