f - remove returnErr pattern - accounts: associate payments before sending them

Author: ViktorT-11

accounts/service.go

@@ -579,15 +579,17 @@ func (s *InterceptorService) TrackPayment(id AccountID, hash lntypes.Hash,
 			// track the service is restarted. Therefore the node
 			// runner needs to manually check if the payment was
 			// made and debit the account if that's the case.
-			mainChanErr := fmt.Errorf("critical error: failed to "+
-				"store the payment with hash %v for user with "+
-				"account id %v. Manual intervention required! "+
-				"Verify if the payment was executed, and "+
-				"manually update the user account balance by "+
-				"subtracting the payment amount if it was",
-				hash, id,
+			errStr := "critical error: failed to store the " +
+				"payment with hash %v for user with account " +
+				"id %v. Manual intervention required! " +
+				"Verify if the payment was executed, and " +
+				"manually update the user account balance by " +
+				"subtracting the payment amount if it was"
+
+			mainChanErr := s.disableAndErrorfUnsafe(
+				errStr, hash, id,
 			)
-			s.disableUnsafe()
+
 			s.mainErrCallback(mainChanErr)
 		}
 	}