Merge pull request #825 from starius/swapserverrpc-looprpc

multi: do not rename swapserverrpc to looprpc

Author: starius

instantout/actions.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lightninglabs/loop/instantout/reservation"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/swap"
-	loop_rpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -137,7 +137,7 @@ func (f *FSM) InitInstantOutAction(eventCtx fsm.EventContext) fsm.EventType {
 	// Send the instantout request to the server.
 	instantOutResponse, err := f.cfg.InstantOutClient.RequestInstantLoopOut(
 		f.ctx,
-		&loop_rpc.InstantLoopOutRequest{
+		&swapserverrpc.InstantLoopOutRequest{
 			ReceiverKey:     keyRes.PubKey.SerializeCompressed(),
 			SwapHash:        swapHash[:],
 			Expiry:          initCtx.cltvExpiry,
@@ -259,7 +259,8 @@ func (f *FSM) PollPaymentAcceptedAction(_ fsm.EventContext) fsm.EventType {
 
 		case <-timer.C:
 			res, err := f.cfg.InstantOutClient.PollPaymentAccepted(
-				f.ctx, &loop_rpc.PollPaymentAcceptedRequest{
+				f.ctx,
+				&swapserverrpc.PollPaymentAcceptedRequest{
 					SwapHash: f.InstantOut.SwapHash[:],
 				},
 			)
@@ -292,7 +293,7 @@ func (f *FSM) BuildHTLCAction(eventCtx fsm.EventContext) fsm.EventType {
 	// Send the server the client nonces.
 	htlcInitRes, err := f.cfg.InstantOutClient.InitHtlcSig(
 		f.ctx,
-		&loop_rpc.InitHtlcSigRequest{
+		&swapserverrpc.InitHtlcSigRequest{
 			SwapHash:         f.InstantOut.SwapHash[:],
 			HtlcClientNonces: htlcClientNonces,
 		},
@@ -331,7 +332,7 @@ func (f *FSM) BuildHTLCAction(eventCtx fsm.EventContext) fsm.EventType {
 	// Send the server the htlc signatures.
 	htlcRes, err := f.cfg.InstantOutClient.PushHtlcSig(
 		f.ctx,
-		&loop_rpc.PushHtlcSigRequest{
+		&swapserverrpc.PushHtlcSigRequest{
 			SwapHash:   f.InstantOut.SwapHash[:],
 			ClientSigs: htlcSigs,
 		},
@@ -377,7 +378,7 @@ func (f *FSM) PushPreimageAction(eventCtx fsm.EventContext) fsm.EventType {
 
 	pushPreImageRes, err := f.cfg.InstantOutClient.PushPreimage(
 		f.ctx,
-		&loop_rpc.PushPreimageRequest{
+		&swapserverrpc.PushPreimageRequest{
 			Preimage:        f.InstantOut.swapPreimage[:],
 			ClientNonces:    coopClientNonces,
 			ClientSweepAddr: f.InstantOut.sweepAddress.String(),
@@ -615,7 +616,7 @@ func (f *FSM) handleErrorAndUnlockReservations(err error) fsm.EventType {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
 		defer cancel()
 		_, cancelErr := f.cfg.InstantOutClient.CancelInstantSwap(
-			ctx, &loop_rpc.CancelInstantSwapRequest{
+			ctx, &swapserverrpc.CancelInstantSwapRequest{
 				SwapHash: f.InstantOut.SwapHash[:],
 			},
 		)

instantout/fsm.go

@@ -7,7 +7,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/fsm"
-	loop_rpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/input"
 )
 
@@ -28,8 +28,8 @@ func CurrentProtocolVersion() ProtocolVersion {
 }
 
 // CurrentRpcProtocolVersion returns the current rpc protocol version.
-func CurrentRpcProtocolVersion() loop_rpc.InstantOutProtocolVersion {
-	return loop_rpc.InstantOutProtocolVersion(CurrentProtocolVersion())
+func CurrentRpcProtocolVersion() swapserverrpc.InstantOutProtocolVersion {
+	return swapserverrpc.InstantOutProtocolVersion(CurrentProtocolVersion())
 }
 
 const (
@@ -163,7 +163,7 @@ type Config struct {
 	Wallet lndclient.WalletKitClient
 
 	// InstantOutClient is used to communicate with the swap server.
-	InstantOutClient loop_rpc.InstantSwapServerClient
+	InstantOutClient swapserverrpc.InstantSwapServerClient
 
 	// ReservationManager is used to get the reservations and lock them.
 	ReservationManager ReservationManager

instantout/manager.go

@@ -10,7 +10,7 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/loop/fsm"
 	"github.com/lightninglabs/loop/instantout/reservation"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 )
 
@@ -234,7 +234,7 @@ func (m *Manager) GetInstantOutQuote(ctx context.Context,
 
 	// Get the service fee.
 	quoteRes, err := m.cfg.InstantOutClient.GetInstantOutQuote(
-		ctx, &looprpc.GetInstantOutQuoteRequest{
+		ctx, &swapserverrpc.GetInstantOutQuoteRequest{
 			Amount: uint64(amt),
 		},
 	)

instantout/reservation/actions.go

@@ -6,7 +6,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/loop/fsm"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 )
 
@@ -40,7 +40,7 @@ func (f *FSM) InitAction(eventCtx fsm.EventContext) fsm.EventType {
 	log.Debugf("Dispatching reservation to server: %x",
 		reservationRequest.reservationID)
 
-	request := &looprpc.ServerOpenReservationRequest{
+	request := &swapserverrpc.ServerOpenReservationRequest{
 		ReservationId: reservationRequest.reservationID[:],
 		ClientKey:     keyRes.PubKey.SerializeCompressed(),
 	}

instantout/reservation/fsm.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/fsm"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 )
 
 const (
@@ -26,7 +26,7 @@ type Config struct {
 
 	// ReservationClient is the client used to communicate with the
 	// swap server.
-	ReservationClient looprpc.ReservationServiceClient
+	ReservationClient swapserverrpc.ReservationServiceClient
 
 	// FetchL402 is the function used to fetch the l402 token.
 	FetchL402 func(context.Context) error