mirror of
https://github.com/lightninglabs/loop.git
synced 2026-08-13 12:33:03 +02:00
sweepbatcher: remove const defaultBatchConfTarget
It is always overwritten with primary sweep's confTarget. Print a warning if batchConfTarget is 0 in updateRbfRate. See https://github.com/lightninglabs/loop/pull/754#discussion_r1613514363
This commit is contained in:
parent
40ad1ce609
commit
87fb185a9b
2 changed files with 4 additions and 6 deletions
|
|
@ -35,10 +35,6 @@ const (
|
|||
// fee rate is increased when an rbf is attempted.
|
||||
defaultFeeRateStep = chainfee.SatPerKWeight(100)
|
||||
|
||||
// defaultBatchConfTarget is the default confirmation target of the
|
||||
// batch transaction.
|
||||
defaultBatchConfTarget = 12
|
||||
|
||||
// batchConfHeight is the default confirmation height of the batch
|
||||
// transaction.
|
||||
batchConfHeight = 3
|
||||
|
|
@ -1059,6 +1055,10 @@ func (b *batch) updateRbfRate(ctx context.Context) error {
|
|||
// If the feeRate is unset then we never published before, so we
|
||||
// retrieve the fee estimate from our wallet.
|
||||
if b.rbfCache.FeeRate == 0 {
|
||||
if b.cfg.batchConfTarget == 0 {
|
||||
b.log.Warnf("updateRbfRate called with zero " +
|
||||
"batchConfTarget")
|
||||
}
|
||||
b.log.Infof("initializing rbf fee rate for conf target=%v",
|
||||
b.cfg.batchConfTarget)
|
||||
rate, err := b.wallet.EstimateFeeRate(
|
||||
|
|
|
|||
|
|
@ -378,7 +378,6 @@ func (b *Batcher) handleSweep(ctx context.Context, sweep *sweep,
|
|||
func (b *Batcher) spinUpBatch(ctx context.Context) (*batch, error) {
|
||||
cfg := batchConfig{
|
||||
maxTimeoutDistance: defaultMaxTimeoutDistance,
|
||||
batchConfTarget: defaultBatchConfTarget,
|
||||
}
|
||||
|
||||
switch b.chainParams {
|
||||
|
|
@ -488,7 +487,6 @@ func (b *Batcher) spinUpBatchFromDB(ctx context.Context, batch *batch) error {
|
|||
|
||||
cfg := batchConfig{
|
||||
maxTimeoutDistance: batch.cfg.maxTimeoutDistance,
|
||||
batchConfTarget: defaultBatchConfTarget,
|
||||
}
|
||||
|
||||
newBatch, err := NewBatchFromDB(cfg, batchKit)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue