mirror/lnd
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #9684 from ziggie1984/master

Browse Source 
multi: update new walletdb version in main go.mod and kvdb go.mod
This commit is contained in:
Oliver Gugger authored and GitHub committed 2025-04-14 15:56:16 +02:00
2 parents 4cf18ee45c 140dd339c1
commit 6d648ad90a
26 files changed
+59 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

aliasmgr/aliasmgr_test.go
+3
View File
@@ -19,6 +19,7 @@ func TestAliasStorePeerAlias(t *testing.T) {
dbPath := filepath.Join(t.TempDir(), "testdb")
db, err := kvdb.Create(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
require.NoError(t, err)
defer db.Close()
@@ -52,6 +53,7 @@ func TestAliasStoreRequest(t *testing.T) {
dbPath := filepath.Join(t.TempDir(), "testdb")
db, err := kvdb.Create(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
require.NoError(t, err)
defer db.Close()
@@ -84,6 +86,7 @@ func TestAliasLifecycle(t *testing.T) {
dbPath := filepath.Join(t.TempDir(), "testdb")
db, err := kvdb.Create(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
require.NoError(t, err)
defer db.Close()
batch/batch_test.go
+1 -1
View File
@@ -17,7 +17,7 @@ func TestRetry(t *testing.T) {
dbName := filepath.Join(dbDir, "weks.db")
db, err := walletdb.Create(
"bdb", dbName, true, kvdb.DefaultDBTimeout,
"bdb", dbName, true, kvdb.DefaultDBTimeout, false,
)
if err != nil {
t.Fatalf("unable to create walletdb: %v", err)
channeldb/forwarding_package_test.go
+1 -1
View File
@@ -859,7 +859,7 @@ func makeFwdPkgDB(t *testing.T, path string) kvdb.Backend { // nolint:unparam
}
bdb, err := kvdb.Create(
kvdb.BoltBackendName, path, true, kvdb.DefaultDBTimeout,
kvdb.BoltBackendName, path, true, kvdb.DefaultDBTimeout, false,
)
require.NoError(t, err, "unable to open boltdb")
channeldb/migration_01_to_11/db.go
+2 -1
View File
@@ -57,7 +57,7 @@ func Open(dbPath string, modifiers ...OptionModifier) (*DB, error) {
// freelist grows to be very large.
bdb, err := kvdb.Open(
kvdb.BoltBackendName, path,
opts.NoFreelistSync, opts.DBTimeout,
opts.NoFreelistSync, opts.DBTimeout, false,
)
if err != nil {
return nil, err
@@ -89,6 +89,7 @@ func createChannelDB(dbPath string) error {
path := filepath.Join(dbPath, dbName)
bdb, err := kvdb.Create(
kvdb.BoltBackendName, path, false, kvdb.DefaultDBTimeout,
false,
)
if err != nil {
return err
channeldb/migtest/migtest.go
+1
View File
@@ -25,6 +25,7 @@ func MakeDB(t testing.TB) (kvdb.Backend, error) {
db, err := kvdb.Open(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
if err != nil {
return nil, err
config_builder.go
+2 -1
View File
@@ -1474,7 +1474,8 @@ func initNeutrinoBackend(ctx context.Context, cfg *Config, chainDir string,
default:
dbName := filepath.Join(dbPath, "neutrino.db")
db, err = walletdb.Create(
"bdb", dbName, !cfg.SyncFreelist, cfg.DB.Bolt.DBTimeout,
kvdb.BoltBackendName, dbName, !cfg.SyncFreelist,
cfg.DB.Bolt.DBTimeout, false,
)
}
if err != nil {
contractcourt/briefcase_test.go
+1 -1
View File
@@ -149,7 +149,7 @@ var (
func makeTestDB(t *testing.T) (kvdb.Backend, error) {
db, err := kvdb.Create(
kvdb.BoltBackendName, t.TempDir()+"/test.db", true,
kvdb.DefaultDBTimeout,
kvdb.DefaultDBTimeout, false,
)
if err != nil {
return nil, err
contractcourt/channel_arbitrator_test.go
+1 -1
View File
@@ -475,7 +475,7 @@ func createTestChannelArbitrator(t *testing.T, log ArbitratorLog,
dbPath := filepath.Join(t.TempDir(), "testdb")
db, err := kvdb.Create(
kvdb.BoltBackendName, dbPath, true,
kvdb.DefaultDBTimeout,
kvdb.DefaultDBTimeout, false,
)
if err != nil {
return nil, err
go.mod
+5 -3
View File
@@ -11,11 +11,11 @@ require (
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
github.com/btcsuite/btcwallet v0.16.12
github.com/btcsuite/btcwallet v0.16.13-0.20250409141346-8e790bfb5832
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2
github.com/btcsuite/btcwallet/walletdb v1.4.4
github.com/btcsuite/btcwallet/wtxmgr v1.5.4
github.com/btcsuite/btcwallet/walletdb v1.5.1
github.com/btcsuite/btcwallet/wtxmgr v1.5.5
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/davecgh/go-spew v1.1.1
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
go 1.23.6
retract v0.0.2
replace github.com/lightningnetwork/lnd/kvdb => ./kvdb
go.sum
+6 -8
View File
@@ -62,18 +62,18 @@ github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhw
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318 h1:oCjIcinPt7XQ644MP/22JcjYEC84qRc3bRBH0d7Hhd4=
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
github.com/btcsuite/btcwallet v0.16.12 h1:9SREKY892i1xTGlGLcu6x7O+WSQFn6+uQrSuskAOqh0=
github.com/btcsuite/btcwallet v0.16.12/go.mod h1:jBn+ThFrx/QqW0nXiGvXtJytju4aVoW7C0hY4s/+9vo=
github.com/btcsuite/btcwallet v0.16.13-0.20250409141346-8e790bfb5832 h1:Nd5r1YDNN47hn2UVyOcIJjNRvA90bpUrSVp8wnPMa18=
github.com/btcsuite/btcwallet v0.16.13-0.20250409141346-8e790bfb5832/go.mod h1:Lpr6jNoTiWlgaXqFP+ar2YWSiD6Fl8xlh99WPvuErS4=
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2/go.mod h1:4v+grppsDpVn91SJv+mZT7B8hEV4nSmpREM4I8Uohws=
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 h1:93o5Xz9dYepBP4RMFUc9RGIFXwqP2volSWRkYJFrNtI=
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5/go.mod h1:lQ+e9HxZ85QP7r3kdxItkiMSloSLg1PEGis5o5CXUQw=
github.com/btcsuite/btcwallet/walletdb v1.4.4 h1:BDel6iT/ltYSIYKs0YbjwnEDi7xR3yzABIsQxN2F1L8=
github.com/btcsuite/btcwallet/walletdb v1.4.4/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
github.com/btcsuite/btcwallet/wtxmgr v1.5.4 h1:hJjHy1h/dJwSfD9uDsCwcH21D1iOrus6OrI5gR9E/O0=
github.com/btcsuite/btcwallet/wtxmgr v1.5.4/go.mod h1:lAv0b1Vj9Ig5U8QFm0yiJ9WqPl8yGO/6l7JxdHY1PKE=
github.com/btcsuite/btcwallet/walletdb v1.5.1 h1:HgMhDNCrtEFPC+8q0ei5DQ5U9Tl4RCspA22DEKXlopI=
github.com/btcsuite/btcwallet/walletdb v1.5.1/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
github.com/btcsuite/btcwallet/wtxmgr v1.5.5 h1:VA/rHzAjiNuySPcKgdX3uAywbVczZlG5OZeSU7jYoZo=
github.com/btcsuite/btcwallet/wtxmgr v1.5.5/go.mod h1:lzVbDkk/jRao2ib5kge46aLZW1yFc8RFNycdYpnsmZA=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
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
github.com/lightningnetwork/lnd/fn/v2 v2.0.8/go.mod h1:TOzwrhjB/Azw1V7aa8t21ufcQmdsQOQMDtxVOQWNl8s=
github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
github.com/lightningnetwork/lnd/kvdb v1.4.14 h1:VALUyoBCFKQm/3GAIdTIoUGplWBfZbo5uCr7BTY9QZY=
github.com/lightningnetwork/lnd/kvdb v1.4.14/go.mod h1:1y0Z81CGQu4SMpcnAie/oK4tzgEqFQqFdj6k3fz2s8s=
github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
github.com/lightningnetwork/lnd/sqldb v1.0.9 h1:7OHi+Hui823mB/U9NzCdlZTAGSVdDCbjp33+6d/Q+G0=
htlcswitch/resolution_store_test.go
+1
View File
@@ -41,6 +41,7 @@ func TestInsertAndDelete(t *testing.T) {
dbPath := filepath.Join(t.TempDir(), "testdb")
db, err := kvdb.Create(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
require.NoError(t, err)
t.Cleanup(func() {
kvdb/backend.go
+7 -2
View File
@@ -73,6 +73,10 @@ type BoltBackendConfig struct {
// DBTimeout specifies the timeout value to use when opening the wallet
// database.
DBTimeout time.Duration
// ReadOnly specifies if the database should be opened in read-only
// mode.
ReadOnly bool
}
// GetBoltBackend opens (or creates if doesn't exits) a bbolt backed database
@@ -90,7 +94,7 @@ func GetBoltBackend(cfg *BoltBackendConfig) (Backend, error) {
return Create(
BoltBackendName, dbFilePath,
cfg.NoFreelistSync, cfg.DBTimeout,
cfg.NoFreelistSync, cfg.DBTimeout, cfg.ReadOnly,
)
}
@@ -104,7 +108,7 @@ func GetBoltBackend(cfg *BoltBackendConfig) (Backend, error) {
return Open(
BoltBackendName, dbFilePath,
cfg.NoFreelistSync, cfg.DBTimeout,
cfg.NoFreelistSync, cfg.DBTimeout, cfg.ReadOnly,
)
}
@@ -294,6 +298,7 @@ func GetTestBackend(path, name string) (Backend, func(), error) {
DBFileName: name,
NoFreelistSync: true,
DBTimeout: DefaultDBTimeout,
ReadOnly: false,
})
if err != nil {
return nil, nil, err
kvdb/backend_js.go
+4
View File
@@ -35,6 +35,10 @@ type BoltBackendConfig struct {
// DBTimeout specifies the timeout value to use when opening the wallet
// database.
DBTimeout time.Duration
// ReadOnly specifies if the database should be opened in read-only
// mode.
ReadOnly bool
}
// GetBoltBackend opens (or creates if doesn't exits) a bbolt backed database
kvdb/bolt_fixture.go
+1
View File
@@ -28,6 +28,7 @@ func (b *boltFixture) NewBackend() walletdb.DB {
DBFileName: "test.db",
NoFreelistSync: true,
DBTimeout: DefaultDBTimeout,
ReadOnly: false,
})
require.NoError(b.t, err)
kvdb/go.mod
+1 -1
View File
@@ -2,7 +2,7 @@ module github.com/lightningnetwork/lnd/kvdb
require (
github.com/btcsuite/btclog/v2 v2.0.0-20241017175713-3428138b75c7
github.com/btcsuite/btcwallet/walletdb v1.4.4
github.com/btcsuite/btcwallet/walletdb v1.5.1
github.com/davecgh/go-spew v1.1.1
github.com/fergusstrange/embedded-postgres v1.25.0
github.com/google/btree v1.0.1
kvdb/go.sum
+2 -2
View File
@@ -42,8 +42,8 @@ github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhw
github.com/btcsuite/btclog/v2 v2.0.0-20241017175713-3428138b75c7 h1:3Ct3zN3VCEKVm5nceWBBEKczc+jvTfVyOEG71ob2Yuc=
github.com/btcsuite/btclog/v2 v2.0.0-20241017175713-3428138b75c7/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
github.com/btcsuite/btcwallet/walletdb v1.4.4 h1:BDel6iT/ltYSIYKs0YbjwnEDi7xR3yzABIsQxN2F1L8=
github.com/btcsuite/btcwallet/walletdb v1.4.4/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
github.com/btcsuite/btcwallet/walletdb v1.5.1 h1:HgMhDNCrtEFPC+8q0ei5DQ5U9Tl4RCspA22DEKXlopI=
github.com/btcsuite/btcwallet/walletdb v1.5.1/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
kvdb/interface.go
+4
View File
@@ -157,4 +157,8 @@ var (
// ErrDatabaseNotOpen is returned when a database instance is accessed
// before it is opened or after it is closed.
ErrDatabaseNotOpen = walletdb.ErrDbNotOpen
// ErrDbDoesNotExist is returned when a database instance is opened
// but it does not exist.
ErrDbDoesNotExist = walletdb.ErrDbDoesNotExist
)
lntest/unittest/backend.go
+2 -1
View File
@@ -324,7 +324,8 @@ func NewNeutrinoBackend(t *testing.T, netParams *chaincfg.Params,
dbName := filepath.Join(spvDir, "neutrino.db")
spvDatabase, err := walletdb.Create(
"bdb", dbName, true, kvdb.DefaultDBTimeout,
kvdb.BoltBackendName, dbName, true, kvdb.DefaultDBTimeout,
false,
)
if err != nil {
t.Fatalf("unable to create walletdb: %v", err)
lnwallet/test/test_interface.go
+6 -4
View File
@@ -3294,8 +3294,9 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
// Start Alice - open a database, start a neutrino
// instance, and initialize a btcwallet driver for it.
aliceDB, err := walletdb.Create(
"bdb", tempTestDirAlice+"/neutrino.db", true,
kvdb.DefaultDBTimeout,
kvdb.BoltBackendName,
filepath.Join(tempTestDirAlice, "neutrino.db"),
true, kvdb.DefaultDBTimeout, false,
)
if err != nil {
t.Fatalf("unable to create DB: %v", err)
@@ -3323,8 +3324,9 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
// Start Bob - open a database, start a neutrino
// instance, and initialize a btcwallet driver for it.
bobDB, err := walletdb.Create(
"bdb", tempTestDirBob+"/neutrino.db", true,
kvdb.DefaultDBTimeout,
kvdb.BoltBackendName,
filepath.Join(tempTestDirBob, "neutrino.db"),
true, kvdb.DefaultDBTimeout, false,
)
if err != nil {
t.Fatalf("unable to create DB: %v", err)
macaroons/service_test.go
+1 -1
View File
@@ -35,7 +35,7 @@ var (
func setupTestRootKeyStorage(t *testing.T) kvdb.Backend {
db, err := kvdb.Create(
kvdb.BoltBackendName, path.Join(t.TempDir(), "macaroons.db"), true,
kvdb.DefaultDBTimeout,
kvdb.DefaultDBTimeout, false,
)
require.NoError(t, err, "Error opening store DB")
t.Cleanup(func() {
macaroons/store_test.go
+1 -1
View File
@@ -37,7 +37,7 @@ func newTestStore(t *testing.T) (string, *macaroons.RootKeyStorage) {
func openTestStore(t *testing.T, tempDir string) *macaroons.RootKeyStorage {
db, err := kvdb.Create(
kvdb.BoltBackendName, path.Join(tempDir, "weks.db"), true,
kvdb.DefaultDBTimeout,
kvdb.DefaultDBTimeout, false,
)
require.NoError(t, err)
routing/chainview/interface_test.go
+2 -1
View File
@@ -757,7 +757,8 @@ var interfaceImpls = []struct {
dbName := filepath.Join(spvDir, "neutrino.db")
spvDatabase, err := walletdb.Create(
"bdb", dbName, true, kvdb.DefaultDBTimeout,
kvdb.BoltBackendName, dbName, true,
kvdb.DefaultDBTimeout, false,
)
if err != nil {
return nil, err
routing/integrated_routing_context_test.go
+1
View File
@@ -152,6 +152,7 @@ func (c *integratedRoutingContext) testPayment(maxParts uint32,
db, err := kvdb.Open(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
if err != nil {
c.t.Fatal(err)
routing/missioncontrol_store_test.go
+1
View File
@@ -54,6 +54,7 @@ func newMCStoreTestHarness(t testing.TB, maxRecords int,
db, err := kvdb.Create(
kvdb.BoltBackendName, dbPath, true, kvdb.DefaultDBTimeout,
false,
)
require.NoError(t, err)
t.Cleanup(func() {
routing/missioncontrol_test.go
+1
View File
@@ -72,6 +72,7 @@ func createMcTestContext(t *testing.T) *mcTestContext {
ctx.db, err = kvdb.Open(
kvdb.BoltBackendName, ctx.dbPath, true, kvdb.DefaultDBTimeout,
false,
)
if err != nil {
t.Fatal(err)
walletunlocker/service_test.go
+1 -1
View File
@@ -114,7 +114,7 @@ func openOrCreateTestMacStore(tempDir string, pw *[]byte,
}
db, err := kvdb.Create(
kvdb.BoltBackendName, path.Join(netDir, "macaroons.db"),
true, kvdb.DefaultDBTimeout,
true, kvdb.DefaultDBTimeout, false,
)
if err != nil {
return nil, err