From aaf5a161f50539de72c71e77611eda18a6c2cfee Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 15 Dec 2020 12:52:06 +0100 Subject: [PATCH] walletinfo: add missing timeout arg to walletdb open --- cmd/chantools/walletinfo.go | 6 +++++- lnd/channeldb.go | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/chantools/walletinfo.go b/cmd/chantools/walletinfo.go index 9459e37..a88bdc5 100644 --- a/cmd/chantools/walletinfo.go +++ b/cmd/chantools/walletinfo.go @@ -13,6 +13,7 @@ import ( "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/walletdb" + "github.com/guggero/chantools/lnd" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" @@ -94,7 +95,10 @@ func (c *walletInfoCommand) Execute(_ []string) error { } // Try to load and open the wallet. - db, err := walletdb.Open("bdb", cleanAndExpandPath(c.WalletDB), false) + db, err := walletdb.Open( + "bdb", cleanAndExpandPath(c.WalletDB), false, + lnd.DefaultOpenTimeout, + ) if err != nil { return fmt.Errorf("error opening wallet database: %v", err) } diff --git a/lnd/channeldb.go b/lnd/channeldb.go index be53fbe..bae3e98 100644 --- a/lnd/channeldb.go +++ b/lnd/channeldb.go @@ -11,11 +11,11 @@ import ( ) const ( - defaultOpenTimeout = time.Second * 10 + DefaultOpenTimeout = time.Second * 10 ) func OpenDB(dbPath string, readonly bool) (*channeldb.DB, error) { - backend, err := openDB(dbPath, false, readonly, defaultOpenTimeout) + backend, err := openDB(dbPath, false, readonly, DefaultOpenTimeout) if err != nil { return nil, err }