diff --git a/lntest/mock/walletcontroller.go b/lntest/mock/walletcontroller.go index a63c8c70..c1f723da 100644 --- a/lntest/mock/walletcontroller.go +++ b/lntest/mock/walletcontroller.go @@ -114,8 +114,8 @@ func (w *WalletController) CreateSimpleTx(outputs []*wire.TxOut, // ListUnspentWitness is called by the wallet when doing coin selection. We just // need one unspent for the funding transaction. -func (w *WalletController) ListUnspentWitness(minconfirms, - maxconfirms int32, _ string) ([]*lnwallet.Utxo, error) { +func (w *WalletController) ListUnspentWitness(minConfs, + maxConfs int32, _ string) ([]*lnwallet.Utxo, error) { // If the mock already has a list of utxos, return it. if w.Utxos != nil { diff --git a/lnwallet/btcwallet/btcwallet.go b/lnwallet/btcwallet/btcwallet.go index 07c542d1..3173a0e4 100644 --- a/lnwallet/btcwallet/btcwallet.go +++ b/lnwallet/btcwallet/btcwallet.go @@ -484,7 +484,7 @@ func (b *BtcWallet) ImportPublicKey(pubKey *btcec.PublicKey, // // This is a part of the WalletController interface. func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut, - feeRate chainfee.SatPerKWeight, minconf int32, label string) (*wire.MsgTx, error) { + feeRate chainfee.SatPerKWeight, minConfs int32, label string) (*wire.MsgTx, error) { // Convert our fee rate from sat/kw to sat/kb since it's required by // SendOutputs. @@ -495,13 +495,13 @@ func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut, return nil, lnwallet.ErrNoOutputs } - // Sanity check minconf. - if minconf < 0 { + // Sanity check minConfs. + if minConfs < 0 { return nil, lnwallet.ErrInvalidMinconf } return b.wallet.SendOutputs( - outputs, nil, defaultAccount, minconf, feeSatPerKB, label, + outputs, nil, defaultAccount, minConfs, feeSatPerKB, label, ) } @@ -608,11 +608,11 @@ func (b *BtcWallet) ReleaseOutput(id wtxmgr.LockID, op wire.OutPoint) error { } // ListUnspentWitness returns all unspent outputs which are version 0 witness -// programs. The 'minconfirms' and 'maxconfirms' parameters indicate the minimum +// programs. The 'minConfs' and 'maxConfs' parameters indicate the minimum // and maximum number of confirmations an output needs in order to be returned -// by this method. Passing -1 as 'minconfirms' indicates that even unconfirmed -// outputs should be returned. Using MaxInt32 as 'maxconfirms' implies returning -// all outputs with at least 'minconfirms'. The account parameter serves as a +// by this method. Passing -1 as 'minConfs' indicates that even unconfirmed +// outputs should be returned. Using MaxInt32 as 'maxConfs' implies returning +// all outputs with at least 'minConfs'. The account parameter serves as a // filter to retrieve the unspent outputs for a specific account. When empty, // the unspent outputs of all wallet accounts are returned. // diff --git a/lnwallet/interface.go b/lnwallet/interface.go index dc2d9053..cf062282 100644 --- a/lnwallet/interface.go +++ b/lnwallet/interface.go @@ -66,7 +66,7 @@ var ( var ErrNoOutputs = errors.New("no outputs") // ErrInvalidMinconf is returned if we try to create a transaction with -// invalid minconf value. +// invalid minConfs value. var ErrInvalidMinconf = errors.New("minimum number of confirmations must " + "be a non-negative number") @@ -236,7 +236,7 @@ type WalletController interface { // // NOTE: This method requires the global coin selection lock to be held. SendOutputs(outputs []*wire.TxOut, - feeRate chainfee.SatPerKWeight, minconf int32, label string) (*wire.MsgTx, error) + feeRate chainfee.SatPerKWeight, minConfs int32, label string) (*wire.MsgTx, error) // CreateSimpleTx creates a Bitcoin transaction paying to the specified // outputs. The transaction is not broadcasted to the network. In the @@ -254,17 +254,17 @@ type WalletController interface { dryRun bool) (*txauthor.AuthoredTx, error) // ListUnspentWitness returns all unspent outputs which are version 0 - // witness programs. The 'minconfirms' and 'maxconfirms' parameters + // witness programs. The 'minConfs' and 'maxConfs' parameters // indicate the minimum and maximum number of confirmations an output // needs in order to be returned by this method. Passing -1 as - // 'minconfirms' indicates that even unconfirmed outputs should be - // returned. Using MaxInt32 as 'maxconfirms' implies returning all - // outputs with at least 'minconfirms'. The account parameter serves as + // 'minConfs' indicates that even unconfirmed outputs should be + // returned. Using MaxInt32 as 'maxConfs' implies returning all + // outputs with at least 'minConfs'. The account parameter serves as // a filter to retrieve the unspent outputs for a specific account. // When empty, the unspent outputs of all wallet accounts are returned. // // NOTE: This method requires the global coin selection lock to be held. - ListUnspentWitness(minconfirms, maxconfirms int32, + ListUnspentWitness(minConfs, maxConfs int32, accountFilter string) ([]*Utxo, error) // ListTransactionDetails returns a list of all transactions which are diff --git a/rpcserver.go b/rpcserver.go index dd7e42c9..f21f5a6c 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -964,7 +964,7 @@ func allowCORS(handler http.Handler, origins []string) http.Handler { // more addresses specified in the passed payment map. The payment map maps an // address to a specified output value to be sent to that address. func (r *rpcServer) sendCoinsOnChain(paymentMap map[string]int64, - feeRate chainfee.SatPerKWeight, minconf int32, + feeRate chainfee.SatPerKWeight, minConfs int32, label string) (*chainhash.Hash, error) { outputs, err := addrPairsToOutputs(paymentMap, r.cfg.ActiveNetParams.Params) @@ -989,7 +989,7 @@ func (r *rpcServer) sendCoinsOnChain(paymentMap map[string]int64, // If that checks out, we're failry confident that creating sending to // these outputs will keep the wallet balance above the reserve. tx, err := r.server.cc.Wallet.SendOutputs( - outputs, feeRate, minconf, label, + outputs, feeRate, minConfs, label, ) if err != nil { return nil, err diff --git a/sweep/backend_mock_test.go b/sweep/backend_mock_test.go index 5d7c6257..f8d039ba 100644 --- a/sweep/backend_mock_test.go +++ b/sweep/backend_mock_test.go @@ -87,7 +87,7 @@ func (b *mockBackend) PublishTransaction(tx *wire.MsgTx, _ string) error { return err } -func (b *mockBackend) ListUnspentWitnessFromDefaultAccount(minconfirms, maxconfirms int32) ( +func (b *mockBackend) ListUnspentWitnessFromDefaultAccount(minConfs, maxConfs int32) ( []*lnwallet.Utxo, error) { b.lock.Lock() defer b.lock.Unlock() diff --git a/sweep/interface.go b/sweep/interface.go index baef4661..df7e00aa 100644 --- a/sweep/interface.go +++ b/sweep/interface.go @@ -13,10 +13,10 @@ type Wallet interface { // ListUnspentWitnessFromDefaultAccount returns all unspent outputs // which are version 0 witness programs from the default wallet account. - // The 'minconfirms' and 'maxconfirms' parameters indicate the minimum + // The 'minConfs' and 'maxConfs' parameters indicate the minimum // and maximum number of confirmations an output needs in order to be // returned by this method. - ListUnspentWitnessFromDefaultAccount(minconfirms, maxconfirms int32) ( + ListUnspentWitnessFromDefaultAccount(minConfs, maxConfs int32) ( []*lnwallet.Utxo, error) // WithCoinSelectLock will execute the passed function closure in a diff --git a/sweep/tx_input_set_test.go b/sweep/tx_input_set_test.go index 464f9e22..ff21ff8e 100644 --- a/sweep/tx_input_set_test.go +++ b/sweep/tx_input_set_test.go @@ -112,7 +112,7 @@ type mockWallet struct { Wallet } -func (m *mockWallet) ListUnspentWitnessFromDefaultAccount(minconfirms, maxconfirms int32) ( +func (m *mockWallet) ListUnspentWitnessFromDefaultAccount(minConfs, maxConfs int32) ( []*lnwallet.Utxo, error) { return []*lnwallet.Utxo{