From ccd1b312ca8bbd07e9c2a6b9c8de5afb9d64de8d Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 27 Jun 2024 13:19:37 -0300
Subject: [PATCH] sweepbatcher: fix copy-paste with batch kit

---
 sweepbatcher/sweep_batcher.go | 55 ++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/sweepbatcher/sweep_batcher.go b/sweepbatcher/sweep_batcher.go
index 288a2469..578a427d 100644
--- a/sweepbatcher/sweep_batcher.go
+++ b/sweepbatcher/sweep_batcher.go
@@ -516,17 +516,7 @@ func (b *Batcher) spinUpBatch(ctx context.Context) (*batch, error) {
 		cfg.batchPublishDelay = defaultPublishDelay
 	}
 
-	batchKit := batchKit{
-		returnChan:       b.sweepReqs,
-		wallet:           b.wallet,
-		chainNotifier:    b.chainNotifier,
-		signerClient:     b.signerClient,
-		musig2SignSweep:  b.musig2ServerSign,
-		verifySchnorrSig: b.VerifySchnorrSig,
-		purger:           b.AddSweep,
-		store:            b.store,
-		quit:             b.quit,
-	}
+	batchKit := b.newBatchKit()
 
 	batch := NewBatch(cfg, batchKit)
 
@@ -601,25 +591,15 @@ func (b *Batcher) spinUpBatchFromDB(ctx context.Context, batch *batch) error {
 
 	logger := batchPrefixLogger(fmt.Sprintf("%d", batch.id))
 
-	batchKit := batchKit{
-		id:               batch.id,
-		batchTxid:        batch.batchTxid,
-		batchPkScript:    batch.batchPkScript,
-		state:            batch.state,
-		primaryID:        primarySweep.SwapHash,
-		sweeps:           sweeps,
-		rbfCache:         rbfCache,
-		returnChan:       b.sweepReqs,
-		wallet:           b.wallet,
-		chainNotifier:    b.chainNotifier,
-		signerClient:     b.signerClient,
-		musig2SignSweep:  b.musig2ServerSign,
-		verifySchnorrSig: b.VerifySchnorrSig,
-		purger:           b.AddSweep,
-		store:            b.store,
-		log:              logger,
-		quit:             b.quit,
-	}
+	batchKit := b.newBatchKit()
+	batchKit.id = batch.id
+	batchKit.batchTxid = batch.batchTxid
+	batchKit.batchPkScript = batch.batchPkScript
+	batchKit.state = batch.state
+	batchKit.primaryID = primarySweep.SwapHash
+	batchKit.sweeps = sweeps
+	batchKit.rbfCache = rbfCache
+	batchKit.log = logger
 
 	cfg := b.newBatchConfig(batch.cfg.maxTimeoutDistance)
 
@@ -906,3 +886,18 @@ func (b *Batcher) newBatchConfig(maxTimeoutDistance int32) batchConfig {
 		customMuSig2Signer: b.customMuSig2Signer,
 	}
 }
+
+// newBatchKit creates new batch kit.
+func (b *Batcher) newBatchKit() batchKit {
+	return batchKit{
+		returnChan:       b.sweepReqs,
+		wallet:           b.wallet,
+		chainNotifier:    b.chainNotifier,
+		signerClient:     b.signerClient,
+		musig2SignSweep:  b.musig2ServerSign,
+		verifySchnorrSig: b.VerifySchnorrSig,
+		purger:           b.AddSweep,
+		store:            b.store,
+		quit:             b.quit,
+	}
+}