From 0e4d2593eb6ba084707a8cea89d17ff5fa5ae06b Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Tue, 17 Jan 2023 13:41:01 -0700 Subject: [PATCH] Refactor relay perform_test for clarity --- relayapi/internal/perform_test.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/relayapi/internal/perform_test.go b/relayapi/internal/perform_test.go index 84bf143b9..fb71b7d0e 100644 --- a/relayapi/internal/perform_test.go +++ b/relayapi/internal/perform_test.go @@ -41,21 +41,21 @@ func (f *testFedClient) P2PGetTransactionFromRelay( relayServer gomatrixserverlib.ServerName, ) (res gomatrixserverlib.RespGetRelayTransaction, err error) { f.queryCount++ - if !f.shouldFail { - res = gomatrixserverlib.RespGetRelayTransaction{ - Txn: gomatrixserverlib.Transaction{}, - EntryID: 0, - } - if f.queueDepth > 0 { - res.EntriesQueued = true - } else { - res.EntriesQueued = false - } - f.queueDepth -= 1 - } else { - err = fmt.Errorf("Error") + if f.shouldFail { + return res, fmt.Errorf("Error") } + res = gomatrixserverlib.RespGetRelayTransaction{ + Txn: gomatrixserverlib.Transaction{}, + EntryID: 0, + } + if f.queueDepth > 0 { + res.EntriesQueued = true + } else { + res.EntriesQueued = false + } + f.queueDepth -= 1 + return }