lndservices: move router_client.go into the new package

Author: ffranr

lnd_services.go

@@ -4,62 +4,9 @@ import (
 	"context"
 
 	"github.com/lightninglabs/lndclient"
-	"github.com/lightninglabs/taproot-assets/rfq"
 	"github.com/lightninglabs/taproot-assets/tapchannel"
-	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
-	"github.com/lightningnetwork/lnd/lnwire"
 )
 
-// LndRouterClient is an LND router RPC client.
-type LndRouterClient struct {
-	lnd *lndclient.LndServices
-}
-
-// NewLndRouterClient creates a new LND router client for a given LND service.
-func NewLndRouterClient(lnd *lndclient.LndServices) *LndRouterClient {
-	return &LndRouterClient{
-		lnd: lnd,
-	}
-}
-
-// InterceptHtlcs intercepts all incoming HTLCs and calls the given handler
-// function with the HTLC details. The handler function can then decide whether
-// to accept or reject the HTLC.
-func (l *LndRouterClient) InterceptHtlcs(
-	ctx context.Context, handler lndclient.HtlcInterceptHandler) error {
-
-	return l.lnd.Router.InterceptHtlcs(ctx, handler)
-}
-
-// AddLocalAlias adds a database mapping from the passed alias to the passed
-// base SCID.
-func (l *LndRouterClient) AddLocalAlias(ctx context.Context, alias,
-	baseScid lnwire.ShortChannelID) error {
-
-	return l.lnd.Router.XAddLocalChanAlias(ctx, alias, baseScid)
-}
-
-// DeleteLocalAlias removes a mapping from the database and the Manager's maps.
-func (l *LndRouterClient) DeleteLocalAlias(ctx context.Context, alias,
-	baseScid lnwire.ShortChannelID) error {
-
-	return l.lnd.Router.XDeleteLocalChanAlias(ctx, alias, baseScid)
-}
-
-// SubscribeHtlcEvents subscribes to a stream of events related to
-// HTLC updates.
-func (l *LndRouterClient) SubscribeHtlcEvents(
-	ctx context.Context) (<-chan *routerrpc.HtlcEvent,
-	<-chan error, error) {
-
-	return l.lnd.Router.SubscribeHtlcEvents(ctx)
-}
-
-// Ensure LndRouterClient implements the rfq.HtlcInterceptor interface.
-var _ rfq.HtlcInterceptor = (*LndRouterClient)(nil)
-var _ rfq.ScidAliasManager = (*LndRouterClient)(nil)
-var _ rfq.HtlcSubscriber = (*LndRouterClient)(nil)
-
 // LndInvoicesClient is an LND invoices RPC client.
 type LndInvoicesClient struct {
 	lnd *lndclient.LndServices

lndservices/router_client.go

@@ -0,0 +1,60 @@
+package lndservices
+
+import (
+	"context"
+
+	"github.com/lightninglabs/lndclient"
+	"github.com/lightninglabs/taproot-assets/rfq"
+	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
+	"github.com/lightningnetwork/lnd/lnwire"
+)
+
+// LndRouterClient is an LND router RPC client.
+type LndRouterClient struct {
+	lnd *lndclient.LndServices
+}
+
+// NewLndRouterClient creates a new LND router client for a given LND service.
+func NewLndRouterClient(lnd *lndclient.LndServices) *LndRouterClient {
+	return &LndRouterClient{
+		lnd: lnd,
+	}
+}
+
+// InterceptHtlcs intercepts all incoming HTLCs and calls the given handler
+// function with the HTLC details. The handler function can then decide whether
+// to accept or reject the HTLC.
+func (l *LndRouterClient) InterceptHtlcs(
+	ctx context.Context, handler lndclient.HtlcInterceptHandler) error {
+
+	return l.lnd.Router.InterceptHtlcs(ctx, handler)
+}
+
+// AddLocalAlias adds a database mapping from the passed alias to the passed
+// base SCID.
+func (l *LndRouterClient) AddLocalAlias(ctx context.Context, alias,
+	baseScid lnwire.ShortChannelID) error {
+
+	return l.lnd.Router.XAddLocalChanAlias(ctx, alias, baseScid)
+}
+
+// DeleteLocalAlias removes a mapping from the database and the Manager's maps.
+func (l *LndRouterClient) DeleteLocalAlias(ctx context.Context, alias,
+	baseScid lnwire.ShortChannelID) error {
+
+	return l.lnd.Router.XDeleteLocalChanAlias(ctx, alias, baseScid)
+}
+
+// SubscribeHtlcEvents subscribes to a stream of events related to
+// HTLC updates.
+func (l *LndRouterClient) SubscribeHtlcEvents(
+	ctx context.Context) (<-chan *routerrpc.HtlcEvent,
+	<-chan error, error) {
+
+	return l.lnd.Router.SubscribeHtlcEvents(ctx)
+}
+
+// Ensure LndRouterClient implements the rfq.HtlcInterceptor interface.
+var _ rfq.HtlcInterceptor = (*LndRouterClient)(nil)
+var _ rfq.ScidAliasManager = (*LndRouterClient)(nil)
+var _ rfq.HtlcSubscriber = (*LndRouterClient)(nil)

tapcfg/server.go

@@ -109,7 +109,7 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 	walletAnchor := tap.NewLndRpcWalletAnchor(lndServices)
 	chainBridge := lndservices.NewLndRpcChainBridge(lndServices, assetStore)
 	msgTransportClient := lndservices.NewLndMsgTransportClient(lndServices)
-	lndRouterClient := tap.NewLndRouterClient(lndServices)
+	lndRouterClient := lndservices.NewLndRouterClient(lndServices)
 	lndInvoicesClient := tap.NewLndInvoicesClient(lndServices)
 	lndFeatureBitsVerifier := tap.NewLndFeatureBitVerifier(lndServices)
 	lndFsmDaemonAdapters := lndservices.NewLndFsmDaemonAdapters(lndServices)