From 97d6cd0855f1e80978b761f0cd0f71d743505580 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 5 May 2020 14:52:52 +0100 Subject: [PATCH] Linting --- federationapi/routing/send.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index b8f5bddbe..a30829452 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -306,6 +306,9 @@ func (t *txnReq) processEventWithMissingState(e gomatrixserverlib.Event, roomVer // Fallback to /state util.GetLogger(t.context).WithError(err).Warn("processEventWithMissingState failed to /state_ids, falling back to /state") respState, err = t.lookupMissingStateViaState(e, roomVersion) + if err != nil { + return err + } } // Check that the event is allowed by the state. @@ -403,6 +406,11 @@ func (t *txnReq) lookupMissingStateViaStateIDs(e gomatrixserverlib.Event, roomVe haveEventMap[event.EventID()] = &h } } + return t.createRespStateFromStateIDs(stateIDs, haveEventMap) +} + +func (t *txnReq) createRespStateFromStateIDs(stateIDs gomatrixserverlib.RespStateIDs, haveEventMap map[string]*gomatrixserverlib.HeaderedEvent) ( + *gomatrixserverlib.RespState, error) { // create a RespState response using the response to /state_ids as a guide respState := gomatrixserverlib.RespState{ AuthEvents: make([]gomatrixserverlib.Event, len(stateIDs.AuthEventIDs)),