lnd+sweep: remove unused config MaxSweepAttempts

server.go

@@ -1076,18 +1076,17 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
 	})
 
 	s.sweeper = sweep.New(&sweep.UtxoSweeperConfig{
-		FeeEstimator:     cc.FeeEstimator,
+		FeeEstimator:   cc.FeeEstimator,
-		GenSweepScript:   newSweepPkScriptGen(cc.Wallet),
+		GenSweepScript: newSweepPkScriptGen(cc.Wallet),
-		Signer:           cc.Wallet.Cfg.Signer,
+		Signer:         cc.Wallet.Cfg.Signer,
-		Wallet:           newSweeperWallet(cc.Wallet),
+		Wallet:         newSweeperWallet(cc.Wallet),
-		Mempool:          cc.MempoolNotifier,
+		Mempool:        cc.MempoolNotifier,
-		Notifier:         cc.ChainNotifier,
+		Notifier:       cc.ChainNotifier,
-		Store:            sweeperStore,
+		Store:          sweeperStore,
-		MaxInputsPerTx:   sweep.DefaultMaxInputsPerTx,
+		MaxInputsPerTx: sweep.DefaultMaxInputsPerTx,
-		MaxSweepAttempts: sweep.DefaultMaxSweepAttempts,
+		MaxFeeRate:     cfg.Sweeper.MaxFeeRate,
-		MaxFeeRate:       cfg.Sweeper.MaxFeeRate,
+		Aggregator:     aggregator,
-		Aggregator:       aggregator,
+		Publisher:      s.txPublisher,
-		Publisher:        s.txPublisher,
 	})
 
 	s.utxoNursery = contractcourt.NewUtxoNursery(&contractcourt.NurseryConfig{

sweep/sweeper.go

@@ -36,11 +36,6 @@ var (
 	// it is/has already been stopped.
 	ErrSweeperShuttingDown = errors.New("utxo sweeper shutting down")
 
-	// DefaultMaxSweepAttempts specifies the default maximum number of times
-	// an input is included in a publish attempt before giving up and
-	// returning an error to the caller.
-	DefaultMaxSweepAttempts = 10
-
 	// DefaultDeadlineDelta defines a default deadline delta (1 week) to be
 	// used when sweeping inputs with no deadline pressure.
 	//
@@ -361,11 +356,6 @@ type UtxoSweeperConfig struct {
 	// created and published.
 	MaxInputsPerTx uint32
 
-	// MaxSweepAttempts specifies the maximum number of times an input is
-	// included in a publish attempt before giving up and returning an error
-	// to the caller.
-	MaxSweepAttempts int
-
 	// MaxFeeRate is the maximum fee rate allowed within the UtxoSweeper.
 	MaxFeeRate chainfee.SatPerVByte
 

sweep/sweeper_test.go

@@ -159,12 +159,11 @@ func createSweeperTestContext(t *testing.T) *sweeperTestContext {
 			script[1] = 20
 			return script, nil
 		},
-		FeeEstimator:     estimator,
+		FeeEstimator:   estimator,
-		MaxInputsPerTx:   testMaxInputsPerTx,
+		MaxInputsPerTx: testMaxInputsPerTx,
-		MaxSweepAttempts: testMaxSweepAttempts,
+		MaxFeeRate:     DefaultMaxFeeRate,
-		MaxFeeRate:       DefaultMaxFeeRate,
+		Aggregator:     aggregator,
-		Aggregator:       aggregator,
+		Publisher:      mockBumper,
-		Publisher:        mockBumper,
 	})
 
 	ctx.sweeper.Start()