Finish off srv

Author: MadLittleMods

federation/server.go

@@ -219,15 +219,18 @@ func (s *Server) FederationClient(deployment FederationDeployment) fclient.Feder
 
 // MustSendTransaction sends the given PDUs/EDUs to the target destination, returning an error if the /send fails or if the response contains an error
 // for any sent PDUs. Times out after 10 seconds.
-func (s *Server) MustSendTransaction(t ct.TestLike, deployment FederationDeployment, destination string, pdus []json.RawMessage, edus []gomatrixserverlib.EDU) {
+//
+// Args:
+//   - `destination`: This should be a resolvable addresses within the deployment network.
+func (s *Server) MustSendTransaction(t ct.TestLike, deployment FederationDeployment, destination spec.ServerName, pdus []json.RawMessage, edus []gomatrixserverlib.EDU) {
 	t.Helper()
 	cli := s.FederationClient(deployment)
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 	resp, err := cli.SendTransaction(ctx, gomatrixserverlib.Transaction{
 		TransactionID: gomatrixserverlib.TransactionID(fmt.Sprintf("complement-%d", time.Now().Nanosecond())),
 		Origin:        spec.ServerName(s.ServerName()),
-		Destination:   spec.ServerName(destination),
+		Destination:   destination,
 		PDUs:          pdus,
 		EDUs:          edus,
 	})
@@ -320,6 +323,9 @@ func (s *Server) MustCreateEvent(t ct.TestLike, room *ServerRoom, ev Event) goma
 
 // MustJoinRoom will make the server send a make_join and a send_join to join a room
 // It returns the resultant room.
+//
+// Args:
+//   - `remoteServer`: This should be a resolvable addresses within the deployment network.
 func (s *Server) MustJoinRoom(t ct.TestLike, deployment FederationDeployment, remoteServer spec.ServerName, roomID string, userID string, opts ...JoinRoomOpt) *ServerRoom {
 	t.Helper()
 	var jr joinRoom
@@ -402,6 +408,9 @@ func (s *Server) MustJoinRoom(t ct.TestLike, deployment FederationDeployment, re
 }
 
 // Leaves a room. If this is rejecting an invite then a make_leave request is made first, before send_leave.
+//
+// Args:
+//   - `remoteServer`: This should be a resolvable addresses within the deployment network.
 func (s *Server) MustLeaveRoom(t ct.TestLike, deployment FederationDeployment, remoteServer spec.ServerName, roomID string, userID string) {
 	t.Helper()
 	origin := spec.ServerName(s.serverName)

tests/csapi/sync_test.go

@@ -288,10 +288,10 @@ func TestSync(t *testing.T) {
 			charlie := srv.UserID("charlie")
 
 			redactionRoomID := alice.MustCreateRoom(t, map[string]interface{}{"preset": "public_chat"})
-			redactionRoom := srv.MustJoinRoom(t, deployment, "hs1", redactionRoomID, charlie)
+			redactionRoom := srv.MustJoinRoom(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), redactionRoomID, charlie)
 
 			sentinelRoomID := alice.MustCreateRoom(t, map[string]interface{}{"preset": "public_chat"})
-			sentinelRoom := srv.MustJoinRoom(t, deployment, "hs1", sentinelRoomID, charlie)
+			sentinelRoom := srv.MustJoinRoom(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), sentinelRoomID, charlie)
 
 			// charlie creates a bogus redaction, which he sends out, followed by
 			// a good event - in another room - to act as a sentinel. It's not
@@ -304,7 +304,7 @@ func TestSync(t *testing.T) {
 				Redacts: "$12345"})
 			redactionRoom.AddEvent(redactionEvent)
 			t.Logf("Created redaction event %s", redactionEvent.EventID())
-			srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{redactionEvent.JSON()}, nil)
+			srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{redactionEvent.JSON()}, nil)
 
 			sentinelEvent := srv.MustCreateEvent(t, sentinelRoom, federation.Event{
 				Type:    "m.room.test",
@@ -313,7 +313,7 @@ func TestSync(t *testing.T) {
 			})
 			sentinelRoom.AddEvent(sentinelEvent)
 			t.Logf("Created sentinel event %s", sentinelEvent.EventID())
-			srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{redactionEvent.JSON(), sentinelEvent.JSON()}, nil)
+			srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{redactionEvent.JSON(), sentinelEvent.JSON()}, nil)
 
 			// wait for the sentinel to arrive
 			nextBatch := alice.MustSyncUntil(t, client.SyncReq{}, client.SyncTimelineHasEventID(sentinelRoomID, sentinelEvent.EventID()))
