. review fixes

Author: starius

sweepbatcher/presigned.go

@@ -89,7 +89,7 @@ func (b *batch) presign(ctx context.Context, newSweep *sweep) error {
 		return fmt.Errorf("failed to get nextBlockFeerate: %w", err)
 	}
 
-	b.log().Infof("nextBlockFeerate is %v", nextBlockFeerate)
+	b.Infof("nextBlockFeerate is %v", nextBlockFeerate)
 
 	// Create the list of sweeps of the future batch.
 	sweeps := make([]sweep, 0, len(b.sweeps)+1)
@@ -294,7 +294,7 @@ func (b *batch) publishPresigned(ctx context.Context) (btcutil.Amount, error,
 		blockchain.GetTransactionWeight(btcutil.NewTx(tx)),
 	)
 	if realWeight != weight {
-		b.log().Warnf("actual weight of tx %v is %v, estimated as %d",
+		b.Warnf("actual weight of tx %v is %v, estimated as %d",
 			txHash, realWeight, weight)
 	}
 
@@ -304,10 +304,10 @@ func (b *batch) publishPresigned(ctx context.Context) (btcutil.Amount, error,
 	fee = batchAmt - output
 	signedFeeRate := chainfee.NewSatPerKWeight(fee, realWeight)
 
-	b.log().Infof("attempting to publish custom signed tx=%v, "+
-		"desiredFeerate=%v, signedFeeRate=%v, weight=%v, fee=%v, "+
-		"sweeps=%d, destAddr=%s", txHash, feeRate, signedFeeRate,
-		weight, fee, len(tx.TxIn), address)
+	numSweeps := len(tx.TxIn)
+	b.Infof("attempting to publish custom signed tx=%v, desiredFeerate=%v,"+
+		" signedFeeRate=%v, weight=%v, fee=%v, sweeps=%d, destAddr=%s",
+		txHash, feeRate, signedFeeRate, weight, fee, numSweeps, address)
 	b.debugLogTx("serialized batch", tx)
 
 	// Publish the transaction.

sweepbatcher/sweep_batch.go

@@ -587,8 +587,8 @@ func (b *batch) addSweep(ctx context.Context, sweep *sweep) (bool, error) {
 		// Ensure that all the sweeps in the batch use presigned mode.
 		for _, s := range b.sweeps {
 			if !s.presigned {
-				b.log().Infof("failed to add sweep %x to the "+
-					"batch, because the batch has "+
+				b.Infof("failed to add presigned sweep %x to "+
+					"the batch, because the batch has "+
 					"non-presigned sweep %x",
 					sweep.swapHash[:6], s.swapHash[:6])
 
@@ -598,7 +598,7 @@ func (b *batch) addSweep(ctx context.Context, sweep *sweep) (bool, error) {
 
 		if len(b.sweeps) != 0 {
 			if err := b.presign(ctx, sweep); err != nil {
-				b.log().Infof("failed to add sweep %x to the "+
+				b.Infof("failed to add sweep %x to the "+
 					"batch, because failed to presign new "+
 					"version of batch tx: %v",
 					sweep.swapHash[:6], err)
@@ -618,9 +618,9 @@ func (b *batch) addSweep(ctx context.Context, sweep *sweep) (bool, error) {
 		// Ensure that all the sweeps in the batch don't use presigned.
 		for _, s := range b.sweeps {
 			if s.presigned {
-				b.log().Infof("failed to add sweep %x to the "+
-					"batch, because the batch has "+
-					"presigned sweep %x",
+				b.Infof("failed to add a non-presigned sweep "+
+					"%x to the batch, because the batch "+
+					"has presigned sweep %x",
 					sweep.swapHash[:6], s.swapHash[:6])
 
 				return false, nil
@@ -927,19 +927,35 @@ func (b *batch) isUrgent(skipBefore time.Time) bool {
 
 // isPresigned returns if the batch uses presigned mode. Currently presigned and
 // non-presigned sweeps never appear in the same batch. Fails if the batch is
-// empty.
+// empty or contains both presigned and regular sweeps.
 func (b *batch) isPresigned() (bool, error) {
-	if len(b.sweeps) == 0 {
-		return false, fmt.Errorf("the batch is empty")
-	}
+	var (
+		hasPresigned bool
+		hasRegular   bool
+	)
 
 	for _, sweep := range b.sweeps {
 		if sweep.presigned {
-			return true, nil
+			hasPresigned = true
+		} else {
+			hasRegular = true
 		}
 	}
 
-	return false, nil
+	switch {
+	case hasPresigned && !hasRegular:
+		return true, nil
+
+	case !hasPresigned && hasRegular:
+		return false, nil
+
+	case hasPresigned && hasRegular:
+		return false, fmt.Errorf("the batch has both presigned and " +
+			"non-presigned sweeps")
+
+	default:
+		return false, fmt.Errorf("the batch is empty")
+	}
 }
 
 // publish creates and publishes the latest batch transaction to the network.

sweepbatcher/sweep_batcher.go

@@ -643,7 +643,7 @@ func (b *Batcher) PresignSweep(ctx context.Context, sweepOutpoint wire.OutPoint,
 	if err != nil {
 		return fmt.Errorf("failed to get nextBlockFeerate: %w", err)
 	}
-	log().Infof("nextBlockFeerate is %v", nextBlockFeerate)
+	infof("nextBlockFeerate is %v", nextBlockFeerate)
 
 	sweeps := []sweep{
 		{