From 213f5c7c8b7fa4c7d3f47949b4cd8d074aeafc30 Mon Sep 17 00:00:00 2001 From: carla Date: Mon, 13 Dec 2021 15:31:37 +0200 Subject: [PATCH] loopd: alias server rpc import with looprpc Packages importing loopd can't import 2x looprpc packages (in the form of swapserverrpc and looprpc). To get around this, we alias each import with a different name, updating the server in this commit. --- loopd/swapclient_server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go index 2652db3..23a4bb6 100644 --- a/loopd/swapclient_server.go +++ b/loopd/swapclient_server.go @@ -19,7 +19,7 @@ import ( "github.com/lightninglabs/loop/loopdb" clientrpc "github.com/lightninglabs/loop/looprpc" "github.com/lightninglabs/loop/swap" - "github.com/lightninglabs/loop/swapserverrpc" + looprpc "github.com/lightninglabs/loop/swapserverrpc" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet/chainfee" "github.com/lightningnetwork/lnd/lnwire" @@ -526,7 +526,7 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context, } // unmarshallRouteHints unmarshalls a list of route hints. -func unmarshallRouteHints(rpcRouteHints []*swapserverrpc.RouteHint) ( +func unmarshallRouteHints(rpcRouteHints []*looprpc.RouteHint) ( [][]zpay32.HopHint, error) { routeHints := make([][]zpay32.HopHint, 0, len(rpcRouteHints)) @@ -549,7 +549,7 @@ func unmarshallRouteHints(rpcRouteHints []*swapserverrpc.RouteHint) ( } // unmarshallHopHint unmarshalls a single hop hint. -func unmarshallHopHint(rpcHint *swapserverrpc.HopHint) (zpay32.HopHint, error) { +func unmarshallHopHint(rpcHint *looprpc.HopHint) (zpay32.HopHint, error) { pubBytes, err := hex.DecodeString(rpcHint.NodeId) if err != nil { return zpay32.HopHint{}, err