Browse Source
* mod: bump btcwallet version to accept db timeout * btcwallet: add DBTimeOut in config * kvdb: add database timeout option for bbolt This commit adds a DBTimeout option in bbolt config. The relevant functions walletdb.Open/Create are updated to use this config. In addition, the bolt compacter also applies the new timeout option. * channeldb: add DBTimeout in db options This commit adds the DBTimeout option for channeldb. A new unit test file is created to test the default options. In addition, the params used in kvdb.Create inside channeldb_test is updated with a DefaultDBTimeout value. * contractcourt+routing: use DBTimeout in kvdb This commit touches multiple test files in contractcourt and routing. The call of function kvdb.Create and kvdb.Open are now updated with the new param DBTimeout, using the default value kvdb.DefaultDBTimeout. * lncfg: add DBTimeout option in db config The DBTimeout option is added to db config. A new unit test is added to check the default DB config is created as expected. * migration: add DBTimeout param in kvdb.Create/kvdb.Open * keychain: update tests to use DBTimeout param * htlcswitch+chainreg: add DBTimeout option * macaroons: support DBTimeout config in creation This commit adds the DBTimeout during the creation of macaroons.db. The usage of kvdb.Create and kvdb.Open in its tests are updated with a timeout value using kvdb.DefaultDBTimeout. * walletunlocker: add dbTimeout option in UnlockerService This commit adds a new param, dbTimeout, during the creation of UnlockerService. This param is then passed to wallet.NewLoader inside various service calls, specifying a timeout value to be used when opening the bbolt. In addition, the macaroonService is also called with this dbTimeout param. * watchtower/wtdb: add dbTimeout param during creation This commit adds the dbTimeout param for the creation of both watchtower.db and wtclient.db. * multi: add db timeout param for walletdb.Create This commit adds the db timeout param for the function call walletdb.Create. It touches only the test files found in chainntnfs, lnwallet, and routing. * lnd: pass DBTimeout config to relevant services This commit enables lnd to pass the DBTimeout config to the following services/config/functions, - chainControlConfig - walletunlocker - wallet.NewLoader - macaroons - watchtower In addition, the usage of wallet.Create is updated too. * sample-config: add dbtimeout optionmaster
Yong
3 years ago
committed by
GitHub
39 changed files with 269 additions and 59 deletions
@ -0,0 +1,28 @@
|
||||
package channeldb_test |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"github.com/lightningnetwork/lnd/channeldb" |
||||
"github.com/lightningnetwork/lnd/channeldb/kvdb" |
||||
"github.com/stretchr/testify/require" |
||||
) |
||||
|
||||
// TestDefaultOptions tests the default options are created as intended.
|
||||
func TestDefaultOptions(t *testing.T) { |
||||
|
||||
opts := channeldb.DefaultOptions() |
||||
|
||||
require.True(t, opts.NoFreelistSync) |
||||
require.False(t, opts.AutoCompact) |
||||
require.Equal( |
||||
t, kvdb.DefaultBoltAutoCompactMinAge, opts.AutoCompactMinAge, |
||||
) |
||||
require.Equal(t, kvdb.DefaultDBTimeout, opts.DBTimeout) |
||||
require.Equal( |
||||
t, channeldb.DefaultRejectCacheSize, opts.RejectCacheSize, |
||||
) |
||||
require.Equal( |
||||
t, channeldb.DefaultChannelCacheSize, opts.ChannelCacheSize, |
||||
) |
||||
} |
||||
@ -0,0 +1,24 @@
|
||||
package lncfg_test |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"github.com/lightningnetwork/lnd/channeldb/kvdb" |
||||
"github.com/lightningnetwork/lnd/lncfg" |
||||
"github.com/stretchr/testify/require" |
||||
) |
||||
|
||||
// TestDBDefaultConfig tests that the default DB config is created as expected.
|
||||
func TestDBDefaultConfig(t *testing.T) { |
||||
defaultConfig := lncfg.DefaultDB() |
||||
|
||||
require.Equal(t, lncfg.BoltBackend, defaultConfig.Backend) |
||||
require.Equal( |
||||
t, kvdb.DefaultBoltAutoCompactMinAge, |
||||
defaultConfig.Bolt.AutoCompactMinAge, |
||||
) |
||||
require.Equal(t, kvdb.DefaultDBTimeout, defaultConfig.Bolt.DBTimeout) |
||||
// Implicitly, the following fields are default to false.
|
||||
require.False(t, defaultConfig.Bolt.AutoCompact) |
||||
require.False(t, defaultConfig.Bolt.SyncFreelist) |
||||
} |
||||
Loading…
Reference in new issue