diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-28 14:51:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 14:51:40 +0000 |
| commit | a23fda662607e9160230335503e912f626abf616 (patch) | |
| tree | 82f287510bcb89e2c93de63d329dd8dbe9bf4ed4 /setup/mscs | |
| parent | ac77732185a2473dd39984669ea3f454548aa7f5 (diff) | |
Update `Events` call-sites which now don't return an error, update `parsedRespState` to sort (#2227)
* Topologically sort with `SendEventWithState`, so that earlier events should satisfy auth for later ones
* Revert "Topologically sort with `SendEventWithState`, so that earlier events should satisfy auth for later ones"
This reverts commit b0cd706012b4c9b6724b11e16f19c4cb732ab286.
* Update to matrix-org/gomatrixserverlib#293
* `Events` no longer returns an error, other tweaks
* Make sure `Events` is sorted for `parsedRespState` too
Diffstat (limited to 'setup/mscs')
| -rw-r--r-- | setup/mscs/msc2836/msc2836.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/setup/mscs/msc2836/msc2836.go b/setup/mscs/msc2836/msc2836.go index 0af22c19..29c781a8 100644 --- a/setup/mscs/msc2836/msc2836.go +++ b/setup/mscs/msc2836/msc2836.go @@ -654,11 +654,7 @@ func (rc *reqCtx) injectResponseToRoomserver(res *MSC2836EventRelationshipsRespo AuthEvents: res.AuthChain, StateEvents: stateEvents, } - eventsInOrder, err := respState.Events(rc.roomVersion) - if err != nil { - util.GetLogger(rc.ctx).WithError(err).Error("failed to calculate order to send events in MSC2836EventRelationshipsResponse") - return - } + eventsInOrder := respState.Events(rc.roomVersion) // everything gets sent as an outlier because auth chain events may be disjoint from the DAG // as may the threaded events. var ires []roomserver.InputRoomEvent @@ -669,7 +665,7 @@ func (rc *reqCtx) injectResponseToRoomserver(res *MSC2836EventRelationshipsRespo }) } // we've got the data by this point so use a background context - err = roomserver.SendInputRoomEvents(context.Background(), rc.rsAPI, ires, false) + err := roomserver.SendInputRoomEvents(context.Background(), rc.rsAPI, ires, false) if err != nil { util.GetLogger(rc.ctx).WithError(err).Error("failed to inject MSC2836EventRelationshipsResponse into the roomserver") } |