From 44b41641f8220fe79e43461356c147cc3cc72380 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Mon, 25 Nov 2019 13:41:53 +0100
Subject: [PATCH] rlp: fix staticcheck warnings (#20368)
* rlp: fix staticcheck warnings
* rlp: fix ExampleDecode test
---
rlp/decode.go | 11 ++++++-----
rlp/decode_test.go | 9 ++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rlp/decode.go b/rlp/decode.go
index a001866b9..5f3f5eedf 100644
--- a/rlp/decode.go
+++ b/rlp/decode.go
@@ -29,12 +29,13 @@ import (
"sync"
)
-var (
- // EOL is returned when the end of the current list
- // has been reached during streaming.
- EOL = errors.New("rlp: end of list")
+//lint:ignore ST1012 EOL is not an error.
+
+// EOL is returned when the end of the current list
+// has been reached during streaming.
+var EOL = errors.New("rlp: end of list")
- // Actual Errors
+var (
ErrExpectedString = errors.New("rlp: expected String or Byte")
ErrExpectedList = errors.New("rlp: expected List")
ErrCanonInt = errors.New("rlp: non-canonical integer format")
diff --git a/rlp/decode_test.go b/rlp/decode_test.go
index 634d1cf3b..167e9974b 100644
--- a/rlp/decode_test.go
+++ b/rlp/decode_test.go
@@ -354,7 +354,7 @@ type tailUint struct {
type tailPrivateFields struct {
A uint
Tail []uint `rlp:"tail"`
- x, y bool
+ x, y bool //lint:ignore U1000 unused fields required for testing purposes.
}
type nilListUint struct {
@@ -806,9 +806,8 @@ func ExampleDecode() {
input, _ := hex.DecodeString("C90A1486666F6F626172")
type example struct {
- A, B uint
- private uint // private fields are ignored
- String string
+ A, B uint
+ String string
}
var s example
@@ -819,7 +818,7 @@ func ExampleDecode() {
fmt.Printf("Decoded value: %#v\n", s)
}
// Output:
- // Decoded value: rlp.example{A:0xa, B:0x14, private:0x0, String:"foobar"}
+ // Decoded value: rlp.example{A:0xa, B:0x14, String:"foobar"}
}
func ExampleDecode_structTagNil() {
--
GitLab