Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions cmd/peerswaplnd/peerswapd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/elementsproject/glightning/gbitcoin"
"github.com/elementsproject/glightning/gelements"
"github.com/elementsproject/peerswap/cmd/peerswaplnd"
lnd_internal "github.com/elementsproject/peerswap/lnd"
"github.com/elementsproject/peerswap/messages"
"github.com/elementsproject/peerswap/onchain"
"github.com/elementsproject/peerswap/peerswaprpc"
Expand Down Expand Up @@ -144,7 +143,7 @@ func run() error {
var supportedAssets = []string{}

var bitcoinOnChainService *onchain.BitcoinOnChain
var lndTxWatcher *lnd_internal.TxWatcher
var lndTxWatcher *lnd.TxWatcher
// setup bitcoin stuff
if cfg.BitcoinEnabled {
// bitcoin
Expand All @@ -154,7 +153,7 @@ func run() error {
}

supportedAssets = append(supportedAssets, "btc")
lndTxWatcher, err = lnd_internal.NewTxWatcher(
lndTxWatcher, err = lnd.NewTxWatcher(
ctx,
cc,
chain,
Expand Down Expand Up @@ -261,26 +260,26 @@ func run() error {
os.Exit(1)
}
// Start lnd listeners and watchers.
messageListener, err := lnd_internal.NewMessageListener(ctx, cc)
messageListener, err := lnd.NewMessageListener(ctx, cc)
if err != nil {
return err
}
defer messageListener.Stop()

paymentWatcher, err := lnd_internal.NewPaymentWatcher(ctx, cc)
paymentWatcher, err := lnd.NewPaymentWatcher(ctx, cc)
if err != nil {
return err
}
defer paymentWatcher.Stop()

peerListener, err := lnd_internal.NewPeerListener(ctx, cc)
peerListener, err := lnd.NewPeerListener(ctx, cc)
if err != nil {
return err
}
defer peerListener.Stop()

// Setup lnd client.
lnd, err := lnd_internal.NewClient(
lnd, err := lnd.NewClient(
ctx,
cc,
paymentWatcher,
Expand Down