diff options
| author | kegsay <kegan@matrix.org> | 2023-05-02 15:03:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 15:03:16 +0100 |
| commit | f5b3144dc33ddcb2ab161323d422cab257d04b4c (patch) | |
| tree | 07d3b03944d2529d96c29674a96c3e76a76ae3b9 /federationapi/federationapi_test.go | |
| parent | 696cbb70b8cc8d663f7bb7c7a5f25cd57ea6803e (diff) | |
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.
Diffstat (limited to 'federationapi/federationapi_test.go')
| -rw-r--r-- | federationapi/federationapi_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/federationapi/federationapi_test.go b/federationapi/federationapi_test.go index de65f348..c21e7ecb 100644 --- a/federationapi/federationapi_test.go +++ b/federationapi/federationapi_test.go @@ -133,12 +133,12 @@ func (f *fedClient) MakeJoin(ctx context.Context, origin, s spec.ServerName, roo } return } -func (f *fedClient) SendJoin(ctx context.Context, origin, s spec.ServerName, event *gomatrixserverlib.Event) (res fclient.RespSendJoin, err error) { +func (f *fedClient) SendJoin(ctx context.Context, origin, s spec.ServerName, event gomatrixserverlib.PDU) (res fclient.RespSendJoin, err error) { f.fedClientMutex.Lock() defer f.fedClientMutex.Unlock() for _, r := range f.allowJoins { if r.ID == event.RoomID() { - r.InsertEvent(f.t, &types.HeaderedEvent{Event: event}) + r.InsertEvent(f.t, &types.HeaderedEvent{PDU: event}) f.t.Logf("Join event: %v", event.EventID()) res.StateEvents = types.NewEventJSONsFromHeaderedEvents(r.CurrentState()) res.AuthEvents = types.NewEventJSONsFromHeaderedEvents(r.Events()) |