From 9f54ec90aa673810f711d43c0ef2d14f837eac5a Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Tue, 22 Oct 2024 12:57:00 +0200 Subject: [PATCH] multi+refactor: move models package to graph/db All the structs defined in the `channeldb/models` package are graph related. So once we move all the graph CRUD code to the graph package, it makes sense to have the schema structs there too. So this just moves the `models` package over to `graph/db/models`. --- autopilot/graph.go | 2 +- chainreg/chainregistry.go | 2 +- channeldb/channel.go | 2 +- channeldb/channel_cache_test.go | 2 +- channeldb/channel_test.go | 2 +- channeldb/forwarding_policy.go | 2 +- channeldb/graph.go | 2 +- channeldb/graph_cache.go | 2 +- channeldb/graph_cache_test.go | 2 +- channeldb/graph_test.go | 2 +- channeldb/invoice_test.go | 2 +- channeldb/invoices.go | 2 +- contractcourt/chain_arbitrator.go | 2 +- contractcourt/chain_arbitrator_test.go | 2 +- contractcourt/channel_arbitrator.go | 2 +- contractcourt/channel_arbitrator_test.go | 2 +- contractcourt/commit_sweep_resolver_test.go | 2 +- contractcourt/htlc_incoming_contest_resolver.go | 2 +- contractcourt/htlc_incoming_contest_resolver_test.go | 2 +- contractcourt/htlc_outgoing_contest_resolver_test.go | 2 +- contractcourt/htlc_success_resolver.go | 2 +- contractcourt/htlc_success_resolver_test.go | 2 +- contractcourt/htlc_timeout_resolver_test.go | 2 +- contractcourt/interfaces.go | 2 +- contractcourt/mock_htlcnotifier_test.go | 2 +- contractcourt/mock_registry_test.go | 2 +- discovery/gossiper.go | 2 +- discovery/gossiper_test.go | 2 +- funding/manager.go | 2 +- funding/manager_test.go | 2 +- graph/builder.go | 2 +- graph/builder_test.go | 2 +- {channeldb => graph/db}/models/cached_edge_policy.go | 0 {channeldb => graph/db}/models/channel.go | 0 {channeldb => graph/db}/models/channel_auth_proof.go | 0 {channeldb => graph/db}/models/channel_edge_info.go | 0 {channeldb => graph/db}/models/channel_edge_policy.go | 0 {channeldb => graph/db}/models/inbound_fee.go | 0 {channeldb => graph/db}/models/inbound_fee_test.go | 0 graph/interfaces.go | 2 +- graph/notifications.go | 2 +- graph/notifications_test.go | 2 +- graph/validation_barrier.go | 2 +- htlcswitch/circuit.go | 2 +- htlcswitch/held_htlc_set.go | 2 +- htlcswitch/held_htlc_set_test.go | 2 +- htlcswitch/htlcnotifier.go | 2 +- htlcswitch/interceptable_switch.go | 2 +- htlcswitch/interfaces.go | 2 +- htlcswitch/link.go | 2 +- htlcswitch/link_test.go | 2 +- htlcswitch/mock.go | 2 +- htlcswitch/packet.go | 2 +- htlcswitch/switch.go | 2 +- htlcswitch/switch_test.go | 2 +- htlcswitch/test_utils.go | 2 +- invoices/interface.go | 2 +- invoices/invoices_test.go | 2 +- invoices/sql_store.go | 2 +- invoices/update_invoice.go | 2 +- lnrpc/devrpc/dev_server.go | 2 +- lnrpc/invoicesrpc/addinvoice.go | 2 +- lnrpc/invoicesrpc/addinvoice_test.go | 2 +- lnrpc/routerrpc/forward_interceptor.go | 2 +- lnwallet/channel.go | 2 +- lnwallet/channel_test.go | 2 +- lnwallet/payment_descriptor.go | 2 +- netann/chan_status_manager_test.go | 2 +- netann/channel_announcement.go | 2 +- netann/channel_announcement_test.go | 2 +- netann/channel_update.go | 2 +- netann/interface.go | 2 +- peer/brontide.go | 2 +- routing/additional_edge.go | 2 +- routing/blindedpath/blinded_path.go | 2 +- routing/blindedpath/blinded_path_test.go | 2 +- routing/blinding.go | 2 +- routing/blinding_test.go | 2 +- routing/localchans/manager.go | 2 +- routing/localchans/manager_test.go | 2 +- routing/mock_graph_test.go | 2 +- routing/mock_test.go | 2 +- routing/pathfind.go | 2 +- routing/pathfind_test.go | 2 +- routing/payment_lifecycle.go | 2 +- routing/payment_session.go | 2 +- routing/payment_session_source.go | 2 +- routing/payment_session_test.go | 2 +- routing/router.go | 2 +- routing/router_test.go | 2 +- routing/unified_edges.go | 2 +- routing/unified_edges_test.go | 2 +- rpcserver.go | 2 +- server.go | 2 +- witness_beacon.go | 2 +- 95 files changed, 88 insertions(+), 88 deletions(-) rename {channeldb => graph/db}/models/cached_edge_policy.go (100%) rename {channeldb => graph/db}/models/channel.go (100%) rename {channeldb => graph/db}/models/channel_auth_proof.go (100%) rename {channeldb => graph/db}/models/channel_edge_info.go (100%) rename {channeldb => graph/db}/models/channel_edge_policy.go (100%) rename {channeldb => graph/db}/models/inbound_fee.go (100%) rename {channeldb => graph/db}/models/inbound_fee_test.go (100%) diff --git a/autopilot/graph.go b/autopilot/graph.go index 2ce49c127..f103bda00 100644 --- a/autopilot/graph.go +++ b/autopilot/graph.go @@ -12,7 +12,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcutil" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/chainreg/chainregistry.go b/chainreg/chainregistry.go index da1f8e08a..e30eafc67 100644 --- a/chainreg/chainregistry.go +++ b/chainreg/chainregistry.go @@ -23,8 +23,8 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs/btcdnotify" "github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/kvdb" diff --git a/channeldb/channel.go b/channeldb/channel.go index 0f198b5b3..200dc39ff 100644 --- a/channeldb/channel.go +++ b/channeldb/channel.go @@ -19,9 +19,9 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcwallet/walletdb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" graphdb "github.com/lightningnetwork/lnd/graph/db" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/channeldb/channel_cache_test.go b/channeldb/channel_cache_test.go index 7cb857293..ad85f6f66 100644 --- a/channeldb/channel_cache_test.go +++ b/channeldb/channel_cache_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" ) // TestChannelCache checks the behavior of the channelCache with respect to diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go index e92692201..02a4be1d0 100644 --- a/channeldb/channel_test.go +++ b/channeldb/channel_test.go @@ -15,9 +15,9 @@ import ( "github.com/btcsuite/btcd/wire" _ "github.com/btcsuite/btcwallet/walletdb/bdb" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnmock" diff --git a/channeldb/forwarding_policy.go b/channeldb/forwarding_policy.go index 2a4123045..2df2e308f 100644 --- a/channeldb/forwarding_policy.go +++ b/channeldb/forwarding_policy.go @@ -1,7 +1,7 @@ package channeldb import ( - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/channeldb/graph.go b/channeldb/graph.go index 9e24367a6..5837e7e57 100644 --- a/channeldb/graph.go +++ b/channeldb/graph.go @@ -21,8 +21,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/batch" - "github.com/lightningnetwork/lnd/channeldb/models" graphdb "github.com/lightningnetwork/lnd/graph/db" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" diff --git a/channeldb/graph_cache.go b/channeldb/graph_cache.go index 9bd2a8265..391579b76 100644 --- a/channeldb/graph_cache.go +++ b/channeldb/graph_cache.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/btcsuite/btcd/btcutil" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/channeldb/graph_cache_test.go b/channeldb/graph_cache_test.go index f7ed5cee6..31d7c47cf 100644 --- a/channeldb/graph_cache_test.go +++ b/channeldb/graph_cache_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "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 89197a0a8..32862340e 100644 --- a/channeldb/graph_test.go +++ b/channeldb/graph_test.go @@ -22,7 +22,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/channeldb/invoice_test.go b/channeldb/invoice_test.go index 3fe6b668e..1a4409f2d 100644 --- a/channeldb/invoice_test.go +++ b/channeldb/invoice_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" invpkg "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" diff --git a/channeldb/invoices.go b/channeldb/invoices.go index 9da504a5d..669da1608 100644 --- a/channeldb/invoices.go +++ b/channeldb/invoices.go @@ -9,7 +9,7 @@ import ( "io" "time" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" invpkg "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/kvdb" diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go index d7d10ba25..0004883c9 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/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/labels" diff --git a/contractcourt/chain_arbitrator_test.go b/contractcourt/chain_arbitrator_test.go index abaca5c2b..6ede1baf1 100644 --- a/contractcourt/chain_arbitrator_test.go +++ b/contractcourt/chain_arbitrator_test.go @@ -8,8 +8,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index ffa4a5d6e..3a7c2cfe9 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -15,8 +15,8 @@ import ( "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/invoices" diff --git a/contractcourt/channel_arbitrator_test.go b/contractcourt/channel_arbitrator_test.go index ac5253787..3b367bf54 100644 --- a/contractcourt/channel_arbitrator_test.go +++ b/contractcourt/channel_arbitrator_test.go @@ -15,9 +15,9 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" diff --git a/contractcourt/commit_sweep_resolver_test.go b/contractcourt/commit_sweep_resolver_test.go index f2b43b0f8..077fb8f82 100644 --- a/contractcourt/commit_sweep_resolver_test.go +++ b/contractcourt/commit_sweep_resolver_test.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/mock" diff --git a/contractcourt/htlc_incoming_contest_resolver.go b/contractcourt/htlc_incoming_contest_resolver.go index 6bda4e398..e7e21fff6 100644 --- a/contractcourt/htlc_incoming_contest_resolver.go +++ b/contractcourt/htlc_incoming_contest_resolver.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/txscript" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lntypes" diff --git a/contractcourt/htlc_incoming_contest_resolver_test.go b/contractcourt/htlc_incoming_contest_resolver_test.go index 55d93a6fb..22280f953 100644 --- a/contractcourt/htlc_incoming_contest_resolver_test.go +++ b/contractcourt/htlc_incoming_contest_resolver_test.go @@ -8,7 +8,7 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/kvdb" diff --git a/contractcourt/htlc_outgoing_contest_resolver_test.go b/contractcourt/htlc_outgoing_contest_resolver_test.go index f67c34ff4..6608a6fb5 100644 --- a/contractcourt/htlc_outgoing_contest_resolver_test.go +++ b/contractcourt/htlc_outgoing_contest_resolver_test.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnmock" diff --git a/contractcourt/htlc_success_resolver.go b/contractcourt/htlc_success_resolver.go index 4c9d2b200..159b642dd 100644 --- a/contractcourt/htlc_success_resolver.go +++ b/contractcourt/htlc_success_resolver.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/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lnutils" diff --git a/contractcourt/htlc_success_resolver_test.go b/contractcourt/htlc_success_resolver_test.go index b9182500b..23023729f 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/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnmock" diff --git a/contractcourt/htlc_timeout_resolver_test.go b/contractcourt/htlc_timeout_resolver_test.go index 47be71d3e..92cc587fc 100644 --- a/contractcourt/htlc_timeout_resolver_test.go +++ b/contractcourt/htlc_timeout_resolver_test.go @@ -14,8 +14,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" diff --git a/contractcourt/interfaces.go b/contractcourt/interfaces.go index 90ad2b1c8..75b81e9dd 100644 --- a/contractcourt/interfaces.go +++ b/contractcourt/interfaces.go @@ -6,7 +6,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/invoices" diff --git a/contractcourt/mock_htlcnotifier_test.go b/contractcourt/mock_htlcnotifier_test.go index 52bd18676..6b8f40659 100644 --- a/contractcourt/mock_htlcnotifier_test.go +++ b/contractcourt/mock_htlcnotifier_test.go @@ -2,7 +2,7 @@ package contractcourt import ( "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" ) type mockHTLCNotifier struct { diff --git a/contractcourt/mock_registry_test.go b/contractcourt/mock_registry_test.go index 5c7518562..5bba11afc 100644 --- a/contractcourt/mock_registry_test.go +++ b/contractcourt/mock_registry_test.go @@ -3,7 +3,7 @@ package contractcourt import ( "context" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/discovery/gossiper.go b/discovery/gossiper.go index 284cc4221..f3054496e 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -19,9 +19,9 @@ import ( "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/graph" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnpeer" diff --git a/discovery/gossiper_test.go b/discovery/gossiper_test.go index 1577ce8c2..7315ba97a 100644 --- a/discovery/gossiper_test.go +++ b/discovery/gossiper_test.go @@ -24,9 +24,9 @@ import ( "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/graph" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnpeer" diff --git a/funding/manager.go b/funding/manager.go index 1fa90c693..075be1278 100644 --- a/funding/manager.go +++ b/funding/manager.go @@ -22,10 +22,10 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chanacceptor" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/graph" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/labels" diff --git a/funding/manager_test.go b/funding/manager_test.go index 18dd8cf38..c73f19a39 100644 --- a/funding/manager_test.go +++ b/funding/manager_test.go @@ -25,10 +25,10 @@ import ( "github.com/lightningnetwork/lnd/chainreg" acpt "github.com/lightningnetwork/lnd/chanacceptor" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lncfg" diff --git a/graph/builder.go b/graph/builder.go index 6930f1a89..3a843afff 100644 --- a/graph/builder.go +++ b/graph/builder.go @@ -17,8 +17,8 @@ import ( "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnutils" diff --git a/graph/builder_test.go b/graph/builder_test.go index f6c5dcf9c..e53108d17 100644 --- a/graph/builder_test.go +++ b/graph/builder_test.go @@ -21,7 +21,7 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lnwire" diff --git a/channeldb/models/cached_edge_policy.go b/graph/db/models/cached_edge_policy.go similarity index 100% rename from channeldb/models/cached_edge_policy.go rename to graph/db/models/cached_edge_policy.go diff --git a/channeldb/models/channel.go b/graph/db/models/channel.go similarity index 100% rename from channeldb/models/channel.go rename to graph/db/models/channel.go diff --git a/channeldb/models/channel_auth_proof.go b/graph/db/models/channel_auth_proof.go similarity index 100% rename from channeldb/models/channel_auth_proof.go rename to graph/db/models/channel_auth_proof.go diff --git a/channeldb/models/channel_edge_info.go b/graph/db/models/channel_edge_info.go similarity index 100% rename from channeldb/models/channel_edge_info.go rename to graph/db/models/channel_edge_info.go diff --git a/channeldb/models/channel_edge_policy.go b/graph/db/models/channel_edge_policy.go similarity index 100% rename from channeldb/models/channel_edge_policy.go rename to graph/db/models/channel_edge_policy.go diff --git a/channeldb/models/inbound_fee.go b/graph/db/models/inbound_fee.go similarity index 100% rename from channeldb/models/inbound_fee.go rename to graph/db/models/inbound_fee.go diff --git a/channeldb/models/inbound_fee_test.go b/graph/db/models/inbound_fee_test.go similarity index 100% rename from channeldb/models/inbound_fee_test.go rename to graph/db/models/inbound_fee_test.go diff --git a/graph/interfaces.go b/graph/interfaces.go index 7ae79f9a9..5be996530 100644 --- a/graph/interfaces.go +++ b/graph/interfaces.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/graph/notifications.go b/graph/notifications.go index 14ea3d127..f56e3a32b 100644 --- a/graph/notifications.go +++ b/graph/notifications.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/graph/notifications_test.go b/graph/notifications_test.go index 09ebf1211..540699455 100644 --- a/graph/notifications_test.go +++ b/graph/notifications_test.go @@ -18,7 +18,7 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb" diff --git a/graph/validation_barrier.go b/graph/validation_barrier.go index 98d910d89..9d7c80521 100644 --- a/graph/validation_barrier.go +++ b/graph/validation_barrier.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/htlcswitch/circuit.go b/htlcswitch/circuit.go index 700b087f5..eab1cdb20 100644 --- a/htlcswitch/circuit.go +++ b/htlcswitch/circuit.go @@ -5,7 +5,7 @@ import ( "io" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/htlcswitch/held_htlc_set.go b/htlcswitch/held_htlc_set.go index e098a2e00..c04880dc3 100644 --- a/htlcswitch/held_htlc_set.go +++ b/htlcswitch/held_htlc_set.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" ) // heldHtlcSet keeps track of outstanding intercepted forwards. It exposes diff --git a/htlcswitch/held_htlc_set_test.go b/htlcswitch/held_htlc_set_test.go index a0a5e5bb4..ca1a1750b 100644 --- a/htlcswitch/held_htlc_set_test.go +++ b/htlcswitch/held_htlc_set_test.go @@ -3,7 +3,7 @@ package htlcswitch import ( "testing" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" ) diff --git a/htlcswitch/htlcnotifier.go b/htlcswitch/htlcnotifier.go index d6da5327d..4d4d33374 100644 --- a/htlcswitch/htlcnotifier.go +++ b/htlcswitch/htlcnotifier.go @@ -7,7 +7,7 @@ import ( "time" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/htlcswitch/interceptable_switch.go b/htlcswitch/interceptable_switch.go index 0d1fec9ae..c48436173 100644 --- a/htlcswitch/interceptable_switch.go +++ b/htlcswitch/interceptable_switch.go @@ -8,8 +8,8 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnutils" diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go index a3f4ff9a9..d8f55afc6 100644 --- a/htlcswitch/interfaces.go +++ b/htlcswitch/interfaces.go @@ -6,8 +6,8 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/htlcswitch/link.go b/htlcswitch/link.go index 579046005..b8f1ce8ed 100644 --- a/htlcswitch/link.go +++ b/htlcswitch/link.go @@ -15,9 +15,9 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go index 725972340..46c47961f 100644 --- a/htlcswitch/link_test.go +++ b/htlcswitch/link_test.go @@ -25,9 +25,9 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go index 0a3364ae2..17626e3fc 100644 --- a/htlcswitch/mock.go +++ b/htlcswitch/mock.go @@ -23,10 +23,10 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lnpeer" diff --git a/htlcswitch/packet.go b/htlcswitch/packet.go index 31639dd5d..e99185851 100644 --- a/htlcswitch/packet.go +++ b/htlcswitch/packet.go @@ -2,7 +2,7 @@ package htlcswitch import ( "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go index cbc2a16da..1a08275ec 100644 --- a/htlcswitch/switch.go +++ b/htlcswitch/switch.go @@ -15,10 +15,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/htlcswitch/switch_test.go b/htlcswitch/switch_test.go index f47deb080..e68e7d1b1 100644 --- a/htlcswitch/switch_test.go +++ b/htlcswitch/switch_test.go @@ -16,9 +16,9 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/lntest/mock" diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index cdb4f1f4e..02993d3bf 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -24,8 +24,8 @@ import ( "github.com/go-errors/errors" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/contractcourt" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/invoices" diff --git a/invoices/interface.go b/invoices/interface.go index c906da1c3..526378a2b 100644 --- a/invoices/interface.go +++ b/invoices/interface.go @@ -5,7 +5,7 @@ import ( "time" "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/invoices/invoices_test.go b/invoices/invoices_test.go index b6efd6e55..33e7ebb5b 100644 --- a/invoices/invoices_test.go +++ b/invoices/invoices_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/feature" + "github.com/lightningnetwork/lnd/graph/db/models" invpkg "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/invoices/sql_store.go b/invoices/sql_store.go index eb465eabb..e848297d9 100644 --- a/invoices/sql_store.go +++ b/invoices/sql_store.go @@ -11,8 +11,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/invoices/update_invoice.go b/invoices/update_invoice.go index a2de1b8f2..5286003e4 100644 --- a/invoices/update_invoice.go +++ b/invoices/update_invoice.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnrpc/devrpc/dev_server.go b/lnrpc/devrpc/dev_server.go index ad135e8df..9fd19347f 100644 --- a/lnrpc/devrpc/dev_server.go +++ b/lnrpc/devrpc/dev_server.go @@ -17,8 +17,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntypes" diff --git a/lnrpc/invoicesrpc/addinvoice.go b/lnrpc/invoicesrpc/addinvoice.go index df274f2da..440dd2427 100644 --- a/lnrpc/invoicesrpc/addinvoice.go +++ b/lnrpc/invoicesrpc/addinvoice.go @@ -18,7 +18,7 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnutils" diff --git a/lnrpc/invoicesrpc/addinvoice_test.go b/lnrpc/invoicesrpc/addinvoice_test.go index 76a529f8c..546b9cc72 100644 --- a/lnrpc/invoicesrpc/addinvoice_test.go +++ b/lnrpc/invoicesrpc/addinvoice_test.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/zpay32" "github.com/stretchr/testify/mock" diff --git a/lnrpc/routerrpc/forward_interceptor.go b/lnrpc/routerrpc/forward_interceptor.go index 614a11888..7bc366dce 100644 --- a/lnrpc/routerrpc/forward_interceptor.go +++ b/lnrpc/routerrpc/forward_interceptor.go @@ -3,8 +3,8 @@ package routerrpc import ( "errors" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntypes" diff --git a/lnwallet/channel.go b/lnwallet/channel.go index fe4351c47..54ef442a9 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -25,8 +25,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lntypes" diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go index 8fc3d8b46..e3b7d07f9 100644 --- a/lnwallet/channel_test.go +++ b/lnwallet/channel_test.go @@ -25,8 +25,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/lnwallet/payment_descriptor.go b/lnwallet/payment_descriptor.go index a8edb1e7e..49b79a139 100644 --- a/lnwallet/payment_descriptor.go +++ b/lnwallet/payment_descriptor.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/netann/chan_status_manager_test.go b/netann/chan_status_manager_test.go index c709a95f2..0dc3b6a9e 100644 --- a/netann/chan_status_manager_test.go +++ b/netann/chan_status_manager_test.go @@ -14,7 +14,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/netann" diff --git a/netann/channel_announcement.go b/netann/channel_announcement.go index 9644a523f..571e0584d 100644 --- a/netann/channel_announcement.go +++ b/netann/channel_announcement.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/netann/channel_announcement_test.go b/netann/channel_announcement_test.go index 61db16b16..e8c5799b4 100644 --- a/netann/channel_announcement_test.go +++ b/netann/channel_announcement_test.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" diff --git a/netann/channel_update.go b/netann/channel_update.go index af91abdd2..efc5cf61e 100644 --- a/netann/channel_update.go +++ b/netann/channel_update.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/netann/interface.go b/netann/interface.go index d6cdb46d0..aa559435d 100644 --- a/netann/interface.go +++ b/netann/interface.go @@ -3,7 +3,7 @@ package netann import ( "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" ) // DB abstracts the required database functionality needed by the diff --git a/peer/brontide.go b/peer/brontide.go index bb4c9f96d..10c2bc53a 100644 --- a/peer/brontide.go +++ b/peer/brontide.go @@ -22,13 +22,13 @@ import ( "github.com/lightningnetwork/lnd/buffer" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/feature" "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/funding" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/htlcswitch/hop" diff --git a/routing/additional_edge.go b/routing/additional_edge.go index 5f2d42eeb..80061206e 100644 --- a/routing/additional_edge.go +++ b/routing/additional_edge.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/blindedpath/blinded_path.go b/routing/blindedpath/blinded_path.go index bc14daa40..a1f9db7b6 100644 --- a/routing/blindedpath/blinded_path.go +++ b/routing/blindedpath/blinded_path.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/btcutil" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" "github.com/lightningnetwork/lnd/routing/route" diff --git a/routing/blindedpath/blinded_path_test.go b/routing/blindedpath/blinded_path_test.go index 51d028eaf..35db89afb 100644 --- a/routing/blindedpath/blinded_path_test.go +++ b/routing/blindedpath/blinded_path_test.go @@ -11,7 +11,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" sphinx "github.com/lightningnetwork/lightning-onion" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/routing/blinding.go b/routing/blinding.go index 270f998d9..7c8406346 100644 --- a/routing/blinding.go +++ b/routing/blinding.go @@ -6,8 +6,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" sphinx "github.com/lightningnetwork/lightning-onion" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/blinding_test.go b/routing/blinding_test.go index 950cb0210..410dfaf64 100644 --- a/routing/blinding_test.go +++ b/routing/blinding_test.go @@ -6,8 +6,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" sphinx "github.com/lightningnetwork/lightning-onion" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" "github.com/stretchr/testify/require" diff --git a/routing/localchans/manager.go b/routing/localchans/manager.go index 2639928e0..af1986a29 100644 --- a/routing/localchans/manager.go +++ b/routing/localchans/manager.go @@ -10,9 +10,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/localchans/manager_test.go b/routing/localchans/manager_test.go index f4512fab2..863b61687 100644 --- a/routing/localchans/manager_test.go +++ b/routing/localchans/manager_test.go @@ -11,8 +11,8 @@ import ( "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/discovery" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/routing/mock_graph_test.go b/routing/mock_graph_test.go index de0341234..c3452cd2a 100644 --- a/routing/mock_graph_test.go +++ b/routing/mock_graph_test.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcutil" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/mock_test.go b/routing/mock_test.go index 35ac3ecd9..3cdb5ebaf 100644 --- a/routing/mock_test.go +++ b/routing/mock_test.go @@ -8,8 +8,8 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/pathfind.go b/routing/pathfind.go index 43eae7103..dad5bd202 100644 --- a/routing/pathfind.go +++ b/routing/pathfind.go @@ -12,9 +12,9 @@ import ( "github.com/btcsuite/btcd/btcutil" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/feature" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnutils" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go index 72f71600d..cd90ff52f 100644 --- a/routing/pathfind_test.go +++ b/routing/pathfind_test.go @@ -22,8 +22,8 @@ import ( "github.com/btcsuite/btcd/wire" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" switchhop "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/kvdb" diff --git a/routing/payment_lifecycle.go b/routing/payment_lifecycle.go index 93b214bde..267ce3965 100644 --- a/routing/payment_lifecycle.go +++ b/routing/payment_lifecycle.go @@ -10,8 +10,8 @@ import ( "github.com/davecgh/go-spew/spew" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/payment_session.go b/routing/payment_session.go index 3cbacad89..0afdf822f 100644 --- a/routing/payment_session.go +++ b/routing/payment_session.go @@ -6,7 +6,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnutils" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/netann" diff --git a/routing/payment_session_source.go b/routing/payment_session_source.go index ccee9bc44..aab4f989b 100644 --- a/routing/payment_session_source.go +++ b/routing/payment_session_source.go @@ -3,8 +3,8 @@ package routing import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" "github.com/lightningnetwork/lnd/tlv" diff --git a/routing/payment_session_test.go b/routing/payment_session_test.go index d510f77f9..8344c81ff 100644 --- a/routing/payment_session_test.go +++ b/routing/payment_session_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/routing/router.go b/routing/router.go index 1fea60ddb..b92aa1502 100644 --- a/routing/router.go +++ b/routing/router.go @@ -18,9 +18,9 @@ import ( sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/amp" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/fn" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnutils" diff --git a/routing/router_test.go b/routing/router_test.go index 6f6f2e434..9aaf490e2 100644 --- a/routing/router_test.go +++ b/routing/router_test.go @@ -22,10 +22,10 @@ import ( "github.com/go-errors/errors" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/graph" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" diff --git a/routing/unified_edges.go b/routing/unified_edges.go index 6c44372e9..db5dc2a7c 100644 --- a/routing/unified_edges.go +++ b/routing/unified_edges.go @@ -5,7 +5,7 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/routing/unified_edges_test.go b/routing/unified_edges_test.go index 82605e9b3..8fc79031a 100644 --- a/routing/unified_edges_test.go +++ b/routing/unified_edges_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcutil" - "github.com/lightningnetwork/lnd/channeldb/models" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" "github.com/stretchr/testify/require" diff --git a/rpcserver.go b/rpcserver.go index d23066a1f..1fbc36193 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -42,7 +42,6 @@ import ( "github.com/lightningnetwork/lnd/chanfitness" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channeldb/graphsession" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/contractcourt" @@ -51,6 +50,7 @@ import ( "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/graph" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/input" diff --git a/server.go b/server.go index c186d3656..4d423a89b 100644 --- a/server.go +++ b/server.go @@ -34,7 +34,6 @@ import ( "github.com/lightningnetwork/lnd/chanfitness" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channeldb/graphsession" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/cluster" @@ -44,6 +43,7 @@ import ( "github.com/lightningnetwork/lnd/fn" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/graph" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/healthcheck" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/htlcswitch/hop" diff --git a/witness_beacon.go b/witness_beacon.go index 2bc3c0850..fe78f3665 100644 --- a/witness_beacon.go +++ b/witness_beacon.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/channeldb/models" "github.com/lightningnetwork/lnd/contractcourt" + "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/htlcswitch/hop" "github.com/lightningnetwork/lnd/lntypes"