multi: update RPC error import path
These errors are now defined in `btcwallet/chain` instead of `btcd/rpcclient`.
This commit is contained in:
6 files changed
+24
-21
No files matched your search
+3
-3
@@ -427,7 +427,7 @@ func (t *TxPublisher) createRBFCompliantTx(req *BumpRequest,
|
||||
fallthrough
|
||||
|
||||
// We are not paying enough fees so we increase it.
|
||||
case errors.Is(err, rpcclient.ErrInsufficientFee):
|
||||
case errors.Is(err, chain.ErrInsufficientFee):
|
||||
increased := false
|
||||
|
||||
// Keep calling the fee function until the fee rate is
|
||||
@@ -934,7 +934,7 @@ func (t *TxPublisher) createAndPublishTx(requestID uint64,
|
||||
// - if the deadline is close, we expect the fee function to give us a
|
||||
// higher fee rate. If the fee rate cannot satisfy the RBF rules, it
|
||||
// means the budget is not enough.
|
||||
if errors.Is(err, rpcclient.ErrInsufficientFee) ||
|
||||
if errors.Is(err, chain.ErrInsufficientFee) ||
|
||||
errors.Is(err, lnwallet.ErrMempoolFee) {
|
||||
|
||||
log.Debugf("Failed to bump tx %v: %v", oldTx.TxHash(), err)
|
||||
@@ -989,7 +989,7 @@ func (t *TxPublisher) createAndPublishTx(requestID uint64,
|
||||
//
|
||||
// NOTE: we may get this error if we've bypassed the mempool check,
|
||||
// which means we are suing neutrino backend.
|
||||
if errors.Is(result.Err, rpcclient.ErrInsufficientFee) ||
|
||||
if errors.Is(result.Err, chain.ErrInsufficientFee) ||
|
||||
errors.Is(result.Err, lnwallet.ErrMempoolFee) {
|
||||
|
||||
log.Debugf("Failed to bump tx %v: %v", oldTx.TxHash(), err)
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
|
||||
"github.com/btcsuite/btcd/btcutil"
|
||||
"github.com/btcsuite/btcd/chaincfg/chainhash"
|
||||
"github.com/btcsuite/btcd/rpcclient"
|
||||
"github.com/btcsuite/btcd/wire"
|
||||
"github.com/btcsuite/btcwallet/chain"
|
||||
"github.com/lightningnetwork/lnd/chainntnfs"
|
||||
"github.com/lightningnetwork/lnd/input"
|
||||
"github.com/lightningnetwork/lnd/keychain"
|
||||
@@ -569,7 +569,7 @@ func TestCreateRBFCompliantTx(t *testing.T) {
|
||||
// for the first call.
|
||||
m.wallet.On("CheckMempoolAcceptance",
|
||||
mock.Anything).Return(
|
||||
rpcclient.ErrInsufficientFee).Once()
|
||||
chain.ErrInsufficientFee).Once()
|
||||
|
||||
// Mock the fee function to increase feerate.
|
||||
m.feeFunc.On("Increment").Return(
|
||||
@@ -591,7 +591,7 @@ func TestCreateRBFCompliantTx(t *testing.T) {
|
||||
// for the first call.
|
||||
m.wallet.On("CheckMempoolAcceptance",
|
||||
mock.Anything).Return(
|
||||
rpcclient.ErrInsufficientFee).Once()
|
||||
chain.ErrInsufficientFee).Once()
|
||||
|
||||
// Mock the fee function to NOT increase
|
||||
// feerate on the first round.
|
||||
@@ -1087,7 +1087,7 @@ func TestCreateAnPublishFail(t *testing.T) {
|
||||
// Mock the testmempoolaccept to return a fee related error that should
|
||||
// be ignored.
|
||||
m.wallet.On("CheckMempoolAcceptance",
|
||||
mock.Anything).Return(rpcclient.ErrInsufficientFee).Once()
|
||||
mock.Anything).Return(chain.ErrInsufficientFee).Once()
|
||||
|
||||
// Call the createAndPublish method and expect a none option.
|
||||
resultOpt = tp.createAndPublishTx(requestID, record)
|
||||
|
||||
Reference in new issue
Block a user