From 7fc3852bdf7308b4421ef976f4408301ad0ab69d Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 2 Dec 2020 15:48:45 +0000
Subject: [PATCH] Fix build issues

---
 federationapi/routing/send_test.go                  | 8 ++++++++
 roomserver/api/perform.go                           | 7 +++----
 roomserver/internal/perform/perform_inbound_peek.go | 4 ++--
 roomserver/internal/query/query.go                  | 2 +-
 roomserver/internal/query/query_test.go             | 4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/federationapi/routing/send_test.go b/federationapi/routing/send_test.go
index 9b9db873b..2f1c36cf5 100644
--- a/federationapi/routing/send_test.go
+++ b/federationapi/routing/send_test.go
@@ -146,6 +146,14 @@ func (t *testRoomserverAPI) PerformLeave(
 	return nil
 }
 
+func (t *testRoomserverAPI) PerformInboundPeek(
+	ctx context.Context,
+	req *api.PerformInboundPeekRequest,
+	res *api.PerformInboundPeekResponse,
+) error {
+	return nil
+}
+
 // Query the latest events and state for a room from the room server.
 func (t *testRoomserverAPI) QueryLatestEventsAndState(
 	ctx context.Context,
diff --git a/roomserver/api/perform.go b/roomserver/api/perform.go
index 3f5dcfb3e..ae6bfadd7 100644
--- a/roomserver/api/perform.go
+++ b/roomserver/api/perform.go
@@ -177,10 +177,10 @@ type PerformInboundPeekResponse struct {
 	RoomVersion gomatrixserverlib.RoomVersion `json:"room_version"`
 	// The current state and auth chain events.
 	// The lists will be in an arbitrary order.
-	StateEvents     []gomatrixserverlib.HeaderedEvent `json:"state_events"`
-	AuthChainEvents []gomatrixserverlib.HeaderedEvent `json:"auth_chain_events"`
+	StateEvents     []*gomatrixserverlib.HeaderedEvent `json:"state_events"`
+	AuthChainEvents []*gomatrixserverlib.HeaderedEvent `json:"auth_chain_events"`
 	// The event at which this state was captured
-	LatestEvent gomatrixserverlib.HeaderedEvent `json:"latest_event"`
+	LatestEvent *gomatrixserverlib.HeaderedEvent `json:"latest_event"`
 }
 
 // PerformForgetRequest is a request to PerformForget
@@ -190,4 +190,3 @@ type PerformForgetRequest struct {
 }
 
 type PerformForgetResponse struct{}
-
diff --git a/roomserver/internal/perform/perform_inbound_peek.go b/roomserver/internal/perform/perform_inbound_peek.go
index e919d2040..eb3c9727d 100644
--- a/roomserver/internal/perform/perform_inbound_peek.go
+++ b/roomserver/internal/perform/perform_inbound_peek.go
@@ -56,7 +56,7 @@ func (r *InboundPeeker) PerformInboundPeek(
 	response.RoomExists = true
 	response.RoomVersion = info.RoomVersion
 
-	var stateEvents []gomatrixserverlib.Event
+	var stateEvents []*gomatrixserverlib.Event
 
 	var currentStateSnapshotNID types.StateSnapshotNID
 	latestEventRefs, currentStateSnapshotNID, _, err :=
@@ -68,7 +68,7 @@ func (r *InboundPeeker) PerformInboundPeek(
 	if err != nil {
 		return err
 	}
-	var sortedLatestEvents []gomatrixserverlib.Event
+	var sortedLatestEvents []*gomatrixserverlib.Event
 	for _, ev := range latestEvents {
 		sortedLatestEvents = append(sortedLatestEvents, ev.Event)
 	}
diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go
index aef6fa3f3..da0ebc55d 100644
--- a/roomserver/internal/query/query.go
+++ b/roomserver/internal/query/query.go
@@ -447,7 +447,7 @@ func (r *Queryer) QueryStateAndAuthChain(
 	response.RoomExists = true
 	response.RoomVersion = info.RoomVersion
 
-	var stateEvents []gomatrixserverlib.Event
+	var stateEvents []*gomatrixserverlib.Event
 	stateEvents, err = r.loadStateAtEventIDs(ctx, *info, request.PrevEventIDs)
 	if err != nil {
 		return err
diff --git a/roomserver/internal/query/query_test.go b/roomserver/internal/query/query_test.go
index 4e761d8ec..ba5bb9f55 100644
--- a/roomserver/internal/query/query_test.go
+++ b/roomserver/internal/query/query_test.go
@@ -106,7 +106,7 @@ func TestGetAuthChainSingle(t *testing.T) {
 		t.Fatalf("Failed to add events to db: %v", err)
 	}
 
-	result, err := getAuthChain(context.TODO(), db.EventsFromIDs, []string{"e"})
+	result, err := GetAuthChain(context.TODO(), db.EventsFromIDs, []string{"e"})
 	if err != nil {
 		t.Fatalf("getAuthChain failed: %v", err)
 	}
@@ -139,7 +139,7 @@ func TestGetAuthChainMultiple(t *testing.T) {
 		t.Fatalf("Failed to add events to db: %v", err)
 	}
 
-	result, err := getAuthChain(context.TODO(), db.EventsFromIDs, []string{"e", "f"})
+	result, err := GetAuthChain(context.TODO(), db.EventsFromIDs, []string{"e", "f"})
 	if err != nil {
 		t.Fatalf("getAuthChain failed: %v", err)
 	}