Skip to content

Commit 213f5c7

Browse files
committed
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.
1 parent 996b5e4 commit 213f5c7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

loopd/swapclient_server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/lightninglabs/loop/loopdb"
2020
clientrpc "github.com/lightninglabs/loop/looprpc"
2121
"github.com/lightninglabs/loop/swap"
22-
"github.com/lightninglabs/loop/swapserverrpc"
22+
looprpc "github.com/lightninglabs/loop/swapserverrpc"
2323
"github.com/lightningnetwork/lnd/lntypes"
2424
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
2525
"github.com/lightningnetwork/lnd/lnwire"
@@ -526,7 +526,7 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
526526
}
527527

528528
// unmarshallRouteHints unmarshalls a list of route hints.
529-
func unmarshallRouteHints(rpcRouteHints []*swapserverrpc.RouteHint) (
529+
func unmarshallRouteHints(rpcRouteHints []*looprpc.RouteHint) (
530530
[][]zpay32.HopHint, error) {
531531

532532
routeHints := make([][]zpay32.HopHint, 0, len(rpcRouteHints))
@@ -549,7 +549,7 @@ func unmarshallRouteHints(rpcRouteHints []*swapserverrpc.RouteHint) (
549549
}
550550

551551
// unmarshallHopHint unmarshalls a single hop hint.
552-
func unmarshallHopHint(rpcHint *swapserverrpc.HopHint) (zpay32.HopHint, error) {
552+
func unmarshallHopHint(rpcHint *looprpc.HopHint) (zpay32.HopHint, error) {
553553
pubBytes, err := hex.DecodeString(rpcHint.NodeId)
554554
if err != nil {
555555
return zpay32.HopHint{}, err

0 commit comments

Comments
 (0)