staticaddr: don't rename swapserverrpc to looprpc

Author: starius

staticaddr/loopin/actions.go

@@ -19,7 +19,7 @@ import (
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/staticaddr/version"
 	"github.com/lightninglabs/loop/swap"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/invoices"
@@ -117,7 +117,7 @@ func (f *FSM) InitHtlcAction(ctx context.Context,
 		version.CurrentRPCProtocolVersion(),
 	)
 
-	loopInReq := &looprpc.ServerStaticAddressLoopInRequest{
+	loopInReq := &swapserverrpc.ServerStaticAddressLoopInRequest{
 		SwapHash:              f.loopIn.SwapHash[:],
 		DepositOutpoints:      f.loopIn.DepositOutpoints,
 		HtlcClientPubKey:      f.loopIn.ClientPubkey.SerializeCompressed(),
@@ -144,7 +144,7 @@ func (f *FSM) InitHtlcAction(ctx context.Context,
 	// attempt.
 	pushEmptySigs := func() {
 		_, err = f.cfg.Server.PushStaticAddressHtlcSigs(
-			ctx, &looprpc.PushStaticAddressHtlcSigsRequest{
+			ctx, &swapserverrpc.PushStaticAddressHtlcSigsRequest{
 				SwapHash: f.loopIn.SwapHash[:],
 			},
 		)
@@ -382,17 +382,17 @@ func (f *FSM) SignHtlcTxAction(ctx context.Context,
 	}
 
 	// Push htlc tx sigs to server.
-	pushHtlcReq := &looprpc.PushStaticAddressHtlcSigsRequest{
+	pushHtlcReq := &swapserverrpc.PushStaticAddressHtlcSigsRequest{
 		SwapHash: f.loopIn.SwapHash[:],
-		StandardHtlcInfo: &looprpc.ClientHtlcSigningInfo{
+		StandardHtlcInfo: &swapserverrpc.ClientHtlcSigningInfo{
 			Nonces: clientHtlcNonces,
 			Sigs:   htlcSigs,
 		},
-		HighFeeHtlcInfo: &looprpc.ClientHtlcSigningInfo{
+		HighFeeHtlcInfo: &swapserverrpc.ClientHtlcSigningInfo{
 			Nonces: highFeeNonces,
 			Sigs:   htlcSigsHighFee,
 		},
-		ExtremeFeeHtlcInfo: &looprpc.ClientHtlcSigningInfo{
+		ExtremeFeeHtlcInfo: &swapserverrpc.ClientHtlcSigningInfo{
 			Nonces: extremelyHighNonces,
 			Sigs:   htlcSigsExtremelyHighFee,
 		},

staticaddr/loopin/manager.go

@@ -19,7 +19,6 @@ import (
 	"github.com/lightninglabs/loop/labels"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/swapserverrpc"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/routing/route"
 )
@@ -34,7 +33,7 @@ const (
 type Config struct {
 	// Server is the client that is used to communicate with the static
 	// address server.
-	Server looprpc.StaticAddressServerClient
+	Server swapserverrpc.StaticAddressServerClient
 
 	// AddressManager gives the withdrawal manager access to static address
 	// parameters.
@@ -232,7 +231,7 @@ func (m *Manager) notifyNotFinished(ctx context.Context, swapHash lntypes.Hash,
 	txId chainhash.Hash) error {
 
 	_, err := m.cfg.Server.PushStaticAddressSweeplessSigs(
-		ctx, &looprpc.PushStaticAddressSweeplessSigsRequest{
+		ctx, &swapserverrpc.PushStaticAddressSweeplessSigsRequest{
 			SwapHash:     swapHash[:],
 			Txid:         txId[:],
 			ErrorMessage: SwapNotFinishedMsg,
@@ -332,7 +331,7 @@ func (m *Manager) handleLoopInSweepReq(ctx context.Context,
 
 	// We'll now sign for every deposit that is part of the loop-in.
 	responseMap := make(
-		map[string]*looprpc.ClientSweeplessSigningInfo,
+		map[string]*swapserverrpc.ClientSweeplessSigningInfo,
 		len(req.DepositToNonces),
 	)
 
@@ -394,16 +393,17 @@ func (m *Manager) handleLoopInSweepReq(ctx context.Context,
 			return err
 		}
 
-		responseMap[depositOutpoint] = &looprpc.ClientSweeplessSigningInfo{ //nolint:lll
+		signingInfo := &swapserverrpc.ClientSweeplessSigningInfo{
 			Nonce: musig2Session.PublicNonce[:],
 			Sig:   sig,
 		}
+		responseMap[depositOutpoint] = signingInfo
 	}
 
 	txHash := sweepTx.TxHash()
 
 	_, err = m.cfg.Server.PushStaticAddressSweeplessSigs(
-		ctx, &looprpc.PushStaticAddressSweeplessSigsRequest{
+		ctx, &swapserverrpc.PushStaticAddressSweeplessSigsRequest{
 			SwapHash:    loopIn.SwapHash[:],
 			Txid:        txHash[:],
 			SigningInfo: responseMap,