From cc6af4a67b53fe1596d3584ce270f3596cc3c04e Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sat, 25 Jan 2020 13:32:59 +0000 Subject: [PATCH] getBackwardTopologyPos always returns a usable value --- syncapi/storage/postgres/syncserver.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/syncapi/storage/postgres/syncserver.go b/syncapi/storage/postgres/syncserver.go index 4f0cbbd2c..f391c5784 100644 --- a/syncapi/storage/postgres/syncserver.go +++ b/syncapi/storage/postgres/syncserver.go @@ -766,7 +766,7 @@ func (d *SyncServerDatasource) addInvitesToResponse( func (d *SyncServerDatasource) getBackwardTopologyPos( ctx context.Context, events []types.StreamEvent, -) (pos types.StreamPosition, err error) { +) (pos types.StreamPosition) { if len(events) > 0 { pos, _ = d.topology.selectPositionInTopology(ctx, events[0].EventID()) } @@ -807,12 +807,7 @@ func (d *SyncServerDatasource) addRoomDeltaToResponse( } recentEvents := d.StreamEventsToEvents(device, recentStreamEvents) delta.stateEvents = removeDuplicates(delta.stateEvents, recentEvents) // roll back - - var backwardTopologyPos types.StreamPosition - backwardTopologyPos, err = d.getBackwardTopologyPos(ctx, recentStreamEvents) - if err != nil { - return err - } + backwardTopologyPos := d.getBackwardTopologyPos(ctx, recentStreamEvents) switch delta.membership { case gomatrixserverlib.Join: