From 52131d86902affc06c8b054a2dad5c5bdf5902ea Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Thu, 7 Jan 2021 16:39:41 +0100 Subject: [PATCH] manager: distinguish between lnwallet and btcwallet/wallet err Unfortunately there are two error messages that are very similar (the only difference is "doesn't" vs. "does not") and can both be returned, depending on the code path taken. --- account/manager.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/account/manager.go b/account/manager.go index c1edb9f..9d0dbdd 100644 --- a/account/manager.go +++ b/account/manager.go @@ -15,6 +15,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/txsort" + "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wallet/txrules" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightninglabs/lndclient" @@ -1249,9 +1250,15 @@ func (m *Manager) BumpAccountFee(ctx context.Context, err := m.cfg.Wallet.BumpFee(ctx, op, newFeeRate) if err != nil { // Output isn't known to lnd, continue to the next one. + // Unfortunately there are two slightly different error + // messages that can be returned, depending on what code + // path is taken. if strings.Contains(err.Error(), lnwallet.ErrNotMine.Error()) { continue } + if strings.Contains(err.Error(), wallet.ErrNotMine.Error()) { + continue + } // A fatal error occurred, return it. return err