From f5b3144dc33ddcb2ab161323d422cab257d04b4c Mon Sep 17 00:00:00 2001
From: kegsay <kegan@matrix.org>
Date: Tue, 2 May 2023 15:03:16 +0100
Subject: Use PDU not *Event in HeaderedEvent (#3073)
Requires https://github.com/matrix-org/gomatrixserverlib/pull/376
This has numerous upsides:
- Less type casting to `*Event` is required.
- Making Dendrite work with `PDU` interfaces means we can swap out Event
impls more easily.
- Tests which represent weird event shapes are easier to write.
Part of a series of refactors on GMSL.
---
federationapi/routing/backfill.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'federationapi/routing/backfill.go')
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())
--
cgit v1.2.3