Use server's default room version to create new rooms (#269)

When we are creating a test room on the Complement server, use the same version
as the server defaults to.

Author: richvdh

internal/client/client.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/tidwall/gjson"
 
 	"github.com/matrix-org/complement/internal/b"
@@ -243,6 +244,30 @@ func (c *CSAPI) RegisterUser(t *testing.T, localpart, password string) (userID,
 	return userID, accessToken
 }
 
+// GetCapbabilities queries the server's capabilities
+func (c *CSAPI) GetCapabilities(t *testing.T) []byte {
+	t.Helper()
+	res := c.MustDoFunc(t, "GET", []string{"_matrix", "client", "r0", "capabilities"})
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		t.Fatalf("unable to read response body: %v", err)
+	}
+	return body
+}
+
+// GetDefaultRoomVersion returns the server's default room version
+func (c *CSAPI) GetDefaultRoomVersion(t *testing.T) gomatrixserverlib.RoomVersion {
+	t.Helper()
+	capabilities := c.GetCapabilities(t)
+	defaultVersion := gjson.GetBytes(capabilities, `capabilities.m\.room_versions.default`)
+	if !defaultVersion.Exists() {
+		// spec says use RoomV1 in this case
+		return gomatrixserverlib.RoomVersionV1
+	}
+
+	return gomatrixserverlib.RoomVersion(defaultVersion.Str)
+}
+
 // MustDo will do the HTTP request and fail the test if the response is not 2xx
 //
 // Deprecated: Prefer MustDoFunc. MustDo is the older format which doesn't allow for vargs

internal/federation/server.go

