Merge pull request #638 from CosmWasm/aw/update-tooling

Update Go and Nix tooling to latest versions

Author: aumetra

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/lint-go.yml

@@ -23,12 +23,12 @@ jobs:
           go-version: "1.23.4"
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.62.2
+          version: v2.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.gitignore

@@ -16,3 +16,6 @@ a.out
 
 # macOS
 .DS_Store
+
+# direnv Nix stuff
+.direnv/

.golangci.yml

@@ -1,43 +1,62 @@
+version: "2"
+
 run:
   tests: true
 
 linters:
-  # Enable specific linter
+  # Enable specific linters
   # https://golangci-lint.run/usage/linters/#enabled-by-default
   enable:
-    - gofumpt
-    - gci
+    - misspell
     - testifylint
-    - errcheck
     - thelper
-
-linters-settings:
-  gci:
-    # Section configuration to compare against.
-    # Section names are case-insensitive and may contain parameters in ().
-    # The default order of sections is `standard > default > custom > blank > dot > alias > localmodule`,
-    # If `custom-order` is `true`, it follows the order of `sections` option.
-    # Default: ["standard", "default"]
-    sections:
-      - standard # Standard section: captures all standard packages.
-      - default # Default section: contains all imports that could not be matched to another section type.
-      - prefix(github.com/cosmos/cosmos-sdk) # Custom section: groups all imports with the specified Prefix.
-      - prefix(github.com/cosmos/ibc-go)
-      - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
-      - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
-      - alias # Alias section: contains all alias imports. This section is not present unless explicitly enabled.
-      - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
-    # Skip generated files.
-    # Default: true
-    skip-generated: false
-    # Enable custom order of sections.
-    # If `true`, make the section order the same as the order of `sections`.
-    # Default: false
-    custom-order: true
-    # Drops lexical ordering for custom sections.
-    # Default: false
-    no-lex-order: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      # Section configuration to compare against.
+      # Section names are case-insensitive and may contain parameters in ().
+      # The default order of sections is `standard > default > custom > blank > dot > alias > localmodule`,
+      # If `custom-order` is `true`, it follows the order of `sections` option.
+      # Default: ["standard", "default"]
+      sections:
+        - standard # Standard section: captures all standard packages.
+        - default # Default section: contains all imports that could not be matched to another section type.
+        - prefix(github.com/cosmos/cosmos-sdk) # Custom section: groups all imports with the specified Prefix.
+        - prefix(github.com/cosmos/ibc-go)
+        - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
+        - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
+        - alias # Alias section: contains all alias imports. This section is not present unless explicitly enabled.
+        - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
+      # Enable custom order of sections.
+      # If `true`, make the section order the same as the order of `sections`.
+      # Default: false
+      custom-order: true
+      # Drops lexical ordering for custom sections.
+      # Default: false
+      no-lex-order: true
+  exclusions:
+    # Skip generated files.
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -148,8 +148,7 @@ test-alpine: release-build-alpine create-tester-image
 
 .PHONY: format
 format:
-	find . -name '*.go' -type f | xargs gofumpt -w -s
-	find . -name '*.go' -type f | xargs misspell -w
+	find . -name '*.go' -type f | xargs gofumpt -w
 
 .PHONY: lint
 lint:

flake.lock

@@ -3,7 +3,7 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     rust-overlay = {
       inputs = {
         flake-utils.follows = "flake-utils";
@@ -13,16 +13,23 @@
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, rust-overlay } @ inputs:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      rust-overlay,
+    }@inputs:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs {
           inherit overlays system;
         };
       in
       {
-        formatter = pkgs.nixpkgs-fmt;
+        formatter = pkgs.nixfmt-rfc-style;
 
         devShells.default = pkgs.mkShell {
           buildInputs = with pkgs; [

flake.nix

@@ -302,7 +302,7 @@ func TestAnalyzeCode(t *testing.T) {
 	report, err := vm.AnalyzeCode(checksum)
 	require.NoError(t, err)
 	require.False(t, report.HasIBCEntryPoints)
-	require.Equal(t, "", report.RequiredCapabilities)
+	require.Empty(t, report.RequiredCapabilities)
 	require.Equal(t, uint64(42), *report.ContractMigrateVersion)
 
 	// Store IBC contract

ibc_test.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.go

@@ -117,7 +117,7 @@ func TestStoreIteratorHitsLimit(t *testing.T) {
 
 	iter, _ = store.Iterator(nil, nil)
 	_, err = storeIterator(callID, iter, limit)
-	require.ErrorContains(t, err, "Reached iterator limit (2)")
+	require.ErrorContains(t, err, "reached iterator limit (2)")
 
 	endCall(callID)
 }
@@ -192,7 +192,7 @@ func TestQueueIteratorSimple(t *testing.T) {
 	var qResult types.QueryResult
 	err = json.Unmarshal(data, &qResult)
 	require.NoError(t, err)
-	require.Equal(t, "", qResult.Err)
+	require.Empty(t, qResult.Err)
 	require.Equal(t, `{"sum":39}`, string(qResult.Ok))
 
 	// query reduce (multiple iterators at once)
@@ -202,7 +202,7 @@ func TestQueueIteratorSimple(t *testing.T) {
 	var reduced types.QueryResult
 	err = json.Unmarshal(data, &reduced)
 	require.NoError(t, err)
-	require.Equal(t, "", reduced.Err)
+	require.Empty(t, reduced.Err)
 	require.JSONEq(t, `{"counters":[[17,22],[22,0]]}`, string(reduced.Ok))
 }
 
@@ -231,7 +231,7 @@ func TestQueueIteratorRaces(t *testing.T) {
 		var reduced types.QueryResult
 		err = json.Unmarshal(data, &reduced)
 		require.NoError(t, err)
-		require.Equal(t, "", reduced.Err)
+		require.Empty(t, reduced.Err)
 		require.Equal(t, fmt.Sprintf(`{"counters":%s}`, expected), string(reduced.Ok))
 	}
 
@@ -283,7 +283,7 @@ func TestQueueIteratorLimit(t *testing.T) {
 	require.NoError(t, err)
 	err = json.Unmarshal(data, &qResult)
 	require.NoError(t, err)
-	require.Equal(t, "", qResult.Err)
+	require.Empty(t, qResult.Err)
 	require.Equal(t, `{}`, string(qResult.Ok))
 
 	// Open 35000 iterators
@@ -294,5 +294,5 @@ func TestQueueIteratorLimit(t *testing.T) {
 	query = []byte(`{"open_iterators":{"count":35000}}`)
 	env = MockEnvBin(t)
 	_, _, err = Query(cache, checksum, env, query, &igasMeter, store, api, &querier, gasLimit, TESTING_PRINT_DEBUG)
-	require.ErrorContains(t, err, "Reached iterator limit (32768)")
+	require.ErrorContains(t, err, "reached iterator limit (32768)")
 }