Use stable identifiers for faster joins (#583)

* Use stable identifiers for faster joins

* Pull in corresponding GMSL changes

```
$ go get -u github.com/matrix-org/gomatrixserverlib@dmr/msc-3706-stable-identifiers
go: downloading github.com/matrix-org/gomatrixserverlib v0.0.0-20230112185427-4f65e88d2a5b
go: downloading golang.org/x/crypto v0.5.0
go: downloading github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
go: downloading github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
go: downloading github.com/tidwall/gjson v1.14.4
go: downloading golang.org/x/sys v0.4.0
go: downloading github.com/tidwall/pretty v1.2.1
go: downloading golang.org/x/text v0.6.0
go: downloading golang.org/x/net v0.5.0
go: downloading golang.org/x/tools v0.1.12
go: downloading github.com/miekg/dns v1.1.50
go: downloading gopkg.in/h2non/gock.v1 v1.1.2
go: downloading github.com/stretchr/testify v1.8.0
go: upgraded github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 => v0.0.0-20220926102614-ceba4d9f7530
go: upgraded github.com/matrix-org/gomatrixserverlib v0.0.0-20220830164018-c71e518537a2 => v0.0.0-20230112185427-4f65e88d2a5b
go: upgraded github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 => v0.0.0-20221111132719-399730281e66
go: upgraded github.com/tidwall/gjson v1.14.3 => v1.14.4
go: upgraded github.com/tidwall/pretty v1.2.0 => v1.2.1
go: upgraded golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 => v0.5.0
go: upgraded golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 => v0.5.0
go: upgraded golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 => v0.4.0
go: upgraded golang.org/x/tools v0.1.9 => v0.1.12
go: upgraded gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b =>
v3.0.1
```

* Adapt to GMSL secondary server names change

See matrix-org/gomatrixserverlib#344

AFAICS passing nil means that the server isn't going to accept any
vhosting shenanigans.

* GMSL signing identity changes

matrix-org/gomatrixserverlib@900369e

* More `origin` arguments

there's probably a neater way to not write
`gomatrixserverlib.ServerName` but idk what the best thing to do is here.

* And some more that I missed due to build tags

* Need to call ServerName() after Listen()

* Update to GMSL PR changes

* And another one I missed

* And another one I missed

missed this one because struct fields are optional(?)

* Use main branch of GMSL

* Fix bad git hygiene

Author: David Robertson

go.mod

@@ -11,25 +11,24 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/gorilla/mux v1.8.0
-	github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16
-	github.com/matrix-org/gomatrixserverlib v0.0.0-20220830164018-c71e518537a2
-	github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20230113181222-67e060196d05
+	github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
 	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
 	github.com/sirupsen/logrus v1.9.0
-	github.com/tidwall/gjson v1.14.3
+	github.com/tidwall/gjson v1.14.4
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5
-	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
 	golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
 	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
-	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
-	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.org/x/tools v0.1.9
+	golang.org/x/tools v0.1.12
 	gonum.org/v1/plot v0.11.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	gotest.tools/v3 v3.0.3 // indirect
 	maunium.net/go/mautrix v0.11.0
 )

go.sum