@@ -133,6 +133,7 @@ func (s *Server) MakeAliasMapping(aliasLocalpart, roomID string) string {
 // The `events` will be added to this room. Returns the created room.
 func (s *Server) MustMakeRoom(t *testing.T, roomVer gomatrixserverlib.RoomVersion, events []b.Event) *ServerRoom {
 	roomID := fmt.Sprintf("!%d:%s", len(s.rooms), s.ServerName)
+	t.Logf("Creating room %s with version %s", roomID, roomVer)
 	room := newRoom(roomVer, roomID)
 
 	// sign all these events

tests/federation_room_get_missing_events_test.go

@@ -36,6 +36,9 @@ import (
 func TestOutboundFederationIgnoresMissingEventWithBadJSONForRoomVersion6(t *testing.T) {
 	deployment := Deploy(t, b.BlueprintAlice)
 	defer deployment.Destroy(t)
+
+	alice := deployment.Client(t, "hs1", "@alice:hs1")
+
 	srv := federation.NewServer(t, deployment,
 		federation.HandleKeyRequests(),
 		federation.HandleMakeSendJoinRequests(),
@@ -52,12 +55,11 @@ func TestOutboundFederationIgnoresMissingEventWithBadJSONForRoomVersion6(t *test
 		onGetMissingEvents(w, req)
 	}).Methods("POST")
 
-	ver := gomatrixserverlib.RoomVersionV6
+	ver := alice.GetDefaultRoomVersion(t)
 	charlie := srv.UserID("charlie")
 	room := srv.MustMakeRoom(t, ver, federation.InitialRoomEvents(ver, charlie))
 	roomAlias := srv.MakeAliasMapping("flibble", room.RoomID)
 	// join the room
-	alice := deployment.Client(t, "hs1", "@alice:hs1")
 	alice.JoinRoom(t, roomAlias, nil)
 
 	latestEvent := room.Timeline[len(room.Timeline)-1]

tests/federation_room_join_test.go

@@ -36,6 +36,8 @@ func TestJoinViaRoomIDAndServerName(t *testing.T) {
 	deployment := Deploy(t, b.BlueprintFederationOneToOneRoom)
 	defer deployment.Destroy(t)
 
+	alice := deployment.Client(t, "hs1", "@alice:hs1")
+
 	acceptMakeSendJoinRequests := true
 
 	srv := federation.NewServer(t, deployment,
@@ -60,12 +62,11 @@ func TestJoinViaRoomIDAndServerName(t *testing.T) {
 		federation.SendJoinRequestsHandler(srv, w, req)
 	})).Methods("PUT")
 
-	ver := gomatrixserverlib.RoomVersionV5
+	ver := alice.GetDefaultRoomVersion(t)
 	charlie := srv.UserID("charlie")
 	serverRoom := srv.MustMakeRoom(t, ver, federation.InitialRoomEvents(ver, charlie))
 
 	// join the room by room ID, providing the serverName to join via
-	alice := deployment.Client(t, "hs1", "@alice:hs1")
 	alice.JoinRoom(t, serverRoom.RoomID, []string{srv.ServerName})
 
 	// remove the make/send join paths from the Complement server to force HS2 to join via HS1
@@ -101,6 +102,8 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 	deployment := Deploy(t, b.BlueprintAlice)
 	defer deployment.Destroy(t)
 
+	alice := deployment.Client(t, "hs1", "@alice:hs1")
+
 	srv := federation.NewServer(t, deployment,
 		federation.HandleKeyRequests(),
 		federation.HandleMakeSendJoinRequests(),
@@ -110,7 +113,7 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 	cancel := srv.Listen()
 	defer cancel()
 
-	ver := gomatrixserverlib.RoomVersionV6
+	ver := alice.GetDefaultRoomVersion(t)
 	charlie := srv.UserID("charlie")
 
 	// We explicitly do not run these in parallel in order to help debugging when these
@@ -135,7 +138,6 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		unsignedEvent, err := gomatrixserverlib.NewEventFromTrustedJSON(raw, false, ver)
 		must.NotError(t, "failed to make Event from unsigned event JSON", err)
 		room.AddEvent(unsignedEvent)
-		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})
 	t.Run("/send_join response with bad signatures shouldn't block room join", func(t *testing.T) {
@@ -164,7 +166,6 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		unsignedEvent, err := gomatrixserverlib.NewEventFromTrustedJSON(raw, false, ver)
 		must.NotError(t, "failed to make Event from unsigned event JSON", err)
 		room.AddEvent(unsignedEvent)
-		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})
 	t.Run("/send_join response with unobtainable keys shouldn't block room join", func(t *testing.T) {
@@ -194,7 +195,6 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		unsignedEvent, err := gomatrixserverlib.NewEventFromTrustedJSON(raw, false, ver)
 		must.NotError(t, "failed to make Event from unsigned event JSON", err)
 		room.AddEvent(unsignedEvent)
-		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})
 	t.Run("/send_join response with state with unverifiable auth events shouldn't block room join", func(t *testing.T) {
@@ -248,7 +248,6 @@ func TestJoinFederatedRoomWithUnverifiableEvents(t *testing.T) {
 		room.AddEvent(goodEvent)
 		t.Logf("Created state event %s", goodEvent.EventID())
 
-		alice := deployment.Client(t, "hs1", "@alice:hs1")
 		alice.JoinRoom(t, roomAlias, nil)
 	})
 }

tests/federation_room_send_test.go

@@ -22,6 +22,8 @@ func TestOutboundFederationSend(t *testing.T) {
 	deployment := Deploy(t, b.BlueprintAlice)
 	defer deployment.Destroy(t)
 
+	alice := deployment.Client(t, "hs1", "@alice:hs1")
+
 	waiter := NewWaiter()
 	wantEventType := "m.room.message"
 
@@ -45,13 +47,12 @@ func TestOutboundFederationSend(t *testing.T) {
 	defer cancel()
 
 	// the remote homeserver creates a public room
-	ver := gomatrixserverlib.RoomVersionV5
+	ver := alice.GetDefaultRoomVersion(t)
 	charlie := srv.UserID("charlie")
 	serverRoom := srv.MustMakeRoom(t, ver, federation.InitialRoomEvents(ver, charlie))
 	roomAlias := srv.MakeAliasMapping("flibble", serverRoom.RoomID)
 
 	// the local homeserver joins the room
-	alice := deployment.Client(t, "hs1", "@alice:hs1")
 	alice.JoinRoom(t, roomAlias, []string{docker.HostnameRunningComplement})
 
 	// the local homeserver sends an event into the room

tests/msc2836_test.go

@@ -187,6 +187,9 @@ func TestEventRelationships(t *testing.T) {
 func TestFederatedEventRelationships(t *testing.T) {
 	deployment := Deploy(t, b.BlueprintAlice)
 	defer deployment.Destroy(t)
+
+	alice := deployment.Client(t, "hs1", "@alice:hs1")
+
 	srv := federation.NewServer(t, deployment,
 		federation.HandleKeyRequests(),
 		federation.HandleMakeSendJoinRequests(),
@@ -195,7 +198,7 @@ func TestFederatedEventRelationships(t *testing.T) {
 	defer cancel()
 
 	// create a room on Complement, add some events to walk.
-	roomVer := gomatrixserverlib.RoomVersionV6
+	roomVer := alice.GetDefaultRoomVersion(t)
 	charlie := srv.UserID("charlie")
 	room := srv.MustMakeRoom(t, roomVer, federation.InitialRoomEvents(roomVer, charlie))
 	eventA := srv.MustCreateEvent(t, room, b.Event{
@@ -293,7 +296,6 @@ func TestFederatedEventRelationships(t *testing.T) {
 
 	// join the room on HS1
 	// HS1 will not have any of these messages, only the room state.
-	alice := deployment.Client(t, "hs1", "@alice:hs1")
 	alice.JoinRoom(t, room.RoomID, []string{srv.ServerName})
 
 	// send a new child in the thread (child of D) so the HS has something to latch on to.