From 14c851c8fc5f0e8419eb264df05575b1cf5f053e Mon Sep 17 00:00:00 2001 From: Andras Banki-Horvath Date: Mon, 26 Apr 2021 19:08:11 +0200 Subject: [PATCH] kvdb: move channeldb/kvdb to top level --- autopilot/graph.go | 2 +- batch/batch.go | 2 +- batch/interface.go | 2 +- batch/scheduler.go | 2 +- breacharbiter.go | 2 +- chainntnfs/height_hint_cache.go | 2 +- chainntnfs/test_utils.go | 2 +- channeldb/channel.go | 2 +- channeldb/channel_test.go | 2 +- channeldb/db.go | 2 +- channeldb/db_test.go | 2 +- channeldb/duplicate_payments.go | 2 +- channeldb/forwarding_log.go | 2 +- channeldb/forwarding_package.go | 2 +- channeldb/forwarding_package_test.go | 2 +- channeldb/graph.go | 2 +- channeldb/graph_test.go | 2 +- channeldb/invoices.go | 2 +- channeldb/log.go | 2 +- channeldb/meta.go | 2 +- channeldb/meta_test.go | 2 +- channeldb/migration/create_tlb.go | 2 +- channeldb/migration/create_tlb_test.go | 2 +- channeldb/migration12/migration.go | 2 +- channeldb/migration12/migration_test.go | 2 +- channeldb/migration13/migration.go | 2 +- channeldb/migration13/migration_test.go | 2 +- channeldb/migration16/migration.go | 2 +- channeldb/migration16/migration_test.go | 2 +- channeldb/migration20/migration.go | 2 +- channeldb/migration20/migration_test.go | 2 +- channeldb/migration21/current/current_encoding.go | 2 +- channeldb/migration21/legacy/legacy_decoding.go | 2 +- channeldb/migration21/migration.go | 2 +- channeldb/migration21/migration_test.go | 2 +- channeldb/migration_01_to_11/db.go | 2 +- channeldb/migration_01_to_11/graph.go | 2 +- channeldb/migration_01_to_11/invoices.go | 2 +- channeldb/migration_01_to_11/meta.go | 2 +- channeldb/migration_01_to_11/meta_test.go | 2 +- .../migration_01_to_11/migration_09_legacy_serialization.go | 2 +- .../migration_01_to_11/migration_10_route_tlv_records.go | 2 +- channeldb/migration_01_to_11/migration_11_invoices.go | 2 +- channeldb/migration_01_to_11/migration_11_invoices_test.go | 2 +- channeldb/migration_01_to_11/migrations.go | 2 +- channeldb/migration_01_to_11/migrations_test.go | 2 +- channeldb/migration_01_to_11/payment_control.go | 2 +- channeldb/migration_01_to_11/payments.go | 2 +- channeldb/migtest/migtest.go | 2 +- channeldb/migtest/raw_db.go | 2 +- channeldb/nodes.go | 2 +- channeldb/options.go | 2 +- channeldb/options_test.go | 2 +- channeldb/paginate.go | 2 +- channeldb/payment_control.go | 2 +- channeldb/payment_control_test.go | 2 +- channeldb/payments.go | 2 +- channeldb/payments_test.go | 2 +- channeldb/peers.go | 2 +- channeldb/reports.go | 2 +- channeldb/reports_test.go | 2 +- channeldb/waitingproof.go | 2 +- channeldb/witness_cache.go | 2 +- cluster/etcd_elector.go | 2 +- cluster/etcd_elector_factory.go | 2 +- cluster/etcd_elector_test.go | 2 +- contractcourt/briefcase.go | 2 +- contractcourt/briefcase_test.go | 2 +- contractcourt/chain_arbitrator.go | 2 +- contractcourt/channel_arbitrator.go | 2 +- contractcourt/channel_arbitrator_test.go | 2 +- contractcourt/commit_sweep_resolver_test.go | 2 +- contractcourt/htlc_incoming_resolver_test.go | 2 +- contractcourt/htlc_outgoing_contest_resolver_test.go | 2 +- contractcourt/htlc_success_resolver_test.go | 2 +- contractcourt/htlc_timeout_resolver_test.go | 2 +- discovery/message_store.go | 2 +- discovery/message_store_test.go | 2 +- funding/manager.go | 2 +- htlcswitch/circuit_map.go | 2 +- htlcswitch/decayedlog.go | 2 +- htlcswitch/decayedlog_test.go | 2 +- htlcswitch/link_test.go | 2 +- htlcswitch/payment_result.go | 2 +- htlcswitch/sequencer.go | 2 +- htlcswitch/switch.go | 2 +- htlcswitch/test_utils.go | 2 +- {channeldb/kvdb => kvdb}/backend.go | 0 {channeldb/kvdb => kvdb}/bolt_compact.go | 0 {channeldb/kvdb => kvdb}/config.go | 0 {channeldb/kvdb => kvdb}/etcd/bucket.go | 0 {channeldb/kvdb => kvdb}/etcd/bucket_test.go | 0 {channeldb/kvdb => kvdb}/etcd/commit_queue.go | 0 {channeldb/kvdb => kvdb}/etcd/commit_queue_test.go | 0 {channeldb/kvdb => kvdb}/etcd/config.go | 0 {channeldb/kvdb => kvdb}/etcd/db.go | 0 {channeldb/kvdb => kvdb}/etcd/db_test.go | 0 {channeldb/kvdb => kvdb}/etcd/driver.go | 0 {channeldb/kvdb => kvdb}/etcd/driver_test.go | 0 {channeldb/kvdb => kvdb}/etcd/embed.go | 0 {channeldb/kvdb => kvdb}/etcd/fixture_test.go | 0 {channeldb/kvdb => kvdb}/etcd/readwrite_bucket.go | 0 {channeldb/kvdb => kvdb}/etcd/readwrite_bucket_test.go | 0 {channeldb/kvdb => kvdb}/etcd/readwrite_cursor.go | 0 {channeldb/kvdb => kvdb}/etcd/readwrite_cursor_test.go | 0 {channeldb/kvdb => kvdb}/etcd/readwrite_tx.go | 0 {channeldb/kvdb => kvdb}/etcd/readwrite_tx_test.go | 0 {channeldb/kvdb => kvdb}/etcd/stm.go | 0 {channeldb/kvdb => kvdb}/etcd/stm_test.go | 0 {channeldb/kvdb => kvdb}/etcd/walletdb_interface_test.go | 0 {channeldb/kvdb => kvdb}/interface.go | 0 {channeldb/kvdb => kvdb}/kvdb_etcd.go | 2 +- {channeldb/kvdb => kvdb}/kvdb_no_etcd.go | 2 +- {channeldb/kvdb => kvdb}/log.go | 0 lncfg/db.go | 4 ++-- lncfg/db_test.go | 2 +- lntest/harness.go | 2 +- lntest/itest/lnd_etcd_failover_test.go | 2 +- lnwallet/btcwallet/btcwallet.go | 2 +- lnwallet/test/test_interface.go | 2 +- macaroons/service.go | 2 +- macaroons/service_test.go | 2 +- macaroons/store.go | 2 +- macaroons/store_test.go | 2 +- nursery_store.go | 2 +- routing/chainview/interface_test.go | 2 +- routing/graph.go | 2 +- routing/integrated_routing_context_test.go | 2 +- routing/missioncontrol.go | 2 +- routing/missioncontrol_store.go | 2 +- routing/missioncontrol_store_test.go | 2 +- routing/missioncontrol_test.go | 2 +- routing/router.go | 2 +- rpcserver.go | 2 +- server.go | 2 +- sweep/store.go | 2 +- walletunlocker/service_test.go | 2 +- watchtower/wtdb/client_db.go | 2 +- watchtower/wtdb/client_db_test.go | 2 +- watchtower/wtdb/db_common.go | 2 +- watchtower/wtdb/tower_db.go | 2 +- watchtower/wtdb/tower_db_test.go | 2 +- watchtower/wtdb/version.go | 2 +- 143 files changed, 119 insertions(+), 119 deletions(-) rename {channeldb/kvdb => kvdb}/backend.go (100%) rename {channeldb/kvdb => kvdb}/bolt_compact.go (100%) rename {channeldb/kvdb => kvdb}/config.go (100%) rename {channeldb/kvdb => kvdb}/etcd/bucket.go (100%) rename {channeldb/kvdb => kvdb}/etcd/bucket_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/commit_queue.go (100%) rename {channeldb/kvdb => kvdb}/etcd/commit_queue_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/config.go (100%) rename {channeldb/kvdb => kvdb}/etcd/db.go (100%) rename {channeldb/kvdb => kvdb}/etcd/db_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/driver.go (100%) rename {channeldb/kvdb => kvdb}/etcd/driver_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/embed.go (100%) rename {channeldb/kvdb => kvdb}/etcd/fixture_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/readwrite_bucket.go (100%) rename {channeldb/kvdb => kvdb}/etcd/readwrite_bucket_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/readwrite_cursor.go (100%) rename {channeldb/kvdb => kvdb}/etcd/readwrite_cursor_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/readwrite_tx.go (100%) rename {channeldb/kvdb => kvdb}/etcd/readwrite_tx_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/stm.go (100%) rename {channeldb/kvdb => kvdb}/etcd/stm_test.go (100%) rename {channeldb/kvdb => kvdb}/etcd/walletdb_interface_test.go (100%) rename {channeldb/kvdb => kvdb}/interface.go (100%) rename {channeldb/kvdb => kvdb}/kvdb_etcd.go (90%) rename {channeldb/kvdb => kvdb}/kvdb_no_etcd.go (90%) rename {channeldb/kvdb => kvdb}/log.go (100%) diff --git a/autopilot/graph.go b/autopilot/graph.go index 72c1b091e..2624aa79d 100644 --- a/autopilot/graph.go +++ b/autopilot/graph.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/batch/batch.go b/batch/batch.go index 6b1fa2ab3..fcc691582 100644 --- a/batch/batch.go +++ b/batch/batch.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // errSolo is a sentinel error indicating that the requester should re-run the diff --git a/batch/interface.go b/batch/interface.go index e07cbd49c..a1690c384 100644 --- a/batch/interface.go +++ b/batch/interface.go @@ -1,6 +1,6 @@ package batch -import "github.com/lightningnetwork/lnd/channeldb/kvdb" +import "github.com/lightningnetwork/lnd/kvdb" // Request defines an operation that can be batched into a single bbolt // transaction. diff --git a/batch/scheduler.go b/batch/scheduler.go index 941c6f37a..4a01adda7 100644 --- a/batch/scheduler.go +++ b/batch/scheduler.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // TimeScheduler is a batching engine that executes requests within a fixed diff --git a/breacharbiter.go b/breacharbiter.go index a7ad89a4d..1d438a826 100644 --- a/breacharbiter.go +++ b/breacharbiter.go @@ -17,9 +17,9 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/chainntnfs/height_hint_cache.go b/chainntnfs/height_hint_cache.go index 6de9bc3dd..0cbc28ad8 100644 --- a/chainntnfs/height_hint_cache.go +++ b/chainntnfs/height_hint_cache.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/chainntnfs/test_utils.go b/chainntnfs/test_utils.go index 99db43f4e..5b7cc34f3 100644 --- a/chainntnfs/test_utils.go +++ b/chainntnfs/test_utils.go @@ -24,7 +24,7 @@ import ( "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/walletdb" "github.com/lightninglabs/neutrino" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/channel.go b/channeldb/channel.go index 9d8e0199a..dd4ca9e83 100644 --- a/channeldb/channel.go +++ b/channeldb/channel.go @@ -16,9 +16,9 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" "github.com/lightningnetwork/lnd/tlv" diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go index 482bc7af8..4632d22f8 100644 --- a/channeldb/channel_test.go +++ b/channeldb/channel_test.go @@ -16,9 +16,9 @@ import ( "github.com/btcsuite/btcutil" _ "github.com/btcsuite/btcwallet/walletdb/bdb" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/channels" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" diff --git a/channeldb/db.go b/channeldb/db.go index 9f5935131..75095b01a 100644 --- a/channeldb/db.go +++ b/channeldb/db.go @@ -12,7 +12,6 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcwallet/walletdb" "github.com/go-errors/errors" - "github.com/lightningnetwork/lnd/channeldb/kvdb" mig "github.com/lightningnetwork/lnd/channeldb/migration" "github.com/lightningnetwork/lnd/channeldb/migration12" "github.com/lightningnetwork/lnd/channeldb/migration13" @@ -21,6 +20,7 @@ import ( "github.com/lightningnetwork/lnd/channeldb/migration21" "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" "github.com/lightningnetwork/lnd/clock" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/db_test.go b/channeldb/db_test.go index 9b75fd39c..ed357e5e4 100644 --- a/channeldb/db_test.go +++ b/channeldb/db_test.go @@ -15,8 +15,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" "github.com/stretchr/testify/require" diff --git a/channeldb/duplicate_payments.go b/channeldb/duplicate_payments.go index 0338fab7a..c26f185ad 100644 --- a/channeldb/duplicate_payments.go +++ b/channeldb/duplicate_payments.go @@ -8,7 +8,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/channeldb/forwarding_log.go b/channeldb/forwarding_log.go index 57e46f354..3261665fd 100644 --- a/channeldb/forwarding_log.go +++ b/channeldb/forwarding_log.go @@ -7,7 +7,7 @@ import ( "time" "github.com/btcsuite/btcwallet/walletdb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/forwarding_package.go b/channeldb/forwarding_package.go index fc080b0cb..d28b7ed30 100644 --- a/channeldb/forwarding_package.go +++ b/channeldb/forwarding_package.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/forwarding_package_test.go b/channeldb/forwarding_package_test.go index e76915d11..a56d1e530 100644 --- a/channeldb/forwarding_package_test.go +++ b/channeldb/forwarding_package_test.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/graph.go b/channeldb/graph.go index b3d1924c6..f396739bd 100644 --- a/channeldb/graph.go +++ b/channeldb/graph.go @@ -20,7 +20,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/batch" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/channeldb/graph_test.go b/channeldb/graph_test.go index b19ea82f4..ccd5f379e 100644 --- a/channeldb/graph_test.go +++ b/channeldb/graph_test.go @@ -20,7 +20,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" "github.com/stretchr/testify/require" diff --git a/channeldb/invoices.go b/channeldb/invoices.go index 146e8d885..d678d5834 100644 --- a/channeldb/invoices.go +++ b/channeldb/invoices.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/feature" "github.com/lightningnetwork/lnd/htlcswitch/hop" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/channeldb/log.go b/channeldb/log.go index 92d8c3e7a..24c0c608b 100644 --- a/channeldb/log.go +++ b/channeldb/log.go @@ -3,12 +3,12 @@ package channeldb import ( "github.com/btcsuite/btclog" "github.com/lightningnetwork/lnd/build" - "github.com/lightningnetwork/lnd/channeldb/kvdb" mig "github.com/lightningnetwork/lnd/channeldb/migration" "github.com/lightningnetwork/lnd/channeldb/migration12" "github.com/lightningnetwork/lnd/channeldb/migration13" "github.com/lightningnetwork/lnd/channeldb/migration16" "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" + "github.com/lightningnetwork/lnd/kvdb" ) // log is a logger that is initialized with no output filters. This diff --git a/channeldb/meta.go b/channeldb/meta.go index 4612c38d3..df4b0df34 100644 --- a/channeldb/meta.go +++ b/channeldb/meta.go @@ -1,7 +1,7 @@ package channeldb import ( - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/meta_test.go b/channeldb/meta_test.go index 892f7eb05..faf9bae5f 100644 --- a/channeldb/meta_test.go +++ b/channeldb/meta_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/go-errors/errors" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // applyMigration is a helper test function that encapsulates the general steps diff --git a/channeldb/migration/create_tlb.go b/channeldb/migration/create_tlb.go index 7c31ec929..ae48640c8 100644 --- a/channeldb/migration/create_tlb.go +++ b/channeldb/migration/create_tlb.go @@ -3,7 +3,7 @@ package migration import ( "fmt" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // CreateTLB creates a new top-level bucket with the passed bucket identifier. diff --git a/channeldb/migration/create_tlb_test.go b/channeldb/migration/create_tlb_test.go index 2f4221361..164e8f27f 100644 --- a/channeldb/migration/create_tlb_test.go +++ b/channeldb/migration/create_tlb_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channeldb/migration" "github.com/lightningnetwork/lnd/channeldb/migtest" + "github.com/lightningnetwork/lnd/kvdb" ) // TestCreateTLB asserts that a CreateTLB properly initializes a new top-level diff --git a/channeldb/migration12/migration.go b/channeldb/migration12/migration.go index 2ec9e354e..2fdd279a1 100644 --- a/channeldb/migration12/migration.go +++ b/channeldb/migration12/migration.go @@ -3,8 +3,8 @@ package migration12 import ( "bytes" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" ) var emptyFeatures = lnwire.NewFeatureVector(nil, nil) diff --git a/channeldb/migration12/migration_test.go b/channeldb/migration12/migration_test.go index ab420fe6d..75d74fdd6 100644 --- a/channeldb/migration12/migration_test.go +++ b/channeldb/migration12/migration_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channeldb/migration12" "github.com/lightningnetwork/lnd/channeldb/migtest" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/channeldb/migration13/migration.go b/channeldb/migration13/migration.go index df737d25a..e553d6a3c 100644 --- a/channeldb/migration13/migration.go +++ b/channeldb/migration13/migration.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration13/migration_test.go b/channeldb/migration13/migration_test.go index d71302fed..7a97a9876 100644 --- a/channeldb/migration13/migration_test.go +++ b/channeldb/migration13/migration_test.go @@ -3,8 +3,8 @@ package migration13 import ( "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channeldb/migtest" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration16/migration.go b/channeldb/migration16/migration.go index b984f0837..64a5e493d 100644 --- a/channeldb/migration16/migration.go +++ b/channeldb/migration16/migration.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration16/migration_test.go b/channeldb/migration16/migration_test.go index 626bedcb5..dc2d017fb 100644 --- a/channeldb/migration16/migration_test.go +++ b/channeldb/migration16/migration_test.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channeldb/migtest" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration20/migration.go b/channeldb/migration20/migration.go index dee53be77..c341d6a55 100644 --- a/channeldb/migration20/migration.go +++ b/channeldb/migration20/migration.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/migration20/migration_test.go b/channeldb/migration20/migration_test.go index c5faf907e..90a4cbdce 100644 --- a/channeldb/migration20/migration_test.go +++ b/channeldb/migration20/migration_test.go @@ -3,8 +3,8 @@ package migration20 import ( "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channeldb/migtest" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration21/current/current_encoding.go b/channeldb/migration21/current/current_encoding.go index 3aaf44154..0c62c3118 100644 --- a/channeldb/migration21/current/current_encoding.go +++ b/channeldb/migration21/current/current_encoding.go @@ -7,9 +7,9 @@ import ( "fmt" "io" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" + "github.com/lightningnetwork/lnd/kvdb" ) func serializeChanCommit(w io.Writer, c *common.ChannelCommitment) error { // nolint: dupl diff --git a/channeldb/migration21/legacy/legacy_decoding.go b/channeldb/migration21/legacy/legacy_decoding.go index 923cceda1..8a8482494 100644 --- a/channeldb/migration21/legacy/legacy_decoding.go +++ b/channeldb/migration21/legacy/legacy_decoding.go @@ -6,9 +6,9 @@ import ( "errors" "io" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" + "github.com/lightningnetwork/lnd/kvdb" ) func deserializeHtlcs(r io.Reader) ([]common.HTLC, error) { diff --git a/channeldb/migration21/migration.go b/channeldb/migration21/migration.go index 2df7b4f8a..2ee286868 100644 --- a/channeldb/migration21/migration.go +++ b/channeldb/migration21/migration.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "fmt" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" "github.com/lightningnetwork/lnd/channeldb/migration21/current" "github.com/lightningnetwork/lnd/channeldb/migration21/legacy" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration21/migration_test.go b/channeldb/migration21/migration_test.go index f8a159b23..9e58989c7 100644 --- a/channeldb/migration21/migration_test.go +++ b/channeldb/migration21/migration_test.go @@ -11,12 +11,12 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" "github.com/lightningnetwork/lnd/channeldb/migration21/current" "github.com/lightningnetwork/lnd/channeldb/migration21/legacy" "github.com/lightningnetwork/lnd/channeldb/migtest" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration_01_to_11/db.go b/channeldb/migration_01_to_11/db.go index 353e7aed8..65cc8d221 100644 --- a/channeldb/migration_01_to_11/db.go +++ b/channeldb/migration_01_to_11/db.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) const ( diff --git a/channeldb/migration_01_to_11/graph.go b/channeldb/migration_01_to_11/graph.go index 9caa6ad8c..9a3701569 100644 --- a/channeldb/migration_01_to_11/graph.go +++ b/channeldb/migration_01_to_11/graph.go @@ -13,8 +13,8 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration_01_to_11/invoices.go b/channeldb/migration_01_to_11/invoices.go index b60008ee1..3adbbf5f2 100644 --- a/channeldb/migration_01_to_11/invoices.go +++ b/channeldb/migration_01_to_11/invoices.go @@ -8,8 +8,8 @@ import ( "time" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/migration_01_to_11/meta.go b/channeldb/migration_01_to_11/meta.go index 95bce84bf..3d07a2c30 100644 --- a/channeldb/migration_01_to_11/meta.go +++ b/channeldb/migration_01_to_11/meta.go @@ -1,7 +1,7 @@ package migration_01_to_11 import ( - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/migration_01_to_11/meta_test.go b/channeldb/migration_01_to_11/meta_test.go index b5dfee0a1..a655f1cde 100644 --- a/channeldb/migration_01_to_11/meta_test.go +++ b/channeldb/migration_01_to_11/meta_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/go-errors/errors" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // applyMigration is a helper test function that encapsulates the general steps diff --git a/channeldb/migration_01_to_11/migration_09_legacy_serialization.go b/channeldb/migration_01_to_11/migration_09_legacy_serialization.go index 461e983b2..1a16bda4a 100644 --- a/channeldb/migration_01_to_11/migration_09_legacy_serialization.go +++ b/channeldb/migration_01_to_11/migration_09_legacy_serialization.go @@ -7,8 +7,8 @@ import ( "io" "sort" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/channeldb/migration_01_to_11/migration_10_route_tlv_records.go b/channeldb/migration_01_to_11/migration_10_route_tlv_records.go index 21a684f67..a17de78bf 100644 --- a/channeldb/migration_01_to_11/migration_10_route_tlv_records.go +++ b/channeldb/migration_01_to_11/migration_10_route_tlv_records.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // MigrateRouteSerialization migrates the way we serialize routes across the diff --git a/channeldb/migration_01_to_11/migration_11_invoices.go b/channeldb/migration_01_to_11/migration_11_invoices.go index cec7784e0..91d0e00f9 100644 --- a/channeldb/migration_01_to_11/migration_11_invoices.go +++ b/channeldb/migration_01_to_11/migration_11_invoices.go @@ -8,9 +8,9 @@ import ( bitcoinCfg "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11/zpay32" + "github.com/lightningnetwork/lnd/kvdb" litecoinCfg "github.com/ltcsuite/ltcd/chaincfg" ) diff --git a/channeldb/migration_01_to_11/migration_11_invoices_test.go b/channeldb/migration_01_to_11/migration_11_invoices_test.go index f80ea1ecf..402efa1fe 100644 --- a/channeldb/migration_01_to_11/migration_11_invoices_test.go +++ b/channeldb/migration_01_to_11/migration_11_invoices_test.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/btcec" bitcoinCfg "github.com/btcsuite/btcd/chaincfg" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/zpay32" litecoinCfg "github.com/ltcsuite/ltcd/chaincfg" ) diff --git a/channeldb/migration_01_to_11/migrations.go b/channeldb/migration_01_to_11/migrations.go index 5232628d1..544faf134 100644 --- a/channeldb/migration_01_to_11/migrations.go +++ b/channeldb/migration_01_to_11/migrations.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" ) // MigrateNodeAndEdgeUpdateIndex is a migration function that will update the diff --git a/channeldb/migration_01_to_11/migrations_test.go b/channeldb/migration_01_to_11/migrations_test.go index c0e57ec08..77887e855 100644 --- a/channeldb/migration_01_to_11/migrations_test.go +++ b/channeldb/migration_01_to_11/migrations_test.go @@ -13,8 +13,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/channeldb/migration_01_to_11/payment_control.go b/channeldb/migration_01_to_11/payment_control.go index 41778fe43..56c708163 100644 --- a/channeldb/migration_01_to_11/payment_control.go +++ b/channeldb/migration_01_to_11/payment_control.go @@ -1,6 +1,6 @@ package migration_01_to_11 -import "github.com/lightningnetwork/lnd/channeldb/kvdb" +import "github.com/lightningnetwork/lnd/kvdb" // fetchPaymentStatus fetches the payment status of the payment. If the payment // isn't found, it will default to "StatusUnknown". diff --git a/channeldb/migration_01_to_11/payments.go b/channeldb/migration_01_to_11/payments.go index 2ccb8bca8..4338a30be 100644 --- a/channeldb/migration_01_to_11/payments.go +++ b/channeldb/migration_01_to_11/payments.go @@ -11,8 +11,8 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/migtest/migtest.go b/channeldb/migtest/migtest.go index 51a2006eb..ba723fa7d 100644 --- a/channeldb/migtest/migtest.go +++ b/channeldb/migtest/migtest.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // MakeDB creates a new instance of the ChannelDB for testing purposes. A diff --git a/channeldb/migtest/raw_db.go b/channeldb/migtest/raw_db.go index bae5b9330..f6d6455ac 100644 --- a/channeldb/migtest/raw_db.go +++ b/channeldb/migtest/raw_db.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // DumpDB dumps go code describing the contents of the database to stdout. This diff --git a/channeldb/nodes.go b/channeldb/nodes.go index 4ae9dfbdd..f17662275 100644 --- a/channeldb/nodes.go +++ b/channeldb/nodes.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/channeldb/options.go b/channeldb/options.go index 2c15c42f2..ceb29bf7b 100644 --- a/channeldb/options.go +++ b/channeldb/options.go @@ -3,8 +3,8 @@ package channeldb import ( "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/clock" + "github.com/lightningnetwork/lnd/kvdb" ) const ( diff --git a/channeldb/options_test.go b/channeldb/options_test.go index b45e886c9..f6a873b9b 100644 --- a/channeldb/options_test.go +++ b/channeldb/options_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/stretchr/testify/require" ) diff --git a/channeldb/paginate.go b/channeldb/paginate.go index 22ec4fb46..48001f489 100644 --- a/channeldb/paginate.go +++ b/channeldb/paginate.go @@ -1,6 +1,6 @@ package channeldb -import "github.com/lightningnetwork/lnd/channeldb/kvdb" +import "github.com/lightningnetwork/lnd/kvdb" type paginator struct { // cursor is the cursor which we are using to iterate through a bucket. diff --git a/channeldb/payment_control.go b/channeldb/payment_control.go index d7b4e7436..0bbb344b5 100644 --- a/channeldb/payment_control.go +++ b/channeldb/payment_control.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/channeldb/payment_control_test.go b/channeldb/payment_control_test.go index 7d293c7f0..a524fb0e7 100644 --- a/channeldb/payment_control_test.go +++ b/channeldb/payment_control_test.go @@ -12,7 +12,7 @@ import ( "github.com/btcsuite/btcwallet/walletdb" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/record" "github.com/stretchr/testify/assert" diff --git a/channeldb/payments.go b/channeldb/payments.go index 96748d6f9..72b15ffb7 100644 --- a/channeldb/payments.go +++ b/channeldb/payments.go @@ -10,7 +10,7 @@ import ( "time" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/channeldb/payments_test.go b/channeldb/payments_test.go index c7f6e98a0..9fab9a1fe 100644 --- a/channeldb/payments_test.go +++ b/channeldb/payments_test.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcwallet/walletdb" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/record" "github.com/lightningnetwork/lnd/routing/route" diff --git a/channeldb/peers.go b/channeldb/peers.go index 9122f6bed..62342fc79 100644 --- a/channeldb/peers.go +++ b/channeldb/peers.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/channeldb/reports.go b/channeldb/reports.go index 1338a5194..5d2892b28 100644 --- a/channeldb/reports.go +++ b/channeldb/reports.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/reports_test.go b/channeldb/reports_test.go index 445be0161..46bc39074 100644 --- a/channeldb/reports_test.go +++ b/channeldb/reports_test.go @@ -6,7 +6,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/stretchr/testify/require" ) diff --git a/channeldb/waitingproof.go b/channeldb/waitingproof.go index 81bfd6d4b..b35586bf0 100644 --- a/channeldb/waitingproof.go +++ b/channeldb/waitingproof.go @@ -9,7 +9,7 @@ import ( "bytes" "github.com/go-errors/errors" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/witness_cache.go b/channeldb/witness_cache.go index d4abfeed7..bec40a48a 100644 --- a/channeldb/witness_cache.go +++ b/channeldb/witness_cache.go @@ -3,7 +3,7 @@ package channeldb import ( "fmt" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/cluster/etcd_elector.go b/cluster/etcd_elector.go index 949440479..be19b1f59 100644 --- a/cluster/etcd_elector.go +++ b/cluster/etcd_elector.go @@ -6,7 +6,7 @@ import ( "context" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb/etcd" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/clientv3/namespace" diff --git a/cluster/etcd_elector_factory.go b/cluster/etcd_elector_factory.go index b8d48030e..2863433dd 100644 --- a/cluster/etcd_elector_factory.go +++ b/cluster/etcd_elector_factory.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb/etcd" ) // makeEtcdElector will construct a new etcdLeaderElector. It expects a cancel diff --git a/cluster/etcd_elector_test.go b/cluster/etcd_elector_test.go index 32688f1a3..d384c2436 100644 --- a/cluster/etcd_elector_test.go +++ b/cluster/etcd_elector_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb/etcd" "github.com/stretchr/testify/require" ) diff --git a/contractcourt/briefcase.go b/contractcourt/briefcase.go index fea23bf70..b263b885d 100644 --- a/contractcourt/briefcase.go +++ b/contractcourt/briefcase.go @@ -11,8 +11,8 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwallet" ) diff --git a/contractcourt/briefcase_test.go b/contractcourt/briefcase_test.go index e1315e270..1bba09514 100644 --- a/contractcourt/briefcase_test.go +++ b/contractcourt/briefcase_test.go @@ -16,8 +16,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/channels" "github.com/lightningnetwork/lnd/lnwallet" ) diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go index 3df3fa24f..a8be6a42b 100644 --- a/contractcourt/chain_arbitrator.go +++ b/contractcourt/chain_arbitrator.go @@ -13,9 +13,9 @@ import ( "github.com/btcsuite/btcwallet/walletdb" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index 6d0080517..6d58ef206 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -13,8 +13,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/contractcourt/channel_arbitrator_test.go b/contractcourt/channel_arbitrator_test.go index cea6f3f4f..fa3f04ef1 100644 --- a/contractcourt/channel_arbitrator_test.go +++ b/contractcourt/channel_arbitrator_test.go @@ -16,9 +16,9 @@ import ( "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/contractcourt/commit_sweep_resolver_test.go b/contractcourt/commit_sweep_resolver_test.go index 93c0b8b57..37c0fe59b 100644 --- a/contractcourt/commit_sweep_resolver_test.go +++ b/contractcourt/commit_sweep_resolver_test.go @@ -8,8 +8,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/contractcourt/htlc_incoming_resolver_test.go b/contractcourt/htlc_incoming_resolver_test.go index da27db72a..baef5e508 100644 --- a/contractcourt/htlc_incoming_resolver_test.go +++ b/contractcourt/htlc_incoming_resolver_test.go @@ -9,9 +9,9 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/invoices" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/contractcourt/htlc_outgoing_contest_resolver_test.go b/contractcourt/htlc_outgoing_contest_resolver_test.go index 6d1f4e905..1632cfac1 100644 --- a/contractcourt/htlc_outgoing_contest_resolver_test.go +++ b/contractcourt/htlc_outgoing_contest_resolver_test.go @@ -7,8 +7,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/contractcourt/htlc_success_resolver_test.go b/contractcourt/htlc_success_resolver_test.go index 288aeae5d..9c7a56097 100644 --- a/contractcourt/htlc_success_resolver_test.go +++ b/contractcourt/htlc_success_resolver_test.go @@ -12,8 +12,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/contractcourt/htlc_timeout_resolver_test.go b/contractcourt/htlc_timeout_resolver_test.go index 8aa366ef3..680b82b66 100644 --- a/contractcourt/htlc_timeout_resolver_test.go +++ b/contractcourt/htlc_timeout_resolver_test.go @@ -14,8 +14,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/discovery/message_store.go b/discovery/message_store.go index 6cce54946..4d5f9b205 100644 --- a/discovery/message_store.go +++ b/discovery/message_store.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/discovery/message_store_test.go b/discovery/message_store_test.go index 12286e390..e70210db1 100644 --- a/discovery/message_store_test.go +++ b/discovery/message_store_test.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/funding/manager.go b/funding/manager.go index f74b5c994..63269ccb6 100644 --- a/funding/manager.go +++ b/funding/manager.go @@ -19,11 +19,11 @@ import ( "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/chanacceptor" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/htlcswitch/circuit_map.go b/htlcswitch/circuit_map.go index 547bba3a4..3e4968bc7 100644 --- a/htlcswitch/circuit_map.go +++ b/htlcswitch/circuit_map.go @@ -8,8 +8,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/htlcswitch/hop" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/htlcswitch/decayedlog.go b/htlcswitch/decayedlog.go index 93c2fd1b9..1d7b95d36 100644 --- a/htlcswitch/decayedlog.go +++ b/htlcswitch/decayedlog.go @@ -10,7 +10,7 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) const ( diff --git a/htlcswitch/decayedlog_test.go b/htlcswitch/decayedlog_test.go index 274ed63f9..baac6d9f6 100644 --- a/htlcswitch/decayedlog_test.go +++ b/htlcswitch/decayedlog_test.go @@ -9,7 +9,7 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" ) diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go index 3c0be7857..6a0603d7f 100644 --- a/htlcswitch/link_test.go +++ b/htlcswitch/link_test.go @@ -23,11 +23,11 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lntypes" diff --git a/htlcswitch/payment_result.go b/htlcswitch/payment_result.go index 06345affb..2bd35f60a 100644 --- a/htlcswitch/payment_result.go +++ b/htlcswitch/payment_result.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/multimutex" ) diff --git a/htlcswitch/sequencer.go b/htlcswitch/sequencer.go index ae47c1827..3f37414da 100644 --- a/htlcswitch/sequencer.go +++ b/htlcswitch/sequencer.go @@ -5,7 +5,7 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // defaultSequenceBatchSize specifies the window of sequence numbers that are diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go index 1861a51aa..bacc9b0fe 100644 --- a/htlcswitch/switch.go +++ b/htlcswitch/switch.go @@ -14,10 +14,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/htlcswitch/hop" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index a1dd30a3d..cfdadd969 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -23,11 +23,11 @@ import ( "github.com/go-errors/errors" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lntest/channels" "github.com/lightningnetwork/lnd/lntest/mock" diff --git a/channeldb/kvdb/backend.go b/kvdb/backend.go similarity index 100% rename from channeldb/kvdb/backend.go rename to kvdb/backend.go diff --git a/channeldb/kvdb/bolt_compact.go b/kvdb/bolt_compact.go similarity index 100% rename from channeldb/kvdb/bolt_compact.go rename to kvdb/bolt_compact.go diff --git a/channeldb/kvdb/config.go b/kvdb/config.go similarity index 100% rename from channeldb/kvdb/config.go rename to kvdb/config.go diff --git a/channeldb/kvdb/etcd/bucket.go b/kvdb/etcd/bucket.go similarity index 100% rename from channeldb/kvdb/etcd/bucket.go rename to kvdb/etcd/bucket.go diff --git a/channeldb/kvdb/etcd/bucket_test.go b/kvdb/etcd/bucket_test.go similarity index 100% rename from channeldb/kvdb/etcd/bucket_test.go rename to kvdb/etcd/bucket_test.go diff --git a/channeldb/kvdb/etcd/commit_queue.go b/kvdb/etcd/commit_queue.go similarity index 100% rename from channeldb/kvdb/etcd/commit_queue.go rename to kvdb/etcd/commit_queue.go diff --git a/channeldb/kvdb/etcd/commit_queue_test.go b/kvdb/etcd/commit_queue_test.go similarity index 100% rename from channeldb/kvdb/etcd/commit_queue_test.go rename to kvdb/etcd/commit_queue_test.go diff --git a/channeldb/kvdb/etcd/config.go b/kvdb/etcd/config.go similarity index 100% rename from channeldb/kvdb/etcd/config.go rename to kvdb/etcd/config.go diff --git a/channeldb/kvdb/etcd/db.go b/kvdb/etcd/db.go similarity index 100% rename from channeldb/kvdb/etcd/db.go rename to kvdb/etcd/db.go diff --git a/channeldb/kvdb/etcd/db_test.go b/kvdb/etcd/db_test.go similarity index 100% rename from channeldb/kvdb/etcd/db_test.go rename to kvdb/etcd/db_test.go diff --git a/channeldb/kvdb/etcd/driver.go b/kvdb/etcd/driver.go similarity index 100% rename from channeldb/kvdb/etcd/driver.go rename to kvdb/etcd/driver.go diff --git a/channeldb/kvdb/etcd/driver_test.go b/kvdb/etcd/driver_test.go similarity index 100% rename from channeldb/kvdb/etcd/driver_test.go rename to kvdb/etcd/driver_test.go diff --git a/channeldb/kvdb/etcd/embed.go b/kvdb/etcd/embed.go similarity index 100% rename from channeldb/kvdb/etcd/embed.go rename to kvdb/etcd/embed.go diff --git a/channeldb/kvdb/etcd/fixture_test.go b/kvdb/etcd/fixture_test.go similarity index 100% rename from channeldb/kvdb/etcd/fixture_test.go rename to kvdb/etcd/fixture_test.go diff --git a/channeldb/kvdb/etcd/readwrite_bucket.go b/kvdb/etcd/readwrite_bucket.go similarity index 100% rename from channeldb/kvdb/etcd/readwrite_bucket.go rename to kvdb/etcd/readwrite_bucket.go diff --git a/channeldb/kvdb/etcd/readwrite_bucket_test.go b/kvdb/etcd/readwrite_bucket_test.go similarity index 100% rename from channeldb/kvdb/etcd/readwrite_bucket_test.go rename to kvdb/etcd/readwrite_bucket_test.go diff --git a/channeldb/kvdb/etcd/readwrite_cursor.go b/kvdb/etcd/readwrite_cursor.go similarity index 100% rename from channeldb/kvdb/etcd/readwrite_cursor.go rename to kvdb/etcd/readwrite_cursor.go diff --git a/channeldb/kvdb/etcd/readwrite_cursor_test.go b/kvdb/etcd/readwrite_cursor_test.go similarity index 100% rename from channeldb/kvdb/etcd/readwrite_cursor_test.go rename to kvdb/etcd/readwrite_cursor_test.go diff --git a/channeldb/kvdb/etcd/readwrite_tx.go b/kvdb/etcd/readwrite_tx.go similarity index 100% rename from channeldb/kvdb/etcd/readwrite_tx.go rename to kvdb/etcd/readwrite_tx.go diff --git a/channeldb/kvdb/etcd/readwrite_tx_test.go b/kvdb/etcd/readwrite_tx_test.go similarity index 100% rename from channeldb/kvdb/etcd/readwrite_tx_test.go rename to kvdb/etcd/readwrite_tx_test.go diff --git a/channeldb/kvdb/etcd/stm.go b/kvdb/etcd/stm.go similarity index 100% rename from channeldb/kvdb/etcd/stm.go rename to kvdb/etcd/stm.go diff --git a/channeldb/kvdb/etcd/stm_test.go b/kvdb/etcd/stm_test.go similarity index 100% rename from channeldb/kvdb/etcd/stm_test.go rename to kvdb/etcd/stm_test.go diff --git a/channeldb/kvdb/etcd/walletdb_interface_test.go b/kvdb/etcd/walletdb_interface_test.go similarity index 100% rename from channeldb/kvdb/etcd/walletdb_interface_test.go rename to kvdb/etcd/walletdb_interface_test.go diff --git a/channeldb/kvdb/interface.go b/kvdb/interface.go similarity index 100% rename from channeldb/kvdb/interface.go rename to kvdb/interface.go diff --git a/channeldb/kvdb/kvdb_etcd.go b/kvdb/kvdb_etcd.go similarity index 90% rename from channeldb/kvdb/kvdb_etcd.go rename to kvdb/kvdb_etcd.go index 81e2ee423..2b798d88f 100644 --- a/channeldb/kvdb/kvdb_etcd.go +++ b/kvdb/kvdb_etcd.go @@ -3,7 +3,7 @@ package kvdb import ( - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb/etcd" ) // TestBackend is conditionally set to etcd when the kvdb_etcd build tag is diff --git a/channeldb/kvdb/kvdb_no_etcd.go b/kvdb/kvdb_no_etcd.go similarity index 90% rename from channeldb/kvdb/kvdb_no_etcd.go rename to kvdb/kvdb_no_etcd.go index 5e1030939..ec7abf775 100644 --- a/channeldb/kvdb/kvdb_no_etcd.go +++ b/kvdb/kvdb_no_etcd.go @@ -5,7 +5,7 @@ package kvdb import ( "fmt" - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb/etcd" ) // TestBackend is conditionally set to bdb when the kvdb_etcd build tag is diff --git a/channeldb/kvdb/log.go b/kvdb/log.go similarity index 100% rename from channeldb/kvdb/log.go rename to kvdb/log.go diff --git a/lncfg/db.go b/lncfg/db.go index e349400ac..8e9ebaf80 100644 --- a/lncfg/db.go +++ b/lncfg/db.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb" + "github.com/lightningnetwork/lnd/kvdb/etcd" ) const ( diff --git a/lncfg/db_test.go b/lncfg/db_test.go index 5485ced1a..b68e27f1d 100644 --- a/lncfg/db_test.go +++ b/lncfg/db_test.go @@ -3,7 +3,7 @@ package lncfg_test import ( "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lncfg" "github.com/stretchr/testify/require" ) diff --git a/lntest/harness.go b/lntest/harness.go index 0d8bf520d..f8096072c 100644 --- a/lntest/harness.go +++ b/lntest/harness.go @@ -21,7 +21,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd" - "github.com/lightningnetwork/lnd/channeldb/kvdb/etcd" + "github.com/lightningnetwork/lnd/kvdb/etcd" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/lntest/itest/lnd_etcd_failover_test.go b/lntest/itest/lnd_etcd_failover_test.go index 8fcf8d7f5..35bd7fd8d 100644 --- a/lntest/itest/lnd_etcd_failover_test.go +++ b/lntest/itest/lnd_etcd_failover_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/btcsuite/btcutil" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/cluster" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/lnwallet/btcwallet/btcwallet.go b/lnwallet/btcwallet/btcwallet.go index a94b56f79..dc5083958 100644 --- a/lnwallet/btcwallet/btcwallet.go +++ b/lnwallet/btcwallet/btcwallet.go @@ -26,8 +26,8 @@ import ( "github.com/btcsuite/btcwallet/walletdb" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/blockcache" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" ) diff --git a/lnwallet/test/test_interface.go b/lnwallet/test/test_interface.go index 95d1cc74c..be2ab1d0c 100644 --- a/lnwallet/test/test_interface.go +++ b/lnwallet/test/test_interface.go @@ -36,9 +36,9 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chainntnfs/btcdnotify" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/macaroons/service.go b/macaroons/service.go index 2bb2bc834..69d9afa70 100644 --- a/macaroons/service.go +++ b/macaroons/service.go @@ -8,7 +8,7 @@ import ( "path" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "google.golang.org/grpc/metadata" "gopkg.in/macaroon-bakery.v2/bakery" diff --git a/macaroons/service_test.go b/macaroons/service_test.go index 65199ed22..b57a262a5 100644 --- a/macaroons/service_test.go +++ b/macaroons/service_test.go @@ -8,7 +8,7 @@ import ( "path" "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/macaroons" "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" diff --git a/macaroons/store.go b/macaroons/store.go index c6bc12c8c..80aa7ced1 100644 --- a/macaroons/store.go +++ b/macaroons/store.go @@ -8,7 +8,7 @@ import ( "io" "sync" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/btcsuite/btcwallet/snacl" "github.com/btcsuite/btcwallet/walletdb" diff --git a/macaroons/store_test.go b/macaroons/store_test.go index e8443c61e..517315c63 100644 --- a/macaroons/store_test.go +++ b/macaroons/store_test.go @@ -7,7 +7,7 @@ import ( "path" "testing" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/macaroons" "github.com/btcsuite/btcwallet/snacl" diff --git a/nursery_store.go b/nursery_store.go index 6254021f2..7e81c69f8 100644 --- a/nursery_store.go +++ b/nursery_store.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // Overview of Nursery Store Storage Hierarchy diff --git a/routing/chainview/interface_test.go b/routing/chainview/interface_test.go index 8f6c25607..9cf8ed888 100644 --- a/routing/chainview/interface_test.go +++ b/routing/chainview/interface_test.go @@ -28,7 +28,7 @@ import ( "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/blockcache" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/routing/graph.go b/routing/graph.go index 87cf528f8..83f06807e 100644 --- a/routing/graph.go +++ b/routing/graph.go @@ -2,7 +2,7 @@ package routing import ( "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/integrated_routing_context_test.go b/routing/integrated_routing_context_test.go index d56a5a04a..114b2272e 100644 --- a/routing/integrated_routing_context_test.go +++ b/routing/integrated_routing_context_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/missioncontrol.go b/routing/missioncontrol.go index 78339b75f..d1dc4294e 100644 --- a/routing/missioncontrol.go +++ b/routing/missioncontrol.go @@ -7,7 +7,7 @@ import ( "time" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/missioncontrol_store.go b/routing/missioncontrol_store.go index a0243996b..9e9974e4a 100644 --- a/routing/missioncontrol_store.go +++ b/routing/missioncontrol_store.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/routing/missioncontrol_store_test.go b/routing/missioncontrol_store_test.go index c226a78e8..4653c51eb 100644 --- a/routing/missioncontrol_store_test.go +++ b/routing/missioncontrol_store_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/routing/missioncontrol_test.go b/routing/missioncontrol_test.go index 48922a3bf..6be9c4cb6 100644 --- a/routing/missioncontrol_test.go +++ b/routing/missioncontrol_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/router.go b/routing/router.go index 76d1291d4..d8c6e9378 100644 --- a/routing/router.go +++ b/routing/router.go @@ -20,10 +20,10 @@ import ( "github.com/lightningnetwork/lnd/amp" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/input" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" diff --git a/rpcserver.go b/rpcserver.go index 1bb95aa07..0e3540a94 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -36,7 +36,6 @@ import ( "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/chanfitness" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/discovery" @@ -47,6 +46,7 @@ import ( "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/server.go b/server.go index eddec2207..cab6747a2 100644 --- a/server.go +++ b/server.go @@ -33,7 +33,6 @@ import ( "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/chanfitness" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/contractcourt" @@ -46,6 +45,7 @@ import ( "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/sweep/store.go b/sweep/store.go index 1733107ff..e7ce8e0f5 100644 --- a/sweep/store.go +++ b/sweep/store.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) var ( diff --git a/walletunlocker/service_test.go b/walletunlocker/service_test.go index fb217f211..bacf1b5ba 100644 --- a/walletunlocker/service_test.go +++ b/walletunlocker/service_test.go @@ -15,8 +15,8 @@ import ( "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/aezeed" - "github.com/lightningnetwork/lnd/channeldb/kvdb" "github.com/lightningnetwork/lnd/keychain" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" diff --git a/watchtower/wtdb/client_db.go b/watchtower/wtdb/client_db.go index 60dd040f0..7f98a6985 100644 --- a/watchtower/wtdb/client_db.go +++ b/watchtower/wtdb/client_db.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/watchtower/blob" ) diff --git a/watchtower/wtdb/client_db_test.go b/watchtower/wtdb/client_db_test.go index 07d2d53c4..448ae45d2 100644 --- a/watchtower/wtdb/client_db_test.go +++ b/watchtower/wtdb/client_db_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/watchtower/blob" "github.com/lightningnetwork/lnd/watchtower/wtclient" diff --git a/watchtower/wtdb/db_common.go b/watchtower/wtdb/db_common.go index 7f4e981aa..de14bff64 100644 --- a/watchtower/wtdb/db_common.go +++ b/watchtower/wtdb/db_common.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) const ( diff --git a/watchtower/wtdb/tower_db.go b/watchtower/wtdb/tower_db.go index 8fc3925f0..6f67298f8 100644 --- a/watchtower/wtdb/tower_db.go +++ b/watchtower/wtdb/tower_db.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/watchtower/blob" ) diff --git a/watchtower/wtdb/tower_db_test.go b/watchtower/wtdb/tower_db_test.go index e02d2fd43..7debe8a0e 100644 --- a/watchtower/wtdb/tower_db_test.go +++ b/watchtower/wtdb/tower_db_test.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/watchtower" "github.com/lightningnetwork/lnd/watchtower/blob" "github.com/lightningnetwork/lnd/watchtower/wtdb" diff --git a/watchtower/wtdb/version.go b/watchtower/wtdb/version.go index a59d8c0e1..229b8a9dd 100644 --- a/watchtower/wtdb/version.go +++ b/watchtower/wtdb/version.go @@ -2,7 +2,7 @@ package wtdb import ( "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/kvdb" + "github.com/lightningnetwork/lnd/kvdb" ) // migration is a function which takes a prior outdated version of the database