From 803773bb65a5bae560151896a86bcc161c47ca9d Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Wed, 14 Jul 2021 17:21:54 +0200
Subject: [PATCH] loop+loopd: fix linter after re-generating protos

Apparently re-generating the protos caused the linter to pick up on
fields that are now deprecated. We need to fix that with a few comments.
---
 cmd/loop/loopout.go        |  4 ++--
 loopd/swapclient_server.go | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/loop/loopout.go b/cmd/loop/loopout.go
index d999ffa..638b150 100644
--- a/cmd/loop/loopout.go
+++ b/cmd/loop/loopout.go
@@ -203,8 +203,8 @@ func loopOut(ctx *cli.Context) error {
 	}
 
 	fmt.Printf("Swap initiated\n")
-	fmt.Printf("ID:             %v\n", resp.Id)
-	fmt.Printf("HTLC address:   %v\n", resp.HtlcAddress)
+	fmt.Printf("ID:             %x\n", resp.IdBytes)
+	fmt.Printf("HTLC address:   %v\n", resp.HtlcAddress) // nolint:staticcheck
 	if resp.ServerMessage != "" {
 		fmt.Printf("Server message: %v\n", resp.ServerMessage)
 	}
diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go
index 3933845..779ab61 100644
--- a/loopd/swapclient_server.go
+++ b/loopd/swapclient_server.go
@@ -121,12 +121,12 @@ func (s *swapClientServer) LoopOut(ctx context.Context,
 	}
 
 	switch {
-	case in.LoopOutChannel != 0 && len(in.OutgoingChanSet) > 0:
+	case in.LoopOutChannel != 0 && len(in.OutgoingChanSet) > 0: // nolint:staticcheck
 		return nil, errors.New("loop_out_channel and outgoing_" +
 			"chan_ids are mutually exclusive")
 
-	case in.LoopOutChannel != 0:
-		req.OutgoingChanSet = loopdb.ChannelSet{in.LoopOutChannel}
+	case in.LoopOutChannel != 0: // nolint:staticcheck
+		req.OutgoingChanSet = loopdb.ChannelSet{in.LoopOutChannel} // nolint:staticcheck
 
 	default:
 		req.OutgoingChanSet = in.OutgoingChanSet
@@ -540,9 +540,9 @@ func (s *swapClientServer) LoopIn(ctx context.Context,
 
 	if req.ExternalHtlc {
 		response.HtlcAddressNp2Wsh = swapInfo.HtlcAddressNP2WSH.String()
-		response.HtlcAddress = response.HtlcAddressNp2Wsh
+		response.HtlcAddress = response.HtlcAddressNp2Wsh // nolint:staticcheck
 	} else {
-		response.HtlcAddress = response.HtlcAddressP2Wsh
+		response.HtlcAddress = response.HtlcAddressP2Wsh // nolint:staticcheck
 	}
 
 	return response, nil