@@ -18,7 +18,7 @@ import (
 func MakeJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request) {
 	// Check federation signature
 	fedReq, errResp := gomatrixserverlib.VerifyHTTPRequest(
-		req, time.Now(), gomatrixserverlib.ServerName(s.serverName), s.keyRing,
+		req, time.Now(), gomatrixserverlib.ServerName(s.serverName), nil, s.keyRing,
 	)
 	if fedReq == nil {
 		w.WriteHeader(errResp.Code)
@@ -125,7 +125,7 @@ func MakeRespMakeKnock(s *Server, room *ServerRoom, userID string) (resp gomatri
 // the current server is returned to the joining server.
 func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request, expectPartialState bool, omitServersInRoom bool) {
 	fedReq, errResp := gomatrixserverlib.VerifyHTTPRequest(
-		req, time.Now(), gomatrixserverlib.ServerName(s.serverName), s.keyRing,
+		req, time.Now(), gomatrixserverlib.ServerName(s.serverName), nil, s.keyRing,
 	)
 	if fedReq == nil {
 		w.WriteHeader(errResp.Code)
@@ -136,7 +136,7 @@ func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request
 
 	// if we expect a partial-state join, the request should have a "partial_state" flag
 	queryParams := req.URL.Query()
-	partialState := queryParams.Get("org.matrix.msc3706.partial_state")
+	partialState := queryParams.Get("omit_members")
 	if expectPartialState && partialState != "true" {
 		log.Printf("Not a partial-state request: got %v, want %s",
 			partialState, "true")
@@ -187,11 +187,11 @@ func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request
 
 	// return state and auth chain
 	b, err := json.Marshal(gomatrixserverlib.RespSendJoin{
-		Origin:        gomatrixserverlib.ServerName(s.serverName),
-		AuthEvents:    gomatrixserverlib.NewEventJSONsFromEvents(authEvents),
-		StateEvents:   gomatrixserverlib.NewEventJSONsFromEvents(stateEvents),
-		PartialState:  expectPartialState,
-		ServersInRoom: serversInRoom,
+		Origin:         gomatrixserverlib.ServerName(s.serverName),
+		AuthEvents:     gomatrixserverlib.NewEventJSONsFromEvents(authEvents),
+		StateEvents:    gomatrixserverlib.NewEventJSONsFromEvents(stateEvents),
+		MembersOmitted: expectPartialState,
+		ServersInRoom:  serversInRoom,
 	})
 	if err != nil {
 		w.WriteHeader(500)
@@ -238,7 +238,7 @@ func HandleInviteRequests(inviteCallback func(*gomatrixserverlib.Event)) func(*S
 		// https://matrix.org/docs/spec/server_server/r0.1.4#put-matrix-federation-v2-invite-roomid-eventid
 		s.mux.Handle("/_matrix/federation/v2/invite/{roomID}/{eventID}", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 			fedReq, errResp := gomatrixserverlib.VerifyHTTPRequest(
-				req, time.Now(), gomatrixserverlib.ServerName(s.serverName), s.keyRing,
+				req, time.Now(), gomatrixserverlib.ServerName(s.serverName), nil, s.keyRing,
 			)
 			if fedReq == nil {
 				w.WriteHeader(errResp.Code)
@@ -491,7 +491,7 @@ func HandleTransactionRequests(pduCallback func(*gomatrixserverlib.Event), eduCa
 
 			// Check federation signature
 			fedReq, errResp := gomatrixserverlib.VerifyHTTPRequest(
-				req, time.Now(), gomatrixserverlib.ServerName(srv.serverName), srv.keyRing,
+				req, time.Now(), gomatrixserverlib.ServerName(srv.serverName), nil, srv.keyRing,
 			)
 			if fedReq == nil {
 				log.Printf(

internal/federation/handle.go

@@ -186,8 +186,13 @@ func (s *Server) FederationClient(deployment *docker.Deployment) *gomatrixserver
 	if !s.listening {
 		s.t.Fatalf("FederationClient() called before Listen() - this is not supported because Listen() chooses a high-numbered port and thus changes the server name and thus changes the way federation requests are signed. Ensure you Listen() first!")
 	}
+	identity := gomatrixserverlib.SigningIdentity{
+		ServerName: gomatrixserverlib.ServerName(s.ServerName()),
+		KeyID:      s.KeyID,
+		PrivateKey: s.Priv,
+	}
 	f := gomatrixserverlib.NewFederationClient(
-		gomatrixserverlib.ServerName(s.serverName), s.KeyID, s.Priv,
+		[]*gomatrixserverlib.SigningIdentity{&identity},
 		gomatrixserverlib.WithTransport(&docker.RoundTripper{Deployment: deployment}),
 	)
 	return f
@@ -336,17 +341,18 @@ func (s *Server) MustCreateEvent(t *testing.T, room *ServerRoom, ev b.Event) *go
 // It returns the resultant room.
 func (s *Server) MustJoinRoom(t *testing.T, deployment *docker.Deployment, remoteServer gomatrixserverlib.ServerName, roomID string, userID string) *ServerRoom {
 	t.Helper()
+	origin := gomatrixserverlib.ServerName(s.serverName)
 	fedClient := s.FederationClient(deployment)
-	makeJoinResp, err := fedClient.MakeJoin(context.Background(), remoteServer, roomID, userID, SupportedRoomVersions())
+	makeJoinResp, err := fedClient.MakeJoin(context.Background(), origin, remoteServer, roomID, userID, SupportedRoomVersions())
 	if err != nil {
 		t.Fatalf("MustJoinRoom: make_join failed: %v", err)
 	}
 	roomVer := makeJoinResp.RoomVersion
-	joinEvent, err := makeJoinResp.JoinEvent.Build(time.Now(), gomatrixserverlib.ServerName(s.serverName), s.KeyID, s.Priv, roomVer)
+	joinEvent, err := makeJoinResp.JoinEvent.Build(time.Now(), origin, s.KeyID, s.Priv, roomVer)
 	if err != nil {
 		t.Fatalf("MustJoinRoom: failed to sign event: %v", err)
 	}
-	sendJoinResp, err := fedClient.SendJoin(context.Background(), gomatrixserverlib.ServerName(remoteServer), joinEvent)
+	sendJoinResp, err := fedClient.SendJoin(context.Background(), origin, remoteServer, joinEvent)
 	if err != nil {
 		t.Fatalf("MustJoinRoom: send_join failed: %v", err)
 	}
@@ -366,17 +372,18 @@ func (s *Server) MustJoinRoom(t *testing.T, deployment *docker.Deployment, remot
 // Leaves a room. If this is rejecting an invite then a make_leave request is made first, before send_leave.
 func (s *Server) MustLeaveRoom(t *testing.T, deployment *docker.Deployment, remoteServer gomatrixserverlib.ServerName, roomID string, userID string) {
 	t.Helper()
+	origin := gomatrixserverlib.ServerName(s.serverName)
 	fedClient := s.FederationClient(deployment)
 	var leaveEvent *gomatrixserverlib.Event
 	room := s.rooms[roomID]
 	if room == nil {
 		// e.g rejecting an invite
-		makeLeaveResp, err := fedClient.MakeLeave(context.Background(), remoteServer, roomID, userID)
+		makeLeaveResp, err := fedClient.MakeLeave(context.Background(), origin, remoteServer, roomID, userID)
 		if err != nil {
 			t.Fatalf("MustLeaveRoom: (rejecting invite) make_leave failed: %v", err)
 		}
 		roomVer := makeLeaveResp.RoomVersion
-		leaveEvent, err = makeLeaveResp.LeaveEvent.Build(time.Now(), gomatrixserverlib.ServerName(s.serverName), s.KeyID, s.Priv, roomVer)
+		leaveEvent, err = makeLeaveResp.LeaveEvent.Build(time.Now(), origin, s.KeyID, s.Priv, roomVer)
 		if err != nil {
 			t.Fatalf("MustLeaveRoom: (rejecting invite) failed to sign event: %v", err)
 		}
@@ -391,7 +398,7 @@ func (s *Server) MustLeaveRoom(t *testing.T, deployment *docker.Deployment, remo
 			},
 		})
 	}
-	err := fedClient.SendLeave(context.Background(), gomatrixserverlib.ServerName(remoteServer), leaveEvent)
+	err := fedClient.SendLeave(context.Background(), origin, remoteServer, leaveEvent)
 	if err != nil {
 		t.Fatalf("MustLeaveRoom: send_leave failed: %v", err)
 	}
@@ -407,7 +414,7 @@ func (s *Server) ValidFederationRequest(t *testing.T, handler func(fr *gomatrixs
 	return func(w http.ResponseWriter, req *http.Request) {
 		// Check federation signature
 		fedReq, errResp := gomatrixserverlib.VerifyHTTPRequest(
-			req, time.Now(), gomatrixserverlib.ServerName(s.serverName), s.keyRing,
+			req, time.Now(), gomatrixserverlib.ServerName(s.serverName), nil, s.keyRing,
 		)
 		if fedReq == nil {
 			t.Errorf(

internal/federation/server.go

@@ -138,7 +138,7 @@ func TestIsDirectFlagFederation(t *testing.T) {
 		t.Fatalf("failed to make invite request: %s", err)
 	}
 	_, since := alice.MustSync(t, client.SyncReq{})
-	_, err = srv.FederationClient(deployment).SendInviteV2(context.Background(), "hs1", inviteReq)
+	_, err = srv.FederationClient(deployment).SendInviteV2(context.Background(), gomatrixserverlib.ServerName(srv.ServerName()), "hs1", inviteReq)
 	if err != nil {
 		t.Fatalf("failed to send invite v2: %s", err)
 	}

tests/direct_messaging_test.go

@@ -77,7 +77,7 @@ func TestEventAuth(t *testing.T) {
 	getEventAuth := func(t *testing.T, eventID string, wantAuthEventIDs []string) {
 		t.Helper()
 		t.Logf("/event_auth for %s - want %v", eventID, wantAuthEventIDs)
-		eventAuthResp, err := srv.FederationClient(deployment).GetEventAuth(context.Background(), "hs1", room.Version, roomID, eventID)
+		eventAuthResp, err := srv.FederationClient(deployment).GetEventAuth(context.Background(), gomatrixserverlib.ServerName(srv.ServerName()), "hs1", room.Version, roomID, eventID)
 		must.NotError(t, "failed to /event_auth", err)
 		if len(eventAuthResp.AuthEvents) == 0 {
 			t.Fatalf("/event_auth returned 0 auth events")

tests/federation_event_auth_test.go

@@ -79,11 +79,13 @@ func TestInboundFederationProfile(t *testing.T) {
 	)
 	cancel := srv.Listen()
 	defer cancel()
+	origin := gomatrixserverlib.ServerName(srv.ServerName())
 
 	// sytest: Non-numeric ports in server names are rejected
 	t.Run("Non-numeric ports in server names are rejected", func(t *testing.T) {
 		fedReq := gomatrixserverlib.NewFederationRequest(
 			"GET",
+			origin,
 			"hs1",
 			"/_matrix/federation/v1/query/profile"+
 				"?user_id=@user1:localhost:http"+
@@ -114,6 +116,7 @@ func TestInboundFederationProfile(t *testing.T) {
 
 		fedReq := gomatrixserverlib.NewFederationRequest(
 			"GET",
+			origin,
 			"hs1",
 			"/_matrix/federation/v1/query/profile"+
 				"?user_id=@alice:hs1"+

tests/federation_query_profile_test.go

@@ -261,6 +261,7 @@ func TestOutboundFederationIgnoresMissingEventWithBadJSONForRoomVersion6(t *test
 	fedClient := srv.FederationClient(deployment)
 	resp, err := fedClient.SendTransaction(context.Background(), gomatrixserverlib.Transaction{
 		TransactionID: "wut",
+		Origin:        gomatrixserverlib.ServerName(srv.ServerName()),
 		Destination:   gomatrixserverlib.ServerName("hs1"),
 		PDUs: []json.RawMessage{
 			sentEvent.JSON(),
@@ -306,6 +307,7 @@ func TestOutboundFederationIgnoresMissingEventWithBadJSONForRoomVersion6(t *test
 
 	resp, err = fedClient.SendTransaction(context.Background(), gomatrixserverlib.Transaction{
 		TransactionID: "t2",
+		Origin:        gomatrixserverlib.ServerName(srv.ServerName()),
 		Destination:   gomatrixserverlib.ServerName("hs1"),
 		PDUs: []json.RawMessage{
 			message3.JSON(),
@@ -367,7 +369,10 @@ func TestInboundCanReturnMissingEvents(t *testing.T) {
 			room := srv.MustJoinRoom(t, deployment, "hs1", roomID, charlie)
 			alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(charlie, roomID))
 
-			req := gomatrixserverlib.NewFederationRequest("POST", "hs1",
+			req := gomatrixserverlib.NewFederationRequest(
+				"POST",
+				gomatrixserverlib.ServerName(srv.ServerName()),
+				"hs1",
 				fmt.Sprintf("/_matrix/federation/v1/get_missing_events/%s", roomID),
 			)
 

tests/federation_room_get_missing_events_test.go

@@ -1560,7 +1560,7 @@ func TestPartialStateJoin(t *testing.T) {
 		fedClient2 := testServer2.FederationClient(deployment)
 
 		// charlie sends a make_join
-		_, err := fedClient2.MakeJoin(context.Background(), "hs1", roomID, testServer2.UserID("charlie"), federation.SupportedRoomVersions())
+		_, err := fedClient2.MakeJoin(context.Background(), gomatrixserverlib.ServerName(testServer2.ServerName()), "hs1", roomID, testServer2.UserID("charlie"), federation.SupportedRoomVersions())
 
 		if err == nil {
 			t.Errorf("MakeJoin returned 200, want 404")
@@ -1627,7 +1627,7 @@ func TestPartialStateJoin(t *testing.T) {
 
 		// SendJoin should return a 404 because the homeserver under test has not
 		// finished its partial join.
-		_, err = fedClient2.SendJoin(context.Background(), "hs1", joinEvent)
+		_, err = fedClient2.SendJoin(context.Background(), gomatrixserverlib.ServerName(testServer2.ServerName()), "hs1", joinEvent)
 		if err == nil {
 			t.Errorf("SendJoin returned 200, want 404")
 		} else if httpError, ok := err.(gomatrix.HTTPError); ok {
@@ -1733,7 +1733,7 @@ func TestPartialStateJoin(t *testing.T) {
 		fedClient2 := testServer2.FederationClient(deployment)
 
 		// charlie sends a make_knock
-		_, err := fedClient2.MakeKnock(context.Background(), "hs1", roomID, testServer2.UserID("charlie"), federation.SupportedRoomVersions())
+		_, err := fedClient2.MakeKnock(context.Background(), gomatrixserverlib.ServerName(testServer2.ServerName()), "hs1", roomID, testServer2.UserID("charlie"), federation.SupportedRoomVersions())
 
 		if err == nil {
 			t.Errorf("MakeKnock returned 200, want 404")
@@ -1800,7 +1800,7 @@ func TestPartialStateJoin(t *testing.T) {
 
 		// SendKnock should return a 404 because the homeserver under test has not
 		// finished its partial join.
-		_, err = fedClient2.SendKnock(context.Background(), "hs1", knockEvent)
+		_, err = fedClient2.SendKnock(context.Background(), gomatrixserverlib.ServerName(testServer2.ServerName()), "hs1", knockEvent)
 		if err == nil {
 			t.Errorf("SendKnock returned 200, want 404")
 		} else if httpError, ok := err.(gomatrix.HTTPError); ok {
@@ -3323,7 +3323,7 @@ func testReceiveEventDuringPartialStateJoin(
 	// is resolved. For now, we use this to check whether Synapse has calculated the partial state
 	// flag for the last event correctly.
 
-	stateReq := gomatrixserverlib.NewFederationRequest("GET", "hs1",
+	stateReq := gomatrixserverlib.NewFederationRequest("GET", gomatrixserverlib.ServerName(psjResult.Server.ServerName()), "hs1",
 		fmt.Sprintf("/_matrix/federation/v1/state_ids/%s?event_id=%s",
 			url.PathEscape(psjResult.ServerRoom.RoomID),
 			url.QueryEscape(event.EventID()),
@@ -3367,7 +3367,7 @@ func testReceiveEventDuringPartialStateJoin(
 	)
 
 	// check the server's idea of the state at the event. We do this by making a `state_ids` request over federation
-	stateReq = gomatrixserverlib.NewFederationRequest("GET", "hs1",
+	stateReq = gomatrixserverlib.NewFederationRequest("GET", gomatrixserverlib.ServerName(psjResult.Server.ServerName()), "hs1",
 		fmt.Sprintf("/_matrix/federation/v1/state_ids/%s?event_id=%s",
 			url.PathEscape(psjResult.ServerRoom.RoomID),
 			url.QueryEscape(event.EventID()),

tests/federation_room_join_partial_state_test.go

@@ -267,6 +267,7 @@ func TestBannedUserCannotSendJoin(t *testing.T) {
 		federation.HandleTransactionRequests(nil, nil),
 	)
 	cancel := srv.Listen()
+	origin := gomatrixserverlib.ServerName(srv.ServerName())
 	defer cancel()
 
 	fedClient := srv.FederationClient(deployment)
@@ -289,7 +290,7 @@ func TestBannedUserCannotSendJoin(t *testing.T) {
 	})
 
 	// charlie sends a make_join for a different user
-	makeJoinResp, err := fedClient.MakeJoin(context.Background(), "hs1", roomID, srv.UserID("charlie2"), federation.SupportedRoomVersions())
+	makeJoinResp, err := fedClient.MakeJoin(context.Background(), origin, "hs1", roomID, srv.UserID("charlie2"), federation.SupportedRoomVersions())
 	must.NotError(t, "MakeJoin", err)
 
 	// ... and does a switcheroo to turn it into a join for himself
@@ -299,7 +300,7 @@ func TestBannedUserCannotSendJoin(t *testing.T) {
 	must.NotError(t, "JoinEvent.Build", err)
 
 	// SendJoin should return a 403.
-	_, err = fedClient.SendJoin(context.Background(), "hs1", joinEvent)
+	_, err = fedClient.SendJoin(context.Background(), origin, "hs1", joinEvent)
 	if err == nil {
 		t.Errorf("SendJoin returned 200, want 403")
 	} else if httpError, ok := err.(gomatrix.HTTPError); ok {
@@ -380,7 +381,7 @@ func testValidationForSendMembershipEndpoint(t *testing.T, baseApiPath, expected
 			url.PathEscape(event.EventID()),
 		)
 		t.Logf("PUT %s", path)
-		req := gomatrixserverlib.NewFederationRequest("PUT", "hs1", path)
+		req := gomatrixserverlib.NewFederationRequest("PUT", gomatrixserverlib.ServerName(srv.ServerName()), "hs1", path)
 		if err := req.SetContent(event); err != nil {
 			t.Errorf("req.SetContent: %v", err)
 			return
@@ -469,6 +470,7 @@ func TestSendJoinPartialStateResponse(t *testing.T) {
 	)
 	cancel := srv.Listen()
 	defer cancel()
+	origin := gomatrixserverlib.ServerName(srv.ServerName())
 
 	// annoyingly we can't get to the room that alice and bob already share (see https://github.com/matrix-org/complement/issues/254)
 	// so we have to create a new one.
@@ -481,25 +483,25 @@ func TestSendJoinPartialStateResponse(t *testing.T) {
 	// now we send a make_join...
 	charlie := srv.UserID("charlie")
 	fedClient := srv.FederationClient(deployment)
-	makeJoinResp, err := fedClient.MakeJoin(context.Background(), "hs1", roomID, charlie, federation.SupportedRoomVersions())
+	makeJoinResp, err := fedClient.MakeJoin(context.Background(), origin, "hs1", roomID, charlie, federation.SupportedRoomVersions())
 	if err != nil {
 		t.Fatalf("make_join failed: %v", err)
 	}
 
 	// ... construct a signed join event ...
 	roomVer := makeJoinResp.RoomVersion
-	joinEvent, err := makeJoinResp.JoinEvent.Build(time.Now(), gomatrixserverlib.ServerName(srv.ServerName()), srv.KeyID, srv.Priv, roomVer)
+	joinEvent, err := makeJoinResp.JoinEvent.Build(time.Now(), origin, srv.KeyID, srv.Priv, roomVer)
 	if err != nil {
 		t.Fatalf("failed to sign join event: %v", err)
 	}
 
 	// and send_join it, with the magic param
-	sendJoinResp, err := fedClient.SendJoinPartialState(context.Background(), "hs1", joinEvent)
+	sendJoinResp, err := fedClient.SendJoinPartialState(context.Background(), origin, "hs1", joinEvent)
 	if err != nil {
 		t.Fatalf("send_join failed: %v", err)
 	}
 
-	if !sendJoinResp.PartialState {
+	if !sendJoinResp.MembersOmitted {
 		t.Skip("Server does not support partial_state")
 	}
 
@@ -519,16 +521,16 @@ func TestSendJoinPartialStateResponse(t *testing.T) {
 	})
 
 	// check the returned auth events match those expected.
-    // Now that we include heroes in the partial join response,
-    // all of the events are included under "state" and so we don't expect any
+	// Now that we include heroes in the partial join response,
+	// all of the events are included under "state" and so we don't expect any
 	// extra auth_events.
 	// TODO: add in a second e.g. power_levels event so that we add stuff to the
 	// auth chain.
 	var returnedAuthEventKeys []interface{}
 	for _, ev := range sendJoinResp.AuthEvents {
 		returnedAuthEventKeys = append(returnedAuthEventKeys, typeAndStateKeyForEvent(gjson.ParseBytes(ev)))
 	}
-	must.CheckOffAll(t, returnedAuthEventKeys, []interface{}{ })
+	must.CheckOffAll(t, returnedAuthEventKeys, []interface{}{})
 
 	// check the server list. Only one, so we can use HaveInOrder even though the list is unordered
 	must.HaveInOrder(t, sendJoinResp.ServersInRoom, []string{"hs1"})