From 6eda884686dc4c05a821ac5a3c7e2ee55a20cbe9 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Tue, 13 Jun 2023 15:26:42 +0200 Subject: [PATCH] Remove goto --- .../object/tree/synctree/treeremotegetter.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/commonspace/object/tree/synctree/treeremotegetter.go b/commonspace/object/tree/synctree/treeremotegetter.go index b592c24b..2687776c 100644 --- a/commonspace/object/tree/synctree/treeremotegetter.go +++ b/commonspace/object/tree/synctree/treeremotegetter.go @@ -75,16 +75,14 @@ func (t treeRemoteGetter) treeRequestLoop(ctx context.Context, retryTimeout time if retryTimeout == 0 { return nil, err } - goto Wait + } else { + peerIdx = peerIdx % len(availablePeers) + msg, err = t.treeRequest(ctx, availablePeers[peerIdx]) + if err == nil || retryTimeout == 0 { + return msg, err + } + peerIdx++ } - - peerIdx = peerIdx % len(availablePeers) - msg, err = t.treeRequest(ctx, availablePeers[peerIdx]) - if err == nil || retryTimeout == 0 { - return msg, err - } - peerIdx++ - Wait: select { case <-time.After(newRequestTimeout): break