From e54bd5536e07182ac75092f717eb02b2fbe07838 Mon Sep 17 00:00:00 2001
From: Sam Wedgwood <sam@wedgwood.dev>
Date: Mon, 7 Aug 2023 16:37:38 +0100
Subject: [PATCH] remove confusing DefaultForDefaultRoomVersion

---
 clientapi/clientapi_test.go       |  6 +++++-
 setup/config/config_roomserver.go | 10 +---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/clientapi/clientapi_test.go b/clientapi/clientapi_test.go
index b964311f0..82ec9fea2 100644
--- a/clientapi/clientapi_test.go
+++ b/clientapi/clientapi_test.go
@@ -923,13 +923,17 @@ func TestCapabilities(t *testing.T) {
 		}
 	}
 
+	var tempRoomServerCfg config.RoomServer
+	tempRoomServerCfg.Defaults(config.DefaultOpts{})
+	defaultRoomVersion := tempRoomServerCfg.DefaultRoomVersion
+
 	expectedMap := map[string]interface{}{
 		"capabilities": map[string]interface{}{
 			"m.change_password": map[string]bool{
 				"enabled": true,
 			},
 			"m.room_versions": map[string]interface{}{
-				"default":   config.DefaultForDefaultRoomVersion(),
+				"default":   defaultRoomVersion,
 				"available": versionsMap,
 			},
 		},
diff --git a/setup/config/config_roomserver.go b/setup/config/config_roomserver.go
index 6b7c55e09..06e7757fb 100644
--- a/setup/config/config_roomserver.go
+++ b/setup/config/config_roomserver.go
@@ -16,7 +16,7 @@ type RoomServer struct {
 }
 
 func (c *RoomServer) Defaults(opts DefaultOpts) {
-	c.DefaultRoomVersion = DefaultForDefaultRoomVersion()
+	c.DefaultRoomVersion = gomatrixserverlib.RoomVersionV10
 	if opts.Generate {
 		if !opts.SingleDatabase {
 			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)
 	}
 }
-
-// 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
-}