7 files changed, 21 insertions, 21 deletions
diff --git a/federationapi/routing/backfill.go b/federationapi/routing/backfill.go
index 06685387..05488af6 100644
--- a/federationapi/routing/backfill.go
+++ b/federationapi/routing/backfill.go
@@ -103,18 +103,18 @@ func Backfill(
 	}
 
 	// Filter any event that's not from the requested room out.
-	evs := make([]*gomatrixserverlib.Event, 0)
+	evs := make([]gomatrixserverlib.PDU, 0)
 
 	var ev *types.HeaderedEvent
 	for _, ev = range res.Events {
 		if ev.RoomID() == roomID {
-			evs = append(evs, ev.Event)
+			evs = append(evs, ev.PDU)
 		}
 	}
 
 	eventJSONs := []json.RawMessage{}
 	for _, e := range gomatrixserverlib.ReverseTopologicalOrdering(
-		gomatrixserverlib.ToPDUs(evs),
+		evs,
 		gomatrixserverlib.TopologicalOrderByPrevEvents,
 	) {
 		eventJSONs = append(eventJSONs, e.JSON())
diff --git a/federationapi/routing/events.go b/federationapi/routing/events.go
index e2547389..efd64dce 100644
--- a/federationapi/routing/events.go
+++ b/federationapi/routing/events.go
@@ -80,7 +80,7 @@ func allowedToSeeEvent(
 }
 
 // fetchEvent fetches the event without auth checks. Returns an error if the event cannot be found.
-func fetchEvent(ctx context.Context, rsAPI api.FederationRoomserverAPI, roomID, eventID string) (*gomatrixserverlib.Event, *util.JSONResponse) {
+func fetchEvent(ctx context.Context, rsAPI api.FederationRoomserverAPI, roomID, eventID string) (gomatrixserverlib.PDU, *util.JSONResponse) {
 	var eventsResponse api.QueryEventsByIDResponse
 	err := rsAPI.QueryEventsByID(
 		ctx,
@@ -99,5 +99,5 @@ func fetchEvent(ctx context.Context, rsAPI api.FederationRoomserverAPI, roomID,
 		}
 	}
 
-	return eventsResponse.Events[0].Event, nil
+	return eventsResponse.Events[0].PDU, nil
 }
diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go
index 6fa37f4a..0fcb6414 100644
--- a/federationapi/routing/invite.go
+++ b/federationapi/routing/invite.go
@@ -107,7 +107,7 @@ func InviteV1(
 func processInvite(
 	ctx context.Context,
 	isInviteV2 bool,
-	event *gomatrixserverlib.Event,
+	event gomatrixserverlib.PDU,
 	roomVer gomatrixserverlib.RoomVersion,
 	strippedState []fclient.InviteV2StrippedState,
 	roomID string,
@@ -198,7 +198,7 @@ func processInvite(
 	)
 
 	// Add the invite event to the roomserver.
-	inviteEvent := &types.HeaderedEvent{Event: &signedEvent}
+	inviteEvent := &types.HeaderedEvent{PDU: signedEvent}
 	request := &api.PerformInviteRequest{
 		Event:           inviteEvent,
 		InviteRoomState: strippedState,
diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go
index a6a7511c..a67262da 100644
--- a/federationapi/routing/join.go
+++ b/federationapi/routing/join.go
@@ -163,13 +163,13 @@ func MakeJoin(
 	}
 
 	// Check that the join is allowed or not
-	stateEvents := make([]*gomatrixserverlib.Event, len(queryRes.StateEvents))
+	stateEvents := make([]gomatrixserverlib.PDU, len(queryRes.StateEvents))
 	for i := range queryRes.StateEvents {
-		stateEvents[i] = queryRes.StateEvents[i].Event
+		stateEvents[i] = queryRes.StateEvents[i].PDU
 	}
 
-	provider := gomatrixserverlib.NewAuthEvents(gomatrixserverlib.ToPDUs(stateEvents))
-	if err = gomatrixserverlib.Allowed(event.Event, &provider); err != nil {
+	provider := gomatrixserverlib.NewAuthEvents(stateEvents)
+	if err = gomatrixserverlib.Allowed(event.PDU, &provider); err != nil {
 		return util.JSONResponse{
 			Code: http.StatusForbidden,
 			JSON: jsonerror.Forbidden(err.Error()),
@@ -414,7 +414,7 @@ func SendJoin(
 			InputRoomEvents: []api.InputRoomEvent{
 				{
 					Kind:          api.KindNew,
-					Event:         &types.HeaderedEvent{Event: &signed},
+					Event:         &types.HeaderedEvent{PDU: signed},
 					SendAsServer:  string(cfg.Matrix.ServerName),
 					TransactionID: nil,
 				},
diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go
index c9b13b98..da677d5d 100644
--- a/federationapi/routing/leave.go
+++ b/federationapi/routing/leave.go
@@ -110,12 +110,12 @@ func MakeLeave(
 	}
 
 	// Check that the leave is allowed or not
-	stateEvents := make([]*gomatrixserverlib.Event, len(queryRes.StateEvents))
+	stateEvents := make([]gomatrixserverlib.PDU, len(queryRes.StateEvents))
 	for i := range queryRes.StateEvents {
-		stateEvents[i] = queryRes.StateEvents[i].Event
+		stateEvents[i] = queryRes.StateEvents[i].PDU
 	}
-	provider := gomatrixserverlib.NewAuthEvents(gomatrixserverlib.ToPDUs(stateEvents))
-	if err = gomatrixserverlib.Allowed(event.Event, &provider); err != nil {
+	provider := gomatrixserverlib.NewAuthEvents(stateEvents)
+	if err = gomatrixserverlib.Allowed(event, &provider); err != nil {
 		return util.JSONResponse{
 			Code: http.StatusForbidden,
 			JSON: jsonerror.Forbidden(err.Error()),
@@ -313,7 +313,7 @@ func SendLeave(
 		InputRoomEvents: []api.InputRoomEvent{
 			{
 				Kind:          api.KindNew,
-				Event:         &types.HeaderedEvent{Event: event},
+				Event:         &types.HeaderedEvent{PDU: event},
 				SendAsServer:  string(cfg.Matrix.ServerName),
 				TransactionID: nil,
 			},
diff --git a/federationapi/routing/peek.go b/federationapi/routing/peek.go
index 45dc7f8c..efc46146 100644
--- a/federationapi/routing/peek.go
+++ b/federationapi/routing/peek.go
@@ -91,7 +91,7 @@ func Peek(
 		StateEvents:     types.NewEventJSONsFromHeaderedEvents(response.StateEvents),
 		AuthEvents:      types.NewEventJSONsFromHeaderedEvents(response.AuthChainEvents),
 		RoomVersion:     response.RoomVersion,
-		LatestEvent:     response.LatestEvent.Event,
+		LatestEvent:     response.LatestEvent.PDU,
 		RenewalInterval: renewalInterval,
 	}
 
diff --git a/federationapi/routing/threepid.go b/federationapi/routing/threepid.go
index 1b854501..fdfc7bce 100644
--- a/federationapi/routing/threepid.go
+++ b/federationapi/routing/threepid.go
@@ -86,7 +86,7 @@ func CreateInvitesFrom3PIDInvites(
 			return jsonerror.InternalServerError()
 		}
 		if event != nil {
-			evs = append(evs, &types.HeaderedEvent{Event: event})
+			evs = append(evs, &types.HeaderedEvent{PDU: event})
 		}
 	}
 
@@ -210,7 +210,7 @@ func ExchangeThirdPartyInvite(
 		httpReq.Context(), rsAPI,
 		api.KindNew,
 		[]*types.HeaderedEvent{
-			{Event: inviteEvent},
+			{PDU: inviteEvent},
 		},
 		request.Destination(),
 		request.Origin(),
@@ -325,7 +325,7 @@ func buildMembershipEvent(
 	authEvents := gomatrixserverlib.NewAuthEvents(nil)
 
 	for i := range queryRes.StateEvents {
-		err = authEvents.AddEvent(queryRes.StateEvents[i].Event)
+		err = authEvents.AddEvent(queryRes.StateEvents[i].PDU)
 		if err != nil {
 			return nil, err
 		}