Merge pull request #6383 from oasisprotocol/peternose/internal/bump-golangci-lint

go: Bump golangci-lint to v2.6.0

Author: peternose

.changelog/6383.internal.md

@@ -0,0 +1 @@
+go: Bump golangci-lint to v2.6.0

docker/oasis-core-dev/Dockerfile

@@ -6,7 +6,7 @@ ARG GO_NANCY_VERSION=1.0.33
 ARG GO_NANCY_CHECKSUM=a4bf5290d41b095c04f941ed5380674770c79d59735e33b1bd07a5cd5fbb135d
 ARG GO_PROTOC_VERSION=3.6.1
 ARG GO_PROTOC_GEN_GO_VERSION=1.21.0
-ARG GOLANGCILINT_VERSION=2.3.1
+ARG GOLANGCILINT_VERSION=2.6.0
 ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c
 ARG GOFUMPT_VERSION=v0.8.0
 ARG GOIMPORTS_VERSION=v0.36.0

docs/development-setup/prerequisites.md

@@ -151,7 +151,7 @@ Core:
   ```
   curl -sSfL \
   https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
-   | sh -s -- -b $(${OASIS_GO:-go} env GOPATH)/bin v2.3.1
+   | sh -s -- -b $(${OASIS_GO:-go} env GOPATH)/bin v2.6.0
   ```
 
 * (**OPTIONAL**) [protoc-gen-go].

go/common/copy.go

