Skip to content

Commit 6d648ad

Browse files
authored
Merge pull request lightningnetwork#9684 from ziggie1984/master
multi: update new walletdb version in main go.mod and kvdb go.mod
2 parents 4cf18ee + 140dd33 commit 6d648ad

26 files changed

+59
-31
lines changed

aliasmgr/aliasmgr_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ func TestAliasStorePeerAlias(t *testing.T) {
1919
dbPath := filepath.Join(t.TempDir(), "testdb")
2020
db, err := kvdb.Create(
2121
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
22+
false,
2223
)
2324
require.NoError(t, err)
2425
defer db.Close()
@@ -52,6 +53,7 @@ func TestAliasStoreRequest(t *testing.T) {
5253
dbPath := filepath.Join(t.TempDir(), "testdb")
5354
db, err := kvdb.Create(
5455
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
56+
false,
5557
)
5658
require.NoError(t, err)
5759
defer db.Close()
@@ -84,6 +86,7 @@ func TestAliasLifecycle(t *testing.T) {
8486
dbPath := filepath.Join(t.TempDir(), "testdb")
8587
db, err := kvdb.Create(
8688
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
89+
false,
8790
)
8891
require.NoError(t, err)
8992
defer db.Close()

batch/batch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestRetry(t *testing.T) {
1717

1818
dbName := filepath.Join(dbDir, "weks.db")
1919
db, err := walletdb.Create(
20-
"bdb", dbName, true, kvdb.DefaultDBTimeout,
20+
"bdb", dbName, true, kvdb.DefaultDBTimeout, false,
2121
)
2222
if err != nil {
2323
t.Fatalf("unable to create walletdb: %v", err)

channeldb/forwarding_package_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ func makeFwdPkgDB(t *testing.T, path string) kvdb.Backend { // nolint:unparam
859859
}
860860

861861
bdb, err := kvdb.Create(
862-
kvdb.BoltBackendName, path, true, kvdb.DefaultDBTimeout,
862+
kvdb.BoltBackendName, path, true, kvdb.DefaultDBTimeout, false,
863863
)
864864
require.NoError(t, err, "unable to open boltdb")
865865

channeldb/migration_01_to_11/db.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func Open(dbPath string, modifiers ...OptionModifier) (*DB, error) {
5757
// freelist grows to be very large.
5858
bdb, err := kvdb.Open(
5959
kvdb.BoltBackendName, path,
60-
opts.NoFreelistSync, opts.DBTimeout,
60+
opts.NoFreelistSync, opts.DBTimeout, false,
6161
)
6262
if err != nil {
6363
return nil, err
@@ -89,6 +89,7 @@ func createChannelDB(dbPath string) error {
8989
path := filepath.Join(dbPath, dbName)
9090
bdb, err := kvdb.Create(
9191
kvdb.BoltBackendName, path, false, kvdb.DefaultDBTimeout,
92+
false,
9293
)
9394
if err != nil {
9495
return err

channeldb/migtest/migtest.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func MakeDB(t testing.TB) (kvdb.Backend, error) {
2525

2626
db, err := kvdb.Open(
2727
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
28+
false,
2829
)
2930
if err != nil {
3031
return nil, err

config_builder.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,8 @@ func initNeutrinoBackend(ctx context.Context, cfg *Config, chainDir string,
14741474
default:
14751475
dbName := filepath.Join(dbPath, "neutrino.db")
14761476
db, err = walletdb.Create(
1477-
"bdb", dbName, !cfg.SyncFreelist, cfg.DB.Bolt.DBTimeout,
1477+
kvdb.BoltBackendName, dbName, !cfg.SyncFreelist,
1478+
cfg.DB.Bolt.DBTimeout, false,
14781479
)
14791480
}
14801481
if err != nil {

contractcourt/briefcase_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ var (
149149
func makeTestDB(t *testing.T) (kvdb.Backend, error) {
150150
db, err := kvdb.Create(
151151
kvdb.BoltBackendName, t.TempDir()+"/test.db", true,
152-
kvdb.DefaultDBTimeout,
152+
kvdb.DefaultDBTimeout, false,
153153
)
154154
if err != nil {
155155
return nil, err

contractcourt/channel_arbitrator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ func createTestChannelArbitrator(t *testing.T, log ArbitratorLog,
475475
dbPath := filepath.Join(t.TempDir(), "testdb")
476476
db, err := kvdb.Create(
477477
kvdb.BoltBackendName, dbPath, true,
478-
kvdb.DefaultDBTimeout,
478+
kvdb.DefaultDBTimeout, false,
479479
)
480480
if err != nil {
481481
return nil, err

go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ require (
1111
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1212
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
1313
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
14-
github.com/btcsuite/btcwallet v0.16.12
14+
github.com/btcsuite/btcwallet v0.16.13-0.20250409141346-8e790bfb5832
1515
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5
1616
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2
17-
github.com/btcsuite/btcwallet/walletdb v1.4.4
18-
github.com/btcsuite/btcwallet/wtxmgr v1.5.4
17+
github.com/btcsuite/btcwallet/walletdb v1.5.1
18+
github.com/btcsuite/btcwallet/wtxmgr v1.5.5
1919
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
2020
github.com/davecgh/go-spew v1.1.1
2121
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
@@ -216,3 +216,5 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
216216
go 1.23.6
217217

218218
retract v0.0.2
219+
220+
replace github.com/lightningnetwork/lnd/kvdb => ./kvdb

go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhw
6262
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318 h1:oCjIcinPt7XQ644MP/22JcjYEC84qRc3bRBH0d7Hhd4=
6363
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
6464
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
65-
github.com/btcsuite/btcwallet v0.16.12 h1:9SREKY892i1xTGlGLcu6x7O+WSQFn6+uQrSuskAOqh0=
66-
github.com/btcsuite/btcwallet v0.16.12/go.mod h1:jBn+ThFrx/QqW0nXiGvXtJytju4aVoW7C0hY4s/+9vo=
65+
github.com/btcsuite/btcwallet v0.16.13-0.20250409141346-8e790bfb5832 h1:Nd5r1YDNN47hn2UVyOcIJjNRvA90bpUrSVp8wnPMa18=
66+
github.com/btcsuite/btcwallet v0.16.13-0.20250409141346-8e790bfb5832/go.mod h1:Lpr6jNoTiWlgaXqFP+ar2YWSiD6Fl8xlh99WPvuErS4=
6767
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
6868
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
6969
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
7070
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2/go.mod h1:4v+grppsDpVn91SJv+mZT7B8hEV4nSmpREM4I8Uohws=
7171
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 h1:93o5Xz9dYepBP4RMFUc9RGIFXwqP2volSWRkYJFrNtI=
7272
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5/go.mod h1:lQ+e9HxZ85QP7r3kdxItkiMSloSLg1PEGis5o5CXUQw=
73-
github.com/btcsuite/btcwallet/walletdb v1.4.4 h1:BDel6iT/ltYSIYKs0YbjwnEDi7xR3yzABIsQxN2F1L8=
74-
github.com/btcsuite/btcwallet/walletdb v1.4.4/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
75-
github.com/btcsuite/btcwallet/wtxmgr v1.5.4 h1:hJjHy1h/dJwSfD9uDsCwcH21D1iOrus6OrI5gR9E/O0=
76-
github.com/btcsuite/btcwallet/wtxmgr v1.5.4/go.mod h1:lAv0b1Vj9Ig5U8QFm0yiJ9WqPl8yGO/6l7JxdHY1PKE=
73+
github.com/btcsuite/btcwallet/walletdb v1.5.1 h1:HgMhDNCrtEFPC+8q0ei5DQ5U9Tl4RCspA22DEKXlopI=
74+
github.com/btcsuite/btcwallet/walletdb v1.5.1/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
75+
github.com/btcsuite/btcwallet/wtxmgr v1.5.5 h1:VA/rHzAjiNuySPcKgdX3uAywbVczZlG5OZeSU7jYoZo=
76+
github.com/btcsuite/btcwallet/wtxmgr v1.5.5/go.mod h1:lzVbDkk/jRao2ib5kge46aLZW1yFc8RFNycdYpnsmZA=
7777
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
7878
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
7979
github.com/btcsuite/golangcrypto v0.0.0-20150304025918-53f62d9b43e8/go.mod h1:tYvUd8KLhm/oXvUeSEs2VlLghFjQt9+ZaF9ghH0JNjc=
@@ -371,8 +371,6 @@ github.com/lightningnetwork/lnd/fn/v2 v2.0.8 h1:r2SLz7gZYQPVc3IZhU82M66guz3Zk2oY
371371
github.com/lightningnetwork/lnd/fn/v2 v2.0.8/go.mod h1:TOzwrhjB/Azw1V7aa8t21ufcQmdsQOQMDtxVOQWNl8s=
372372
github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
373373
github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
374-
github.com/lightningnetwork/lnd/kvdb v1.4.14 h1:VALUyoBCFKQm/3GAIdTIoUGplWBfZbo5uCr7BTY9QZY=
375-
github.com/lightningnetwork/lnd/kvdb v1.4.14/go.mod h1:1y0Z81CGQu4SMpcnAie/oK4tzgEqFQqFdj6k3fz2s8s=
376374
github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
377375
github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
378376
github.com/lightningnetwork/lnd/sqldb v1.0.9 h1:7OHi+Hui823mB/U9NzCdlZTAGSVdDCbjp33+6d/Q+G0=

0 commit comments

Comments
 (0)