@@ -332,7 +332,7 @@ func TestSync(t *testing.T) {
 				pdus[i] = ev.JSON()
 				lastSentEventId = ev.EventID()
 			}
-			srv.MustSendTransaction(t, deployment, "hs1", pdus, nil)
+			srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), pdus, nil)
 			t.Logf("Sent filler events, with final event %s", lastSentEventId)
 
 			// sync, starting from the same ?since each time, until the final message turns up.
@@ -463,7 +463,7 @@ func TestSyncTimelineGap(t *testing.T) {
 	charlie := srv.UserID("charlie")
 
 	roomID := alice.MustCreateRoom(t, map[string]interface{}{"preset": "public_chat"})
-	room := srv.MustJoinRoom(t, deployment, "hs1", roomID, charlie)
+	room := srv.MustJoinRoom(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), roomID, charlie)
 
 	filterID := createFilter(t, alice, map[string]interface{}{
 		"room": map[string]interface{}{
@@ -515,7 +515,7 @@ func TestSyncTimelineGap(t *testing.T) {
 	// requests.
 	respondToGetMissingEventsEndpoints(t, srv, room, missingEvents)
 
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{lastEvent.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{lastEvent.JSON()}, nil)
 
 	// We now test two different modes of /sync work. The first is when we are
 	// syncing when the server receives the `lastEvent` (and so, at least

tests/federation_event_auth_test.go

@@ -62,7 +62,7 @@ func TestEventAuth(t *testing.T) {
 	})
 	room := srv.MustJoinRoom(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), roomID, charlie)
 	firstJoinEvent := room.CurrentState("m.room.member", charlie)
-	srv.MustLeaveRoom(t, deployment, "hs1", roomID, charlie)
+	srv.MustLeaveRoom(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), roomID, charlie)
 	leaveEvent := room.CurrentState("m.room.member", charlie)
 	room = srv.MustJoinRoom(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), roomID, charlie)
 

tests/federation_room_get_missing_events_test.go

@@ -127,7 +127,7 @@ func TestGetMissingEventsGapFilling(t *testing.T) {
 	).Methods("POST")
 
 	// 3) ...and send that alone to the HS.
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{mostRecentEvent.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{mostRecentEvent.JSON()}, nil)
 
 	// 6) Ensure Alice sees all injected events in the correct order.
 	correctOrderEventIDs := append([]string{lastSharedEvent.EventID()}, missingEventIDs...)

tests/federation_room_send_test.go

@@ -177,7 +177,7 @@ func TestNetworkPartitionOrdering(t *testing.T) {
 	}
 
 	// remote homeserver now injects event 1'
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{event1prime.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{event1prime.JSON()}, nil)
 
 	// ensure it gets there
 	alice.MustSyncUntil(t, client.SyncReq{TimeoutMillis: "1000"}, client.SyncTimelineHasEventID(serverRoom.RoomID, event1prime.EventID()))

tests/federation_sync_test.go

@@ -85,7 +85,7 @@ func TestSyncOmitsStateChangeOnFilteredEvents(t *testing.T) {
 	})
 
 	// fork the dag earlier at e1 and send s2
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{s2.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{s2.JSON()}, nil)
 
 	// wait until we see S2 to ensure the server has processed this.
 	alice.MustSyncUntil(t, client.SyncReq{}, client.SyncTimelineHasEventID(serverRoom.RoomID, s2.EventID()))

tests/federation_unreject_rejected_test.go

@@ -65,12 +65,12 @@ func TestUnrejectRejectedEvents(t *testing.T) {
 	// Send event B into the room. Event A at this point is unknown
 	// to the homeserver and we're not going to respond to the events
 	// request for it, so it should get rejected.
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{eventB.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{eventB.JSON()}, nil)
 
 	// Now we're going to send Event A into the room, which should give
 	// the server the prerequisite event to pass Event B later. This one
 	// should appear in /sync.
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{eventA.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{eventA.JSON()}, nil)
 
 	// Wait for event A to appear in the room. We're going to store the
 	// sync token here because we want to assert on the next sync that
@@ -82,7 +82,7 @@ func TestUnrejectRejectedEvents(t *testing.T) {
 
 	// Finally, send Event B again. This time it should be unrejected and
 	// should be sent as a new event down /sync for the first time.
-	srv.MustSendTransaction(t, deployment, "hs1", []json.RawMessage{eventB.JSON()}, nil)
+	srv.MustSendTransaction(t, deployment, deployment.GetFullyQualifiedHomeserverName(t, "hs1"), []json.RawMessage{eventB.JSON()}, nil)
 
 	// Now see if event B appears in the room. Use the since token from the
 	// last sync to ensure we're only waiting for new events since event A.