@@ -16,13 +16,13 @@ import (
 func CopyFile(src, dst string) (err error) {
 	in, err := os.Open(src)
 	if err != nil {
-		return
+		return err
 	}
 	defer in.Close()
 
 	out, err := os.Create(dst)
 	if err != nil {
-		return
+		return err
 	}
 	defer func() {
 		if e := out.Close(); e != nil {
@@ -32,30 +32,30 @@ func CopyFile(src, dst string) (err error) {
 
 	_, err = io.Copy(out, in)
 	if err != nil {
-		return
+		return err
 	}
 
 	err = out.Sync()
 	if err != nil {
-		return
+		return err
 	}
 
 	si, err := os.Stat(src)
 	if err != nil {
-		return
+		return err
 	}
 	err = os.Chmod(dst, si.Mode())
 	if err != nil {
-		return
+		return err
 	}
 
-	return
+	return nil
 }
 
 // CopyDir recursively copies a directory tree, attempting to preserve permissions.
 // Source directory must exist, destination directory must *not* exist.
 // Symlinks are ignored and skipped.
-func CopyDir(src string, dst string) (err error) {
+func CopyDir(src string, dst string) error {
 	src = filepath.Clean(src)
 	dst = filepath.Clean(dst)
 
@@ -69,20 +69,20 @@ func CopyDir(src string, dst string) (err error) {
 
 	_, err = os.Stat(dst)
 	if err != nil && !os.IsNotExist(err) {
-		return
+		return err
 	}
 	if err == nil {
 		return fmt.Errorf("destination already exists")
 	}
 
 	err = os.MkdirAll(dst, si.Mode())
 	if err != nil {
-		return
+		return err
 	}
 
 	entries, err := os.ReadDir(src)
 	if err != nil {
-		return
+		return err
 	}
 
 	for _, entry := range entries {
@@ -92,7 +92,7 @@ func CopyDir(src string, dst string) (err error) {
 		if entry.IsDir() {
 			err = CopyDir(srcPath, dstPath)
 			if err != nil {
-				return
+				return err
 			}
 		} else {
 			// Skip symlinks.
@@ -102,10 +102,10 @@ func CopyDir(src string, dst string) (err error) {
 
 			err = CopyFile(srcPath, dstPath)
 			if err != nil {
-				return
+				return err
 			}
 		}
 	}
 
-	return
+	return nil
 }

go/common/crypto/address/address.go

@@ -34,8 +34,7 @@ type Address [Size]byte
 
 // MarshalBinary encodes an address into binary form.
 func (a Address) MarshalBinary() (data []byte, err error) {
-	data = append([]byte{}, a[:]...)
-	return
+	return append([]byte{}, a[:]...), nil
 }
 
 // UnmarshalBinary decodes a binary marshaled address.
@@ -90,7 +89,7 @@ func (a Address) IsValid() bool {
 }
 
 // NewAddress creates a new address of specified version from address' context and data.
-func NewAddress(ctx Context, data []byte) (a Address) {
+func NewAddress(ctx Context, data []byte) Address {
 	if _, isRegistered := registeredContexts.Load(ctx); !isRegistered {
 		panic(fmt.Sprintf("address: context %s is not registered", ctx))
 	}
@@ -101,6 +100,7 @@ func NewAddress(ctx Context, data []byte) (a Address) {
 	if err != nil {
 		panic(err)
 	}
+	var a Address
 	_ = a.UnmarshalBinary(append([]byte{ctx.Version}, truncatedHash...))
-	return
+	return a
 }

go/common/crypto/address/context.go

@@ -29,8 +29,7 @@ type Context struct {
 
 // MarshalBinary encodes a context into binary form.
 func (c Context) MarshalBinary() (data []byte, err error) {
-	data = append([]byte(c.Identifier), c.Version)
-	return
+	return append([]byte(c.Identifier), c.Version), nil
 }
 
 // String returns a string representation of address' context.

go/common/crypto/hash/hash.go

@@ -36,8 +36,7 @@ type Hash [Size]byte
 
 // MarshalBinary encodes a hash into binary form.
 func (h *Hash) MarshalBinary() (data []byte, err error) {
-	data = append([]byte{}, h[:]...)
-	return
+	return append([]byte{}, h[:]...), nil
 }
 
 // UnmarshalBinary decodes a binary marshaled hash.
@@ -139,15 +138,17 @@ func (h Hash) Truncate(n int) ([]byte, error) {
 }
 
 // NewFrom creates a new hash by hashing the CBOR representation of the given type.
-func NewFrom(v any) (h Hash) {
+func NewFrom(v any) Hash {
+	var h Hash
 	h.From(v)
-	return
+	return h
 }
 
 // NewFromBytes creates a new hash by hashing the provided byte string(s).
-func NewFromBytes(data ...[]byte) (h Hash) {
+func NewFromBytes(data ...[]byte) Hash {
+	var h Hash
 	h.FromBytes(data...)
-	return
+	return h
 }
 
 // NewFromReader creates a new hash by hashing data from the provided reader until EOF.
@@ -161,9 +162,10 @@ func NewFromReader(reader io.Reader) (Hash, error) {
 
 // LoadFromHexBytes creates a new hash by loading it from the given CometBFT
 // HexBytes byte array.
-func LoadFromHexBytes(data cmtbytes.HexBytes) (h Hash) {
+func LoadFromHexBytes(data cmtbytes.HexBytes) Hash {
+	var h Hash
 	_ = h.UnmarshalBinary(data[:])
-	return
+	return h
 }
 
 // Builder is a hash builder that can be used to compute hashes iteratively.
@@ -179,10 +181,11 @@ func (b *Builder) Write(p []byte) (int, error) {
 
 // Build returns the current hash.
 // It does not change the underlying hash state.
-func (b *Builder) Build() (h Hash) {
+func (b *Builder) Build() Hash {
+	var h Hash
 	sum := b.hasher.Sum([]byte{})
 	_ = h.UnmarshalBinary(sum[:])
-	return
+	return h
 }
 
 // NewBuilder creates a new hash builder.

go/common/crypto/mathrand/rand_test.go

@@ -28,8 +28,8 @@ func TestRngAdapter(t *testing.T) {
 	//
 	// Sort of silly to do this repeatedly since the results are determinstic.
 	samples := make([]int, 6)
-	for i := 0; i < nrSamples; i++ {
-		samples[rng.Intn(6)]++
+	for range nrSamples {
+		samples[rng.Intn(len(samples))]++
 	}
 
 	chiSq, expected := float64(0), float64(nrSamples)/6

go/common/crypto/signature/signature.go

@@ -109,8 +109,7 @@ func (k PublicKey) Verify(context Context, message, sig []byte) bool {
 
 // MarshalBinary encodes a public key into binary form.
 func (k PublicKey) MarshalBinary() (data []byte, err error) {
-	data = append([]byte{}, k[:]...)
-	return
+	return append([]byte{}, k[:]...), nil
 }
 
 // UnmarshalBinary decodes a binary marshaled public key.
@@ -265,8 +264,7 @@ func (r RawSignature) Equal(cmp RawSignature) bool {
 
 // MarshalBinary encodes a signature into binary form.
 func (r RawSignature) MarshalBinary() (data []byte, err error) {
-	data = append([]byte{}, r[:]...)
-	return
+	return append([]byte{}, r[:]...), nil
 }
 
 // UnmarshalBinary decodes a binary marshaled signature.
@@ -619,7 +617,7 @@ type SignedPublicKey struct {
 }
 
 // Open first verifies the blob signature and then unmarshals the blob.
-func (s *SignedPublicKey) Open(context Context, pub *PublicKey) error { // nolint: interfacer
+func (s *SignedPublicKey) Open(context Context, pub *PublicKey) error {
 	return s.Signed.Open(context, pub)
 }
 
@@ -649,25 +647,29 @@ func VerifyManyToOne(context Context, message []byte, sigs []Signature) bool {
 
 // NewPublicKey creates a new public key from the given hex representation or
 // panics.
-func NewPublicKey(hex string) (pk PublicKey) {
+func NewPublicKey(hex string) PublicKey {
+	var pk PublicKey
 	if err := pk.UnmarshalHex(hex); err != nil {
 		panic(err)
 	}
-	return
+	return pk
 }
 
 // HashToPublicKey creates a public key via h2c from the given domain separator
 // and message.  The private key of the returned public key is unknown.
-func HashToPublicKey(dst, message []byte) (pk PublicKey) {
+func HashToPublicKey(dst, message []byte) PublicKey {
 	point, err := h2c.Edwards25519_XMD_SHA512_ELL2_RO(dst, message)
 	if err != nil {
 		panic(err)
 	}
 
 	var aCompressed curve.CompressedEdwardsY
 	aCompressed.SetEdwardsPoint(point)
+
+	var pk PublicKey
 	copy(pk[:], aCompressed[:])
-	return
+
+	return pk
 }
 
 // RegisterTestPublicKey registers a hardcoded test public key with the

go/common/crypto/signature/vrf_signer.go

@@ -96,8 +96,7 @@ func (r RawProof) String() string {
 
 // MarshalBinary encodes a VRF proof into binary form.
 func (r RawProof) MarshalBinary() (data []byte, err error) {
-	data = append([]byte{}, r[:]...)
-	return
+	return append([]byte{}, r[:]...), nil
 }
 
 // UnmarshalBinary decodes a binary marshaled VRF proof.