highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-07-01 02:51:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

lnd+sweep: remove unused config MaxSweepAttempts

Browse Source
This commit is contained in:
yyforyongyu
2024-03-19 03:53:43 +08:00
parent 0b30d4ba3e
commit 370e4ce98d
3 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server.go
View File

@ -1076,18 +1076,17 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
}) })
s.sweeper = sweep.New(&sweep.UtxoSweeperConfig{ 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{ s.utxoNursery = contractcourt.NewUtxoNursery(&contractcourt.NurseryConfig{

10
sweep/sweeper.go
View File

@ -36,11 +36,6 @@ var (
// it is/has already been stopped. // it is/has already been stopped.
ErrSweeperShuttingDown = errors.New("utxo sweeper shutting down") 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 // DefaultDeadlineDelta defines a default deadline delta (1 week) to be
// used when sweeping inputs with no deadline pressure. // used when sweeping inputs with no deadline pressure.
// //
@ -361,11 +356,6 @@ type UtxoSweeperConfig struct {
// created and published. // created and published.
MaxInputsPerTx uint32 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 is the maximum fee rate allowed within the UtxoSweeper.
MaxFeeRate chainfee.SatPerVByte MaxFeeRate chainfee.SatPerVByte

11
sweep/sweeper_test.go
View File

@ -159,12 +159,11 @@ func createSweeperTestContext(t *testing.T) *sweeperTestContext {
script[1] = 20 script[1] = 20
return script, nil 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() ctx.sweeper.Start()