GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-13 12:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

loop+loopd: fix linter after re-generating protos

Browse source 
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.
This commit is contained in:
Oliver Gugger 2021-07-14 17:21:54 +02:00
parent 77f7b73570
commit 803773bb65
No known key found for this signature in database
GPG key ID: 8E4256593F177720
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/loop/loopout.go
View file

@ -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)
}

10
loopd/swapclient_server.go
View file

@ -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