fixup! loop: add resume manager

Author: sputn1ck

loopout.go

@@ -1622,42 +1622,42 @@ func (m *resumeManager) handleUnfinishedLoopOut(ctx context.Context,
 
 	typ := swap.State().State.Type()
 	// Check the state of the swap and take appropriate action.
-	if typ != loopdb.StateTypePending && typ != loopdb.StateTypeFail {
-		trackChanCtx, cancel := context.WithCancel(ctx)
-		// Check if the swap offchain htlc went through.
-		trackChan, errChan, err := m.lnd.Router.TrackPayment(
-			trackChanCtx, swap.Hash,
-		)
-		if err == nil {
-			// Omit errors here as the payment may not have been
-			// initiated from this client.
-		trackChanLoop:
-			for {
-				select {
-				case <-ctx.Done():
-					cancel()
-					return nil
-
-				case trackResp := <-trackChan:
-					if trackResp.State !=
-						lnrpc.Payment_FAILED {
-						// Nothing more to do.
-						cancel()
-						return nil
-					}
-					break trackChanLoop
-
-				case <-errChan:
-					break trackChanLoop
-				}
+	if typ == loopdb.StateTypePending && typ == loopdb.StateTypeFail {
+		return nil
+	}
+	trackChanCtx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	// Check if the swap offchain htlc went through.
+	trackChan, errChan, err := m.lnd.Router.TrackPayment(
+		trackChanCtx, swap.Hash,
+	)
+	if err != nil {
+		return err
+	}
+
+	// Omit errors here as the payment may not have been
+	// initiated from this client.
+trackChanLoop:
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+
+		case trackResp := <-trackChan:
+			if trackResp.State !=
+				lnrpc.Payment_FAILED {
+				return nil
 			}
+			break trackChanLoop
+		case <-errChan:
+			return err
 		}
-		cancel()
+	}
 
-		if swap.LastUpdate().Cost.Server == 0 {
-			// If the server cost is zero resume the payment.
-			return m.resumeLoopOutPayment(ctx, swap)
-		}
+	if swap.LastUpdate().Cost.Server == 0 {
+		// If the server cost is zero resume the payment.
+		return m.resumeLoopOutPayment(ctx, swap)
 	}
 
 	return nil