s/nextBlockFeerate/nextBlockFeeRate/

Author: starius

sweepbatcher/presigned.go

@@ -84,12 +84,12 @@ func (b *batch) presign(ctx context.Context, newSweep *sweep) error {
 	}
 
 	// Find the feerate needed to get into next block. Use conf_target=2,
-	nextBlockFeerate, err := b.wallet.EstimateFeeRate(ctx, 2)
+	nextBlockFeeRate, err := b.wallet.EstimateFeeRate(ctx, 2)
 	if err != nil {
-		return fmt.Errorf("failed to get nextBlockFeerate: %w", err)
+		return fmt.Errorf("failed to get nextBlockFeeRate: %w", err)
 	}
 
-	b.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)
@@ -106,7 +106,7 @@ func (b *batch) presign(ctx context.Context, newSweep *sweep) error {
 	}
 
 	return presign(
-		ctx, b.cfg.presignedHelper, destAddr, sweeps, nextBlockFeerate,
+		ctx, b.cfg.presignedHelper, destAddr, sweeps, nextBlockFeeRate,
 	)
 }
 
@@ -126,7 +126,7 @@ type presigner interface {
 // A feerate is considered high if it is at least 100 sat/vbyte AND is at least
 // 10x of the current next block feerate.
 func presign(ctx context.Context, presigner presigner, destAddr btcutil.Address,
-	sweeps []sweep, nextBlockFeerate chainfee.SatPerKWeight) error {
+	sweeps []sweep, nextBlockFeeRate chainfee.SatPerKWeight) error {
 
 	if presigner == nil {
 		return fmt.Errorf("presigner is not installed")
@@ -136,8 +136,8 @@ func presign(ctx context.Context, presigner presigner, destAddr btcutil.Address,
 		return fmt.Errorf("there are no sweeps")
 	}
 
-	if nextBlockFeerate == 0 {
-		return fmt.Errorf("nextBlockFeerate is not set")
+	if nextBlockFeeRate == 0 {
+		return fmt.Errorf("nextBlockFeeRate is not set")
 	}
 
 	// Keep track of the total amount this batch is sweeping back.
@@ -167,8 +167,8 @@ func presign(ctx context.Context, presigner presigner, destAddr btcutil.Address,
 	highFeeRateLockTime := uint32(timeout - timeoutThreshold)
 
 	// Calculate which feerate to consider high. At least 100 sat/vbyte and
-	// at least 10x of current nextBlockFeerate.
-	highFeeRate := max(100*chainfee.FeePerKwFloor, 10*nextBlockFeerate)
+	// at least 10x of current nextBlockFeeRate.
+	highFeeRate := max(100*chainfee.FeePerKwFloor, 10*nextBlockFeeRate)
 
 	// Set LockTime to 0. It is not critical.
 	const currentHeight = 0

sweepbatcher/presigned_test.go

@@ -60,7 +60,7 @@ func TestPresign(t *testing.T) {
 		presigner        presigner
 		sweeps           []sweep
 		destAddr         btcutil.Address
-		nextBlockFeerate chainfee.SatPerKWeight
+		nextBlockFeeRate chainfee.SatPerKWeight
 		wantErr          string
 		wantOutputs      []btcutil.Amount
 		wantLockTimes    []uint32
@@ -75,15 +75,15 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr:         destAddr,
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantErr:          "presigner is not installed",
 		},
 
 		{
 			name:             "error: no sweeps",
 			presigner:        &mockPresigner{},
 			destAddr:         destAddr,
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantErr:          "there are no sweeps",
 		},
 
@@ -97,12 +97,12 @@ func TestPresign(t *testing.T) {
 					timeout:  1000,
 				},
 			},
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantErr:          "unsupported address type <nil>",
 		},
 
 		{
-			name:      "error: zero nextBlockFeerate",
+			name:      "error: zero nextBlockFeeRate",
 			presigner: &mockPresigner{},
 			sweeps: []sweep{
 				{
@@ -117,7 +117,7 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr: destAddr,
-			wantErr:  "nextBlockFeerate is not set",
+			wantErr:  "nextBlockFeeRate is not set",
 		},
 
 		{
@@ -134,7 +134,7 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr:         destAddr,
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantErr:          "timeout is invalid: 0",
 		},
 
@@ -154,7 +154,7 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr:         destAddr,
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantOutputs: []btcutil.Amount{
 				2999842, 2999811, 2999773, 2999728, 2999674,
 				2999609, 2999530, 2999436, 2999324, 2999189,
@@ -190,7 +190,7 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr:         destAddr,
-			nextBlockFeerate: 50 * chainfee.FeePerKwFloor,
+			nextBlockFeeRate: 50 * chainfee.FeePerKwFloor,
 			wantOutputs: []btcutil.Amount{
 				2999842, 2999811, 2999773, 2999728, 2999674,
 				2999609, 2999530, 2999436, 2999324, 2999189,
@@ -225,7 +225,7 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr:         destAddr,
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantOutputs: []btcutil.Amount{
 				2842, 2811, 2773, 2728, 2674, 2609, 2530, 2436,
 				2400,
@@ -253,7 +253,7 @@ func TestPresign(t *testing.T) {
 				},
 			},
 			destAddr:         destAddr,
-			nextBlockFeerate: chainfee.FeePerKwFloor,
+			nextBlockFeeRate: chainfee.FeePerKwFloor,
 			wantErr:          "for feeRate 363 sat/kw",
 		},
 	}
@@ -263,7 +263,7 @@ func TestPresign(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			err := presign(
 				ctx, tc.presigner, tc.destAddr, tc.sweeps,
-				tc.nextBlockFeerate,
+				tc.nextBlockFeeRate,
 			)
 			if tc.wantErr != "" {
 				require.Error(t, err)

sweepbatcher/sweep_batcher.go

@@ -639,11 +639,11 @@ func (b *Batcher) PresignSweep(ctx context.Context, sweepOutpoint wire.OutPoint,
 	}
 
 	// Find the feerate needed to get into next block. Use conf_target=2,
-	nextBlockFeerate, err := b.wallet.EstimateFeeRate(ctx, 2)
+	nextBlockFeeRate, err := b.wallet.EstimateFeeRate(ctx, 2)
 	if err != nil {
-		return fmt.Errorf("failed to get nextBlockFeerate: %w", err)
+		return fmt.Errorf("failed to get nextBlockFeeRate: %w", err)
 	}
-	infof("nextBlockFeerate is %v", nextBlockFeerate)
+	infof("nextBlockFeeRate is %v", nextBlockFeeRate)
 
 	sweeps := []sweep{
 		{
@@ -654,7 +654,7 @@ func (b *Batcher) PresignSweep(ctx context.Context, sweepOutpoint wire.OutPoint,
 	}
 
 	return presign(
-		ctx, b.presignedHelper, destAddress, sweeps, nextBlockFeerate,
+		ctx, b.presignedHelper, destAddress, sweeps, nextBlockFeeRate,
 	)
 }