lint

.golangci.yml

@@ -10,17 +10,19 @@ linters:
     - dogsled
     - errcheck
     - exportloopref
+    - gci
     - goconst
-    - gocritic
+    #   - gocritic
     - gofumpt
     - gosec
     - gosimple
     - govet
     - ineffassign
+    - maintidx
     - misspell
     - nakedret
     - nolintlint
-    - revive
+    #   - revive
     - staticcheck
     - stylecheck
     - typecheck
@@ -80,6 +82,9 @@ issues:
   max-same-issues: 10000
 
 linters-settings:
+  revive:
+    disable:
+      - var-naming
   dogsled:
     max-blank-identifiers: 3
   maligned:

go.mod

@@ -1,6 +1,6 @@
 module github.com/CosmWasm/wasmvm/v2
 
-go 1.21
+go 1.23
 
 require (
 	github.com/google/btree v1.0.0

ibc_test.go

@@ -7,11 +7,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/CosmWasm/wasmvm/v2/internal/api"
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const IBCTestContract = "./testdata/ibc_reflect.wasm"

internal/api/api_test.go

@@ -5,9 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"github.com/stretchr/testify/require"
 )
 
 func TestValidateAddressFailure(t *testing.T) {

internal/api/iterator.go

@@ -65,7 +65,7 @@ func storeIterator(callID uint64, it types.Iterator, frameLenLimit int) (uint64,
 
 	new_index := len(iteratorFrames[callID])
 	if new_index >= frameLenLimit {
-		return 0, fmt.Errorf("Reached iterator limit (%d)", frameLenLimit)
+		return 0, fmt.Errorf("reached iterator limit (%d)", frameLenLimit)
 	}
 
 	// store at array position `new_index`

internal/api/iterator_test.go

@@ -6,11 +6,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/CosmWasm/wasmvm/v2/internal/api/testdb"
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type queueData struct {

internal/api/lib.go

@@ -13,9 +13,8 @@ import (
 	"strings"
 	"syscall"
 
-	"golang.org/x/sys/unix"
-
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"golang.org/x/sys/unix"
 )
 
 // Value types
@@ -45,26 +44,26 @@ func InitCache(config types.VMConfig) (Cache, error) {
 	// libwasmvm would create this directory too but we need it earlier for the lockfile
 	err := os.MkdirAll(config.Cache.BaseDir, 0o755)
 	if err != nil {
-		return Cache{}, fmt.Errorf("Could not create base directory")
+		return Cache{}, fmt.Errorf("could not create base directory")
 	}
 
 	lockfile, err := os.OpenFile(filepath.Join(config.Cache.BaseDir, "exclusive.lock"), os.O_WRONLY|os.O_CREATE, 0o666)
 	if err != nil {
-		return Cache{}, fmt.Errorf("Could not open exclusive.lock")
+		return Cache{}, fmt.Errorf("could not open exclusive.lock")
 	}
 	_, err = lockfile.WriteString("This is a lockfile that prevent two VM instances to operate on the same directory in parallel.\nSee codebase at github.com/CosmWasm/wasmvm for more information.\nSafety first – brought to you by Confio ❤️\n")
 	if err != nil {
-		return Cache{}, fmt.Errorf("Error writing to exclusive.lock")
+		return Cache{}, fmt.Errorf("error writing to exclusive.lock")
 	}
 
 	err = unix.Flock(int(lockfile.Fd()), unix.LOCK_EX|unix.LOCK_NB)
 	if err != nil {
-		return Cache{}, fmt.Errorf("Could not lock exclusive.lock. Is a different VM running in the same directory already?")
+		return Cache{}, fmt.Errorf("could not lock exclusive.lock. is a different VM running in the same directory already?")
 	}
 
 	configBytes, err := json.Marshal(config)
 	if err != nil {
-		return Cache{}, fmt.Errorf("Could not serialize config")
+		return Cache{}, fmt.Errorf("could not serialize config")
 	}
 	configView := makeView(configBytes)
 	defer runtime.KeepAlive(configBytes)

internal/api/lib_test.go

@@ -13,10 +13,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/CosmWasm/wasmvm/v2/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/CosmWasm/wasmvm/v2/types"
 )
 
 const (
@@ -501,9 +500,9 @@ func TestGetPinnedMetrics(t *testing.T) {
 	findMetrics := func(list []types.PerModuleEntry, checksum types.Checksum) *types.PerModuleMetrics {
 		found := (*types.PerModuleMetrics)(nil)
 
-		for _, structure := range list {
-			if bytes.Equal(structure.Checksum, checksum) {
-				found = &structure.Metrics
+		for i := range list {
+			if bytes.Equal(list[i].Checksum, checksum) {
+				found = &list[i].Metrics
 				break
 			}
 		}
@@ -1156,7 +1155,7 @@ func TestReplyAndQuery(t *testing.T) {
 	require.Equal(t, events, val.Events)
 }
 
-func requireOkResponse(t testing.TB, res []byte, expectedMsgs int) {
+func requireOkResponse(t testing.TB, res []byte, expectedMsgs int) { //nolint:unparam // expectedMsgs always receives 0 but that could change
 	var result types.ContractResult
 	err := json.Unmarshal(res, &result)
 	require.NoError(t, err)
@@ -1361,17 +1360,17 @@ func TestFloats(t *testing.T) {
 
 	// helper to print the value in the same format as Rust's Debug trait
 	debugStr := func(value Value) string {
-		if value.U32 != nil {
+		switch {
+		case value.U32 != nil:
 			return fmt.Sprintf("U32(%d)", *value.U32)
-		} else if value.U64 != nil {
+		case value.U64 != nil:
 			return fmt.Sprintf("U64(%d)", *value.U64)
-		} else if value.F32 != nil {
+		case value.F32 != nil:
 			return fmt.Sprintf("F32(%d)", *value.F32)
-		} else if value.F64 != nil {
+		case value.F64 != nil:
 			return fmt.Sprintf("F64(%d)", *value.F64)
-		} else {
-			t.FailNow()
-			return ""
+		default:
+			return "None"
 		}
 	}
 

internal/api/mocks.go

@@ -8,11 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/CosmWasm/wasmvm/v2/internal/api/testdb"
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 /** helper constructors **/
@@ -392,8 +391,8 @@ func NewMockAPI() *types.GoAPI {
 	}
 }
 
-func TestMockApi(t *testing.T) {
-	human := Foobar
+func TestMockAPI(t *testing.T) {
+	human := "Foobar"
 	canon, cost, err := MockCanonicalizeAddress(human)
 	require.NoError(t, err)
 	assert.Equal(t, CanonicalLength, len(canon))
@@ -428,7 +427,9 @@ func DefaultQuerier(contractAddr string, coins types.Array[types.Coin]) types.Qu
 	}
 }
 
-func (q *MockQuerier) Query(request types.QueryRequest, _gasLimit uint64) ([]byte, error) {
+// Query is a mock implementation of the Querier interface.  It takes a request and a gas limit.
+// It returns the marshaled request and an error if the request is not supported.
+func (q *MockQuerier) Query(request types.QueryRequest, _ uint64) ([]byte, error) {
 	marshaled, err := json.Marshal(request)
 	if err != nil {
 		return nil, err

lib.go

@@ -44,15 +44,15 @@ func LibwasmvmVersion() (string, error) {
 // to avoid accidental misusage.
 func CreateChecksum(wasm []byte) (Checksum, error) {
 	if len(wasm) == 0 {
-		return Checksum{}, fmt.Errorf("Wasm bytes nil or empty")
+		return Checksum{}, fmt.Errorf("wasm bytes nil or empty")
 	}
 	if len(wasm) < 4 {
-		return Checksum{}, fmt.Errorf("Wasm bytes shorter than 4 bytes")
+		return Checksum{}, fmt.Errorf("wasm bytes shorter than 4 bytes")
 	}
 	// magic number for Wasm is "\0asm"
 	// See https://webassembly.github.io/spec/core/binary/modules.html#binary-module
 	if !bytes.Equal(wasm[:4], []byte("\x00\x61\x73\x6D")) {
-		return Checksum{}, fmt.Errorf("Wasm bytes do not start with Wasm magic number")
+		return Checksum{}, fmt.Errorf("wasm bytes do not start with wasm magic number")
 	}
 	hash := sha256.Sum256(wasm)
 	return Checksum(hash[:]), nil

lib_libwasmvm.go

@@ -703,7 +703,7 @@ var (
 func DeserializeResponse(gasLimit uint64, deserCost types.UFraction, gasReport *types.GasReport, data []byte, response any) error {
 	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasReport.UsedInternally {
-		return fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
+		return fmt.Errorf("insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasReport.UsedInternally += gasForDeserialization
 	gasReport.Remaining -= gasForDeserialization

lib_libwasmvm_test.go

@@ -9,11 +9,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/CosmWasm/wasmvm/v2/internal/api"
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 const (

lib_test.go

@@ -3,9 +3,8 @@ package cosmwasm
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/CosmWasm/wasmvm/v2/types"
+	"github.com/stretchr/testify/require"
 )
 
 func TestCreateChecksum(t *testing.T) {

types/msg.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 )
 
-var null = "null"
-
 //------- Results / Msgs -------------
 
 // ContractResult is the raw response from the instantiate/execute/migrate calls.