Merge pull request #899 from starius/min-conf-target-2

loopout: fix fee estimate failure if conf_target=1

Author: starius

loopout_feerate.go

@@ -136,14 +136,14 @@ func (p *loopOutSweepFeerateProvider) GetConfTargetAndFeeRate(
 	// opens for the client to sweep.
 	blocksUntilExpiry := contract.CltvExpiry - height
 
-	// Find confTarget. If the sweep has expired, use confTarget=1, because
-	// confTarget must be positive.
+	// Find confTarget. If the sweep has expired, use confTarget=2, because
+	// fee estimator fails if confTarget < 2.
 	confTarget := blocksUntilExpiry
-	if confTarget <= 0 {
+	if confTarget < 2 {
 		log.Infof("Swap %x has expired (blocksUntilExpiry=%d), using "+
-			"confTarget=1 for it.", swapHash[:6], blocksUntilExpiry)
+			"confTarget=2 for it.", swapHash[:6], blocksUntilExpiry)
 
-		confTarget = 1
+		confTarget = 2
 	}
 
 	feeFactor := float64(1.0)

loopout_feerate_test.go

@@ -35,7 +35,7 @@ func (s testSweeper) GetSweepFeeDetails(ctx context.Context,
 		return 0, 0, 0, fmt.Errorf("zero sweepConfTarget")
 
 	case sweepConfTarget == 1:
-		feeRate = 30000
+		return 0, 0, 0, fmt.Errorf("sweepConfTarget is 1")
 
 	case sweepConfTarget == 2:
 		feeRate = 25000
@@ -213,17 +213,17 @@ func TestLoopOutSweepFeerateProvider(t *testing.T) {
 			height:          800_999,
 			amount:          1_000_000,
 			protocolVersion: loopdb.ProtocolVersionMuSig2,
-			wantConfTarget:  1,
-			wantFeeRate:     33000,
+			wantConfTarget:  2,
+			wantFeeRate:     27500,
 		},
 		{
 			name:            "expired",
 			cltvExpiry:      801_000,
 			height:          801_000,
 			amount:          1_000_000,
 			protocolVersion: loopdb.ProtocolVersionMuSig2,
-			wantConfTarget:  1,
-			wantFeeRate:     33000,
+			wantConfTarget:  2,
+			wantFeeRate:     27500,
 		},
 	}