Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Go linting #479

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Improve Go linting #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3de4cb
Migrate away from deprecated io/ioutil
webmaster128 Nov 27, 2023
ed38a35
Update Go and golangci-lint for lint CI job
webmaster128 Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/lint-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: golangci-lint

# Long living branches and all PRs
on:
push:
branches:
- master
- main
pull_request:

Expand All @@ -19,15 +20,15 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21.4'
cache: false
- name: golangci-lint
uses: golangci/[email protected]
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.53
version: v1.55.2

# Optional: working directory, useful for monorepos
# working-directory: somedir
Expand Down
3 changes: 1 addition & 2 deletions cmd/demo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"fmt"
"io/ioutil"
"os"

wasmvm "github.com/CosmWasm/wasmvm"
Expand All @@ -29,7 +28,7 @@ func main() {
}

fmt.Printf("Running %s...\n", file)
bz, err := ioutil.ReadFile(file)
bz, err := os.ReadFile(file)
if err != nil {
panic(err)
}
Expand Down
8 changes: 4 additions & 4 deletions ibc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package cosmwasm

import (
"encoding/json"
"io/ioutil"
"os"
"testing"

"github.com/stretchr/testify/assert"
Expand All @@ -19,7 +19,7 @@ const IBC_TEST_CONTRACT = "./testdata/ibc_reflect.wasm"
func TestIBC(t *testing.T) {
vm := withVM(t)

wasm, err := ioutil.ReadFile(IBC_TEST_CONTRACT)
wasm, err := os.ReadFile(IBC_TEST_CONTRACT)
require.NoError(t, err)

checksum, err := vm.StoreCode(wasm)
Expand Down Expand Up @@ -293,7 +293,7 @@ func TestAnalyzeCode(t *testing.T) {
vm := withVM(t)

// Store non-IBC contract
wasm, err := ioutil.ReadFile(HACKATOM_TEST_CONTRACT)
wasm, err := os.ReadFile(HACKATOM_TEST_CONTRACT)
require.NoError(t, err)
checksum, err := vm.StoreCode(wasm)
require.NoError(t, err)
Expand All @@ -305,7 +305,7 @@ func TestAnalyzeCode(t *testing.T) {
require.Equal(t, "", report.RequiredCapabilities)

// Store IBC contract
wasm2, err := ioutil.ReadFile(IBC_TEST_CONTRACT)
wasm2, err := os.ReadFile(IBC_TEST_CONTRACT)
require.NoError(t, err)
checksum2, err := vm.StoreCode(wasm2)
require.NoError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions internal/api/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package api

import (
"encoding/json"
"io/ioutil"
"os"
"testing"

"github.com/stretchr/testify/require"
Expand All @@ -15,7 +15,7 @@ func TestValidateAddressFailure(t *testing.T) {
defer cleanup()

// create contract
wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)
checksum, err := StoreCode(cache, wasm)
require.NoError(t, err)
Expand Down
25 changes: 12 additions & 13 deletions internal/api/lib_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand All @@ -27,7 +26,7 @@ const (
)

func TestInitAndReleaseCache(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "wasmvm-testing")
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
require.NoError(t, err)
defer os.RemoveAll(tmpdir)

Expand All @@ -39,7 +38,7 @@ func TestInitAndReleaseCache(t *testing.T) {
// wasmd expects us to create the base directory
// https://github.com/CosmWasm/wasmd/blob/v0.30.0/x/wasm/keeper/keeper.go#L128
func TestInitCacheWorksForNonExistentDir(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "wasmvm-testing")
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
require.NoError(t, err)
defer os.RemoveAll(tmpdir)

Expand All @@ -59,7 +58,7 @@ func TestInitCacheErrorsForBrokenDir(t *testing.T) {
}

func TestInitCacheEmptyCapabilities(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "wasmvm-testing")
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
require.NoError(t, err)
defer os.RemoveAll(tmpdir)
cache, err := InitCache(tmpdir, "", TESTING_CACHE_SIZE, TESTING_MEMORY_LIMIT)
Expand All @@ -68,7 +67,7 @@ func TestInitCacheEmptyCapabilities(t *testing.T) {
}

func withCache(t *testing.T) (Cache, func()) {
tmpdir, err := ioutil.TempDir("", "wasmvm-testing")
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
require.NoError(t, err)
cache, err := InitCache(tmpdir, TESTING_CAPABILITIES, TESTING_CACHE_SIZE, TESTING_MEMORY_LIMIT)
require.NoError(t, err)
Expand All @@ -84,7 +83,7 @@ func TestStoreCodeAndGetCode(t *testing.T) {
cache, cleanup := withCache(t)
defer cleanup()

wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)

checksum, err := StoreCode(cache, wasm)
Expand All @@ -101,7 +100,7 @@ func TestRemoveCode(t *testing.T) {
cache, cleanup := withCache(t)
defer cleanup()

wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)

checksum, err := StoreCode(cache, wasm)
Expand Down Expand Up @@ -129,7 +128,7 @@ func TestStoreCodeUnchecked(t *testing.T) {
cache, cleanup := withCache(t)
defer cleanup()

wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)

checksum, err := StoreCodeUnchecked(cache, wasm)
Expand All @@ -146,7 +145,7 @@ func TestPin(t *testing.T) {
cache, cleanup := withCache(t)
defer cleanup()

wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)

checksum, err := StoreCode(cache, wasm)
Expand Down Expand Up @@ -189,7 +188,7 @@ func TestUnpin(t *testing.T) {
cache, cleanup := withCache(t)
defer cleanup()

wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)

checksum, err := StoreCode(cache, wasm)
Expand Down Expand Up @@ -234,7 +233,7 @@ func TestGetMetrics(t *testing.T) {
assert.Equal(t, &types.Metrics{}, metrics)

// Store contract
wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)
checksum, err := StoreCode(cache, wasm)
require.NoError(t, err)
Expand Down Expand Up @@ -345,7 +344,7 @@ func TestInstantiate(t *testing.T) {
defer cleanup()

// create contract
wasm, err := ioutil.ReadFile("../../testdata/hackatom.wasm")
wasm, err := os.ReadFile("../../testdata/hackatom.wasm")
require.NoError(t, err)
checksum, err := StoreCode(cache, wasm)
require.NoError(t, err)
Expand Down Expand Up @@ -914,7 +913,7 @@ func createFloaty2(t *testing.T, cache Cache) []byte {
}

func createContract(t *testing.T, cache Cache, wasmFile string) []byte {
wasm, err := ioutil.ReadFile(wasmFile)
wasm, err := os.ReadFile(wasmFile)
require.NoError(t, err)
checksum, err := StoreCode(cache, wasm)
require.NoError(t, err)
Expand Down
13 changes: 6 additions & 7 deletions lib_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package cosmwasm

import (
"encoding/json"
"io/ioutil"
"os"
"testing"

Expand All @@ -29,7 +28,7 @@ const (
)

func withVM(t *testing.T) *VM {
tmpdir, err := ioutil.TempDir("", "wasmvm-testing")
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
require.NoError(t, err)
vm, err := NewVM(tmpdir, TESTING_CAPABILITIES, TESTING_MEMORY_LIMIT, TESTING_PRINT_DEBUG, TESTING_CACHE_SIZE)
require.NoError(t, err)
Expand All @@ -42,7 +41,7 @@ func withVM(t *testing.T) *VM {
}

func createTestContract(t *testing.T, vm *VM, path string) Checksum {
wasm, err := ioutil.ReadFile(path)
wasm, err := os.ReadFile(path)
require.NoError(t, err)
checksum, err := vm.StoreCode(wasm)
require.NoError(t, err)
Expand All @@ -54,15 +53,15 @@ func TestStoreCode(t *testing.T) {

// Valid hackatom contract
{
wasm, err := ioutil.ReadFile(HACKATOM_TEST_CONTRACT)
wasm, err := os.ReadFile(HACKATOM_TEST_CONTRACT)
require.NoError(t, err)
_, err = vm.StoreCode(wasm)
require.NoError(t, err)
}

// Valid cyberpunk contract
{
wasm, err := ioutil.ReadFile(CYBERPUNK_TEST_CONTRACT)
wasm, err := os.ReadFile(CYBERPUNK_TEST_CONTRACT)
require.NoError(t, err)
_, err = vm.StoreCode(wasm)
require.NoError(t, err)
Expand Down Expand Up @@ -103,7 +102,7 @@ func TestStoreCode(t *testing.T) {
func TestStoreCodeAndGet(t *testing.T) {
vm := withVM(t)

wasm, err := ioutil.ReadFile(HACKATOM_TEST_CONTRACT)
wasm, err := os.ReadFile(HACKATOM_TEST_CONTRACT)
require.NoError(t, err)

checksum, err := vm.StoreCode(wasm)
Expand All @@ -117,7 +116,7 @@ func TestStoreCodeAndGet(t *testing.T) {
func TestRemoveCode(t *testing.T) {
vm := withVM(t)

wasm, err := ioutil.ReadFile(HACKATOM_TEST_CONTRACT)
wasm, err := os.ReadFile(HACKATOM_TEST_CONTRACT)
require.NoError(t, err)

checksum, err := vm.StoreCode(wasm)
Expand Down