Refactor verify-send logic to use for loop instead of goto

cmd/root.go

@@ -198,7 +198,8 @@ var rootCmd = &cobra.Command{
 				go func(i int) {
 					defer wg.Done()
 					fmt.Printf("Sending to %s: %s\n", recipientID, msgBody)
-				sendLoop:
+					for {
+						// Send messages
 						var roundIDs []id.Round
 						var roundTimeout time.Duration
 						if unsafe {
@@ -214,9 +215,10 @@ var rootCmd = &cobra.Command{
 							jww.FATAL.Panicf("%+v", err)
 						}
 
+						if viper.GetBool("verify-sends") { // Verify message sends were successful
 							retryChan := make(chan struct{})
 							done := make(chan struct{}, 1)
-					if viper.GetBool("verify-sends") { // Verify message sends were successful
+
 							// Construct the callback function which
 							// verifies successful message send or retries
 							f := func(allRoundsSucceeded, timedOut bool,
@@ -232,15 +234,18 @@ var rootCmd = &cobra.Command{
 							err = client.GetRoundResults(roundIDs, roundTimeout, f)
 							if err != nil {
 								jww.DEBUG.Printf("Could not verify messages were sent successfully, resending messages...")
-							goto sendLoop
+								continue
 							}
 
 							select {
 							case <-retryChan:
 								// On a retry, go to the top of the loop
-							jww.DEBUG.Printf("Could not verify messages were sent successfully, resending messages...")
-							goto sendLoop
+								jww.DEBUG.Printf("Messages were not sent successfully, resending messages...")
+								continue
 							case <-done:
+								// Close channels on verification success
+								close(retryChan)
+								close(done)
 								break
 							}
 
@@ -260,11 +265,11 @@ var rootCmd = &cobra.Command{
 							if err != nil {
 								jww.FATAL.Panicf("Message sending for send %d failed: %+v", i, err)
 							}
-					}
 
-					close(done)
-					close(retryChan)
+						}
 
+						break
+					}
 				}(i)
 			}
 		}()