From 73256e6d0ef8111198a02dfca7f7de81c278a9ca Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Fri, 24 Jul 2020 13:13:39 -0700 Subject: [PATCH] zpay32: fix linter errors in encode/decode --- zpay32/decode.go | 2 +- zpay32/encode.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/zpay32/decode.go b/zpay32/decode.go index 93f24af7..07929b45 100644 --- a/zpay32/decode.go +++ b/zpay32/decode.go @@ -318,7 +318,7 @@ func parse32Bytes(data []byte) (*[32]byte, error) { return nil, err } - copy(paymentHash[:], hash[:]) + copy(paymentHash[:], hash) return &paymentHash, nil } diff --git a/zpay32/encode.go b/zpay32/encode.go index 8a9c3bf6..9084e230 100644 --- a/zpay32/encode.go +++ b/zpay32/encode.go @@ -35,8 +35,7 @@ func (invoice *Invoice) Encode(signer MessageSigner) (string, error) { // Add zero bytes to the first timestampBase32Len-len(timestampBase32) // groups, then add the non-zero groups. - zeroes := make([]byte, timestampBase32Len-len(timestampBase32), - timestampBase32Len-len(timestampBase32)) + zeroes := make([]byte, timestampBase32Len-len(timestampBase32)) _, err := bufferBase32.Write(zeroes) if err != nil { return "", fmt.Errorf("unable to write to buffer: %v", err) @@ -157,7 +156,7 @@ func writeTaggedFields(bufferBase32 *bytes.Buffer, invoice *Invoice) error { } if invoice.minFinalCLTVExpiry != nil { - finalDelta := uint64ToBase32(uint64(*invoice.minFinalCLTVExpiry)) + finalDelta := uint64ToBase32(*invoice.minFinalCLTVExpiry) err := writeTaggedField(bufferBase32, fieldTypeC, finalDelta) if err != nil { return err @@ -336,7 +335,7 @@ func uint64ToBase32(num uint64) []byte { for num > 0 { i-- arr[i] = byte(num & uint64(31)) // 0b11111 in binary - num = num >> 5 + num >>= 5 } // We only return non-zero leading groups.