From 73daafbfdd943cb95284a11b92a863282d8ec41c Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Mon, 15 Nov 2021 21:05:28 +0800 Subject: [PATCH] chore(ioutil): move from io/ioutil to io and os packages (#2030) * refactor: move from io/ioutil to io and os packages The io/ioutil package has been deprecated as of Go 1.16, see https://golang.org/doc/go1.16#ioutil. This commit replaces the existing io/ioutil functions with their new definitions in io and os packages. Signed-off-by: Eng Zer Jun * ci: use Go 1.17 for check-description Signed-off-by: Eng Zer Jun * refactor(test): use t.tempDir() for auto cleanup Signed-off-by: Eng Zer Jun --- .github/workflows/checks.yml | 3 +++ cmd/gossamer/import_runtime.go | 4 ++-- cmd/gossamer/import_runtime_test.go | 5 ++--- cmd/gossamer/main_test.go | 10 +++------- cmd/gossamer/utils.go | 3 +-- dot/build_spec_test.go | 6 +++--- dot/core/service_test.go | 7 +++---- dot/core/test_helpers.go | 7 +++---- dot/digest/digest_test.go | 6 ++---- dot/import.go | 6 +++--- dot/import_test.go | 13 ++++++------- dot/network/utils.go | 3 +-- dot/rpc/http_test.go | 3 +-- dot/rpc/modules/chain_test.go | 6 ++---- dot/rpc/modules/state_test.go | 4 ++-- dot/rpc/modules/sync_state_test.go | 4 ++-- dot/rpc/subscription/listeners_test.go | 4 ++-- dot/rpc/subscription/websocket.go | 4 ++-- dot/state/service_test.go | 7 +++---- dot/state/storage_notify_test.go | 16 ++-------------- dot/state/test_helpers.go | 4 +--- dot/sync/syncer_test.go | 3 +-- dot/utils.go | 11 +++++------ lib/babe/babe_test.go | 8 +++----- lib/babe/verify_test.go | 6 ++---- lib/genesis/helpers.go | 6 +++--- lib/genesis/helpers_test.go | 5 ++--- lib/genesis/test_utils.go | 4 ++-- lib/grandpa/grandpa_test.go | 4 +--- lib/keystore/encrypt.go | 3 +-- lib/keystore/helpers.go | 5 ++--- lib/keystore/helpers_test.go | 15 +++++++-------- lib/runtime/life/instance.go | 4 ++-- lib/runtime/test_helpers.go | 9 ++++----- lib/runtime/wasmer/exports_test.go | 4 ++-- lib/runtime/wasmer/imports_test.go | 6 +----- lib/runtime/wasmer/instance_test.go | 4 ++-- lib/trie/database_test.go | 4 +--- lib/trie/proof_test.go | 7 ++----- lib/trie/trie_test.go | 8 +++----- lib/utils/utils.go | 3 +-- pkg/scale/decode.go | 5 ++--- tests/utils/framework.go | 4 ++-- tests/utils/gossamer_utils.go | 5 ++--- tests/utils/request_utils.go | 4 ++-- 45 files changed, 104 insertions(+), 158 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 151abf4c12..78d5f0ace8 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -34,6 +34,9 @@ jobs: if: ${{ github.actor != 'dependabot[bot]' }} runs-on: ubuntu-latest steps: + - uses: actions/setup-go@v2 + with: + go-version: "1.17.x" - uses: actions/checkout@v2 - name: Checks PR has title and body description run: | diff --git a/cmd/gossamer/import_runtime.go b/cmd/gossamer/import_runtime.go index 7b6bd131e4..5e4619a7d3 100644 --- a/cmd/gossamer/import_runtime.go +++ b/cmd/gossamer/import_runtime.go @@ -6,7 +6,7 @@ package main import ( "encoding/json" "fmt" - "io/ioutil" + "os" "path/filepath" "github.com/ChainSafe/gossamer/lib/genesis" @@ -15,7 +15,7 @@ import ( var defaultGenesisSpecPath = "./chain/gssmr/genesis-spec.json" func createGenesisWithRuntime(fp string) (string, error) { - runtime, err := ioutil.ReadFile(filepath.Clean(fp)) + runtime, err := os.ReadFile(filepath.Clean(fp)) if err != nil { return "", err } diff --git a/cmd/gossamer/import_runtime_test.go b/cmd/gossamer/import_runtime_test.go index bf39997c7e..083b5c5abe 100644 --- a/cmd/gossamer/import_runtime_test.go +++ b/cmd/gossamer/import_runtime_test.go @@ -5,7 +5,6 @@ package main import ( "encoding/json" - "io/ioutil" "os" "testing" @@ -20,11 +19,11 @@ func TestCreateGenesisWithRuntime(t *testing.T) { testCode := []byte("somecode") testHex := common.BytesToHex(testCode) - testFile, err := ioutil.TempFile("", "testcode-*.wasm") + testFile, err := os.CreateTemp("", "testcode-*.wasm") require.NoError(t, err) defer os.Remove(testFile.Name()) - err = ioutil.WriteFile(testFile.Name(), testCode, 0777) + err = os.WriteFile(testFile.Name(), testCode, 0777) require.NoError(t, err) out, err := createGenesisWithRuntime(testFile.Name()) diff --git a/cmd/gossamer/main_test.go b/cmd/gossamer/main_test.go index 4663f5db18..56144f76cf 100644 --- a/cmd/gossamer/main_test.go +++ b/cmd/gossamer/main_test.go @@ -8,7 +8,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "os/exec" "sync" @@ -91,7 +90,7 @@ func (tt *TestExecCommand) Run(name string, args ...string) { func (tt *TestExecCommand) ExpectExit() { var output []byte tt.withKillTimeout(func() { - output, _ = ioutil.ReadAll(tt.stdout) + output, _ = io.ReadAll(tt.stdout) }) tt.WaitExit() if tt.Cleanup != nil { @@ -104,7 +103,7 @@ func (tt *TestExecCommand) ExpectExit() { func (tt *TestExecCommand) GetOutput() (stdout []byte, stderr []byte) { tt.withSigTimeout(func() { - stdout, _ = ioutil.ReadAll(tt.stdout) + stdout, _ = io.ReadAll(tt.stdout) stderr = tt.stderr.buf.Bytes() }) tt.WaitExit() @@ -220,8 +219,7 @@ func TestInvalidCommand(t *testing.T) { func TestInitCommand_RenameNodeWhenCalled(t *testing.T) { genesisPath := utils.GetGssmrGenesisRawPath() - tempDir, err := ioutil.TempDir("", "gossamer-maintest-") - require.Nil(t, err) + tempDir := t.TempDir() nodeName := dot.RandomNodeName() init := runTestGossamer(t, @@ -234,7 +232,6 @@ func TestInitCommand_RenameNodeWhenCalled(t *testing.T) { ) stdout, stderr := init.GetOutput() - require.Nil(t, err) t.Log("init gossamer output, ", "stdout", string(stdout), "stderr", string(stderr)) @@ -250,7 +247,6 @@ func TestInitCommand_RenameNodeWhenCalled(t *testing.T) { ) stdout, stderr = init.GetOutput() - require.Nil(t, err) t.Log("init gossamer output, ", "stdout", string(stdout), "stderr", string(stderr)) diff --git a/cmd/gossamer/utils.go b/cmd/gossamer/utils.go index 970eb38820..5c4ee2c174 100644 --- a/cmd/gossamer/utils.go +++ b/cmd/gossamer/utils.go @@ -6,7 +6,6 @@ package main import ( "bufio" "fmt" - "io/ioutil" "os" "strconv" "strings" @@ -110,7 +109,7 @@ func newTestConfig(t *testing.T) *dot.Config { func newTestConfigWithFile(t *testing.T) (*dot.Config, *os.File) { cfg := newTestConfig(t) - file, err := ioutil.TempFile(cfg.Global.BasePath, "config-") + file, err := os.CreateTemp(cfg.Global.BasePath, "config-") require.NoError(t, err) tomlCfg := dotConfigToToml(cfg) diff --git a/dot/build_spec_test.go b/dot/build_spec_test.go index 55ea1e74b4..b00683ccea 100644 --- a/dot/build_spec_test.go +++ b/dot/build_spec_test.go @@ -6,7 +6,7 @@ package dot import ( "encoding/json" "fmt" - "io/ioutil" + "io" "os" "testing" @@ -62,7 +62,7 @@ func TestBuildFromGenesis_WhenGenesisDoesNotExists(t *testing.T) { } func TestWriteGenesisSpecFileWhenFileAlreadyExists(t *testing.T) { - f, err := ioutil.TempFile("", "existing file data") + f, err := os.CreateTemp("", "existing file data") require.NoError(t, err) defer os.Remove(f.Name()) @@ -105,7 +105,7 @@ func TestWriteGenesisSpecFile(t *testing.T) { require.NoError(t, err) defer file.Close() - genesisBytes, err := ioutil.ReadAll(file) + genesisBytes, err := io.ReadAll(file) require.NoError(t, err) gen := new(genesis.Genesis) diff --git a/dot/core/service_test.go b/dot/core/service_test.go index 8f7aca63da..c35b7c81c4 100644 --- a/dot/core/service_test.go +++ b/dot/core/service_test.go @@ -6,7 +6,6 @@ package core import ( "errors" "fmt" - "io/ioutil" "math/big" "os" "sort" @@ -549,7 +548,7 @@ func TestService_HandleRuntimeChanges(t *testing.T) { err = s.blockState.HandleRuntimeChanges(ts, parentRt, bhash1) require.NoError(t, err) - testRuntime, err := ioutil.ReadFile(updateNodeRuntimeWasmPath) + testRuntime, err := os.ReadFile(updateNodeRuntimeWasmPath) require.NoError(t, err) ts.Set(common.CodeKey, testRuntime) @@ -578,7 +577,7 @@ func TestService_HandleRuntimeChanges(t *testing.T) { func TestService_HandleCodeSubstitutes(t *testing.T) { s := NewTestService(t, nil) - testRuntime, err := ioutil.ReadFile(runtime.POLKADOT_RUNTIME_FP) + testRuntime, err := os.ReadFile(runtime.POLKADOT_RUNTIME_FP) require.NoError(t, err) blockHash := common.MustHexToHash("0x86aa36a140dfc449c30dbce16ce0fea33d5c3786766baa764e33f336841b9e29") // hash for known test code substitution @@ -626,7 +625,7 @@ func TestService_HandleRuntimeChangesAfterCodeSubstitutes(t *testing.T) { require.NoError(t, err) require.Equal(t, codeHashBefore, parentRt.GetCodeHash()) // codeHash should remain unchanged after code substitute - testRuntime, err := ioutil.ReadFile(runtime.POLKADOT_RUNTIME_FP) + testRuntime, err := os.ReadFile(runtime.POLKADOT_RUNTIME_FP) require.NoError(t, err) ts, err = s.storageState.TrieState(nil) diff --git a/dot/core/test_helpers.go b/dot/core/test_helpers.go index 917dd732d6..e7272e57d5 100644 --- a/dot/core/test_helpers.go +++ b/dot/core/test_helpers.go @@ -4,7 +4,6 @@ package core import ( - "io/ioutil" "path/filepath" "testing" @@ -45,8 +44,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service { cfg.LogLvl = 3 var stateSrvc *state.Service - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() gen, genTrie, genHeader := genesis.NewTestGenesisWithTrieAndHeader(t) @@ -58,7 +56,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service { stateSrvc = state.NewService(config) stateSrvc.UseMemDB() - err = stateSrvc.Initialise(gen, genHeader, genTrie) + err := stateSrvc.Initialise(gen, genHeader, genTrie) require.Nil(t, err) err = stateSrvc.Start() @@ -88,6 +86,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service { if cfg.Runtime == nil { rtCfg := &wasmer.Config{} + var err error rtCfg.Storage, err = rtstorage.NewTrieState(genTrie) require.NoError(t, err) diff --git a/dot/digest/digest_test.go b/dot/digest/digest_test.go index 9c7191730f..c41566e3ee 100644 --- a/dot/digest/digest_test.go +++ b/dot/digest/digest_test.go @@ -4,7 +4,6 @@ package digest import ( - "io/ioutil" "math/big" "testing" "time" @@ -23,8 +22,7 @@ import ( ) func newTestHandler(t *testing.T) *Handler { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() config := state.Config{ Path: testDatadirPath, @@ -34,7 +32,7 @@ func newTestHandler(t *testing.T) *Handler { stateSrvc.UseMemDB() gen, genTrie, genHeader := genesis.NewTestGenesisWithTrieAndHeader(t) - err = stateSrvc.Initialise(gen, genHeader, genTrie) + err := stateSrvc.Initialise(gen, genHeader, genTrie) require.NoError(t, err) err = stateSrvc.Start() diff --git a/dot/import.go b/dot/import.go index 6c34c0461f..7cbc7c7bd1 100644 --- a/dot/import.go +++ b/dot/import.go @@ -6,7 +6,7 @@ package dot import ( "encoding/json" "errors" - "io/ioutil" + "os" "path/filepath" "github.com/ChainSafe/gossamer/dot/state" @@ -41,7 +41,7 @@ func ImportState(basepath, stateFP, headerFP string, firstSlot uint64) error { } func newTrieFromPairs(filename string) (*trie.Trie, error) { - data, err := ioutil.ReadFile(filepath.Clean(filename)) + data, err := os.ReadFile(filepath.Clean(filename)) if err != nil { return nil, err } @@ -71,7 +71,7 @@ func newTrieFromPairs(filename string) (*trie.Trie, error) { } func newHeaderFromFile(filename string) (*types.Header, error) { - data, err := ioutil.ReadFile(filepath.Clean(filename)) + data, err := os.ReadFile(filepath.Clean(filename)) if err != nil { return nil, err } diff --git a/dot/import_test.go b/dot/import_test.go index eab5181b22..ab6afa29d1 100644 --- a/dot/import_test.go +++ b/dot/import_test.go @@ -5,8 +5,8 @@ package dot import ( "encoding/json" - "io/ioutil" "math/big" + "os" "testing" "github.com/ChainSafe/gossamer/dot/types" @@ -20,7 +20,7 @@ import ( func setupStateFile(t *testing.T) string { filename := "../lib/runtime/test_data/kusama/block1482002.out" - data, err := ioutil.ReadFile(filename) + data, err := os.ReadFile(filename) require.NoError(t, err) rpcPairs := make(map[string]interface{}) @@ -32,7 +32,7 @@ func setupStateFile(t *testing.T) string { require.NoError(t, err) fp := "./test_data/state.json" - err = ioutil.WriteFile(fp, bz, 0777) + err = os.WriteFile(fp, bz, 0777) require.NoError(t, err) return fp @@ -41,7 +41,7 @@ func setupStateFile(t *testing.T) string { func setupHeaderFile(t *testing.T) string { headerStr := "{\"digest\":{\"logs\":[\"0x0642414245b501013c0000009659bd0f0000000070edad1c9064fff78cb18435223d8adaf5ea04c24b1a8766e3dc01eb03cc6a0c11b79793d4e31cc0990838229c44fed1669a7c7c79e1e6d0a96374d6496728069d1ef739e290497a0e3b728fa88fcbdd3a5504e0efde0242e7a806dd4fa9260c\",\"0x054241424501019e7f28dddcf27c1e6b328d5694c368d5b2ec5dbe0e412ae1c98f88d53be4d8502fac571f3f19c9caaf281a673319241e0c5095a683ad34316204088a36a4bd86\"]},\"extrinsicsRoot\":\"0xda26dc8c1455f8f81cae12e4fc59e23ce961b2c837f6d3f664283af906d344e0\",\"number\":\"0x169d12\",\"parentHash\":\"0x3b45c9c22dcece75a30acc9c2968cb311e6b0557350f83b430f47559db786975\",\"stateRoot\":\"0x09f9ca28df0560c2291aa16b56e15e07d1e1927088f51356d522722aa90ca7cb\"}" fp := "./test_data/header.json" - err := ioutil.WriteFile(fp, []byte(headerStr), 0777) + err := os.WriteFile(fp, []byte(headerStr), 0777) require.NoError(t, err) return fp } @@ -78,8 +78,7 @@ func TestNewHeaderFromFile(t *testing.T) { } func TestImportState(t *testing.T) { - basepath, err := ioutil.TempDir("", "gossamer-test-*") - require.NoError(t, err) + basepath := t.TempDir() cfg := NewTestConfig(t) require.NotNil(t, cfg) @@ -92,7 +91,7 @@ func TestImportState(t *testing.T) { cfg.Init.Genesis = genFile.Name() cfg.Global.BasePath = basepath - err = InitNode(cfg) + err := InitNode(cfg) require.NoError(t, err) stateFP := setupStateFile(t) diff --git a/dot/network/utils.go b/dot/network/utils.go index 545159e935..ceff586422 100644 --- a/dot/network/utils.go +++ b/dot/network/utils.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" mrand "math/rand" "os" "path" @@ -78,7 +77,7 @@ func loadKey(fp string) (crypto.PrivKey, error) { if _, err := os.Stat(pth); os.IsNotExist(err) { return nil, nil } - keyData, err := ioutil.ReadFile(filepath.Clean(pth)) + keyData, err := os.ReadFile(filepath.Clean(pth)) if err != nil { return nil, err } diff --git a/dot/rpc/http_test.go b/dot/rpc/http_test.go index 9fb8d9afde..df85d0b558 100644 --- a/dot/rpc/http_test.go +++ b/dot/rpc/http_test.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net" "net/http" "testing" @@ -279,7 +278,7 @@ func PostRequest(t *testing.T, url string, data io.Reader) (int, []byte) { defer res.Body.Close() - resBody, err := ioutil.ReadAll(res.Body) + resBody, err := io.ReadAll(res.Body) require.NoError(t, err) responseData := new(bytes.Buffer) diff --git a/dot/rpc/modules/chain_test.go b/dot/rpc/modules/chain_test.go index a3cd7b7b82..77aa4fcc6c 100644 --- a/dot/rpc/modules/chain_test.go +++ b/dot/rpc/modules/chain_test.go @@ -4,7 +4,6 @@ package modules import ( - "io/ioutil" "math/big" "path/filepath" "testing" @@ -338,8 +337,7 @@ func TestChainGetFinalizedHeadByRound(t *testing.T) { } func newTestStateService(t *testing.T) *state.Service { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() config := state.Config{ Path: testDatadirPath, @@ -350,7 +348,7 @@ func newTestStateService(t *testing.T) *state.Service { gen, genTrie, genesisHeader := genesis.NewTestGenesisWithTrieAndHeader(t) - err = stateSrvc.Initialise(gen, genesisHeader, genTrie) + err := stateSrvc.Initialise(gen, genesisHeader, genTrie) require.NoError(t, err) err = stateSrvc.Start() diff --git a/dot/rpc/modules/state_test.go b/dot/rpc/modules/state_test.go index e71a94102c..617faae511 100644 --- a/dot/rpc/modules/state_test.go +++ b/dot/rpc/modules/state_test.go @@ -7,8 +7,8 @@ import ( "encoding/hex" "errors" "fmt" - "io/ioutil" "math/big" + "os" "sort" "strings" "testing" @@ -367,7 +367,7 @@ func TestStateModule_GetMetadata(t *testing.T) { randomHash, err := common.HexToHash(RandomHash) require.NoError(t, err) - expectedMetadata, err := ioutil.ReadFile("./test_data/expected_metadata") + expectedMetadata, err := os.ReadFile("./test_data/expected_metadata") require.NoError(t, err) testCases := []struct { diff --git a/dot/rpc/modules/sync_state_test.go b/dot/rpc/modules/sync_state_test.go index 1cfa6ffd75..5b4827724f 100644 --- a/dot/rpc/modules/sync_state_test.go +++ b/dot/rpc/modules/sync_state_test.go @@ -5,7 +5,7 @@ package modules import ( "encoding/json" - "io/ioutil" + "os" "path/filepath" "testing" @@ -19,7 +19,7 @@ func TestSyncStateModule(t *testing.T) { fp, err := filepath.Abs(GssmrGenesisPath) require.NoError(t, err) - data, err := ioutil.ReadFile(filepath.Clean(fp)) + data, err := os.ReadFile(filepath.Clean(fp)) require.NoError(t, err) g := new(genesis.Genesis) diff --git a/dot/rpc/subscription/listeners_test.go b/dot/rpc/subscription/listeners_test.go index 995170e835..9652532cab 100644 --- a/dot/rpc/subscription/listeners_test.go +++ b/dot/rpc/subscription/listeners_test.go @@ -6,11 +6,11 @@ package subscription import ( "encoding/json" "fmt" - "io/ioutil" "log" "math/big" "net/http" "net/http/httptest" + "os" "path/filepath" "strings" "testing" @@ -355,7 +355,7 @@ func TestRuntimeChannelListener_Listen(t *testing.T) { require.NoError(t, err) fp, err := filepath.Abs(runtime.POLKADOT_RUNTIME_FP) require.NoError(t, err) - code, err := ioutil.ReadFile(fp) + code, err := os.ReadFile(fp) require.NoError(t, err) version, err := instance.CheckRuntimeVersion(code) require.NoError(t, err) diff --git a/dot/rpc/subscription/websocket.go b/dot/rpc/subscription/websocket.go index bd8914fcbb..0366db417b 100644 --- a/dot/rpc/subscription/websocket.go +++ b/dot/rpc/subscription/websocket.go @@ -8,7 +8,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "math/big" "net/http" "strings" @@ -424,7 +424,7 @@ func (c *WSConn) executeRequest(r *http.Request, d interface{}) error { return err } - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) if err != nil { logger.Warnf("error reading response body: %s", err) return err diff --git a/dot/state/service_test.go b/dot/state/service_test.go index 93167a57d6..617653114e 100644 --- a/dot/state/service_test.go +++ b/dot/state/service_test.go @@ -6,7 +6,6 @@ package state import ( "context" "fmt" - "io/ioutil" "math/big" "testing" "time" @@ -37,8 +36,8 @@ func newTestService(t *testing.T) (state *Service) { return state } -func newTestMemDBService() *Service { - testDatadirPath, _ := ioutil.TempDir("/tmp", "test-datadir-*") +func newTestMemDBService(t *testing.T) *Service { + testDatadirPath := t.TempDir() config := Config{ Path: testDatadirPath, LogLevel: log.Info, @@ -86,7 +85,7 @@ func TestService_Initialise(t *testing.T) { } func TestMemDB_Start(t *testing.T) { - state := newTestMemDBService() + state := newTestMemDBService(t) genData, genTrie, genesisHeader := genesis.NewTestGenesisWithTrieAndHeader(t) err := state.Initialise(genData, genesisHeader, genTrie) diff --git a/dot/state/storage_notify_test.go b/dot/state/storage_notify_test.go index 85721f63eb..25c03ad006 100644 --- a/dot/state/storage_notify_test.go +++ b/dot/state/storage_notify_test.go @@ -6,9 +6,7 @@ package state import ( "context" "fmt" - "io/ioutil" "log" - "os" "sync" "testing" "time" @@ -173,16 +171,6 @@ func Test_Example(t *testing.T) { bValue := []byte("b-value") // Open the DB. - dir, err := ioutil.TempDir("", "badger-test") - if err != nil { - log.Fatal(err) - } - defer func() { - if err = os.RemoveAll(dir); err != nil { - log.Fatal(err) - } - }() - db := NewInMemoryDB(t) // Create the context here so we can cancel it after sending the writes. @@ -200,14 +188,14 @@ func Test_Example(t *testing.T) { } return nil } - if err = db.Subscribe(ctx, cb, prefix); err != nil && err != context.Canceled { + if err := db.Subscribe(ctx, cb, prefix); err != nil && err != context.Canceled { log.Fatal(err) } log.Printf("subscription closed") }() // Write both keys, but only one should be printed in the Output. - err = db.Put(aKey, aValue) + err := db.Put(aKey, aValue) if err != nil { log.Fatal(err) } diff --git a/dot/state/test_helpers.go b/dot/state/test_helpers.go index fff4023f56..538df92bd9 100644 --- a/dot/state/test_helpers.go +++ b/dot/state/test_helpers.go @@ -6,7 +6,6 @@ package state import ( "crypto/rand" "fmt" - "io/ioutil" "math/big" "testing" "time" @@ -25,8 +24,7 @@ var inc, _ = time.ParseDuration("1s") // NewInMemoryDB creates a new in-memory database func NewInMemoryDB(t *testing.T) chaindb.Database { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() db, err := utils.SetupDatabase(testDatadirPath, true) require.NoError(t, err) diff --git a/dot/sync/syncer_test.go b/dot/sync/syncer_test.go index 5834901af7..185dafbf60 100644 --- a/dot/sync/syncer_test.go +++ b/dot/sync/syncer_test.go @@ -4,7 +4,6 @@ package sync import ( - "io/ioutil" "math/big" "os" "path/filepath" @@ -65,7 +64,7 @@ func newTestSyncer(t *testing.T) *Service { wasmer.DefaultTestLogLvl = 3 cfg := &Config{} - testDatadirPath, _ := ioutil.TempDir("/tmp", "test-datadir-*") + testDatadirPath := t.TempDir() scfg := state.Config{ Path: testDatadirPath, diff --git a/dot/utils.go b/dot/utils.go index 750c369429..efd3801803 100644 --- a/dot/utils.go +++ b/dot/utils.go @@ -8,7 +8,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -45,7 +44,7 @@ func NewTestGenesis(t *testing.T) *genesis.Genesis { func NewTestGenesisRawFile(t *testing.T, cfg *Config) *os.File { dir := utils.NewTestDir(t) - file, err := ioutil.TempFile(dir, "genesis-") + file, err := os.CreateTemp(dir, "genesis-") require.Nil(t, err) fp := utils.GetGssmrGenesisRawPath() @@ -74,7 +73,7 @@ func NewTestGenesisRawFile(t *testing.T, cfg *Config) *os.File { func NewTestGenesisFile(t *testing.T, cfg *Config) *os.File { dir := utils.NewTestDir(t) - file, err := ioutil.TempFile(dir, "genesis-") + file, err := os.CreateTemp(dir, "genesis-") require.Nil(t, err) fp := utils.GetGssmrGenesisPath() @@ -107,7 +106,7 @@ func NewTestGenesisAndRuntime(t *testing.T) string { _ = wasmer.NewTestInstance(t, runtime.NODE_RUNTIME) runtimeFilePath := runtime.GetAbsolutePath(runtime.NODE_RUNTIME_FP) - runtimeData, err := ioutil.ReadFile(filepath.Clean(runtimeFilePath)) + runtimeData, err := os.ReadFile(filepath.Clean(runtimeFilePath)) require.Nil(t, err) gen := NewTestGenesis(t) @@ -120,7 +119,7 @@ func NewTestGenesisAndRuntime(t *testing.T) string { gen.Genesis.Raw["top"]["0x3a636f6465"] = "0x" + hex gen.Genesis.Raw["top"]["0xcf722c0832b5231d35e29f319ff27389f5032bfc7bfc3ba5ed7839f2042fb99f"] = "0x0000000000000001" - genFile, err := ioutil.TempFile(dir, "genesis-") + genFile, err := os.CreateTemp(dir, "genesis-") require.Nil(t, err) genData, err := json.Marshal(gen) @@ -158,7 +157,7 @@ func NewTestConfig(t *testing.T) *Config { func NewTestConfigWithFile(t *testing.T) (*Config, *os.File) { cfg := NewTestConfig(t) - file, err := ioutil.TempFile(cfg.Global.BasePath, "config-") + file, err := os.CreateTemp(cfg.Global.BasePath, "config-") require.NoError(t, err) cfgFile := ExportConfig(cfg, file.Name()) diff --git a/lib/babe/babe_test.go b/lib/babe/babe_test.go index 0f26100003..368f1e8682 100644 --- a/lib/babe/babe_test.go +++ b/lib/babe/babe_test.go @@ -5,7 +5,6 @@ package babe import ( "fmt" - "io/ioutil" "math/big" "os" "path/filepath" @@ -91,7 +90,7 @@ func createTestService(t *testing.T, cfg *ServiceConfig) *Service { cfg.TransactionState = state.NewTransactionState() } - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") //nolint + testDatadirPath := t.TempDir() require.NoError(t, err) var dbSrv *state.Service @@ -167,8 +166,7 @@ func TestMain(m *testing.M) { } func newTestServiceSetupParameters(t *testing.T) (*Service, *state.EpochState, *types.BabeConfiguration) { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() config := state.Config{ Path: testDatadirPath, @@ -178,7 +176,7 @@ func newTestServiceSetupParameters(t *testing.T) (*Service, *state.EpochState, * dbSrv.UseMemDB() gen, genTrie, genHeader := genesis.NewTestGenesisWithTrieAndHeader(t) - err = dbSrv.Initialise(gen, genHeader, genTrie) + err := dbSrv.Initialise(gen, genHeader, genTrie) require.NoError(t, err) err = dbSrv.Start() diff --git a/lib/babe/verify_test.go b/lib/babe/verify_test.go index f4b34059eb..396557f7ea 100644 --- a/lib/babe/verify_test.go +++ b/lib/babe/verify_test.go @@ -5,7 +5,6 @@ package babe import ( "errors" - "io/ioutil" "math/big" "testing" "time" @@ -21,8 +20,7 @@ import ( ) func newTestVerificationManager(t *testing.T, genCfg *types.BabeConfiguration) *VerificationManager { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() config := state.Config{ Path: testDatadirPath, @@ -36,7 +34,7 @@ func newTestVerificationManager(t *testing.T, genCfg *types.BabeConfiguration) * } gen, genTrie, genHeader := genesis.NewDevGenesisWithTrieAndHeader(t) - err = dbSrv.Initialise(gen, genHeader, genTrie) + err := dbSrv.Initialise(gen, genHeader, genTrie) require.NoError(t, err) err = dbSrv.Start() diff --git a/lib/genesis/helpers.go b/lib/genesis/helpers.go index c7a9e42e42..c3b7ef3fbe 100644 --- a/lib/genesis/helpers.go +++ b/lib/genesis/helpers.go @@ -8,9 +8,9 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "log" "math/big" + "os" "path/filepath" "reflect" @@ -49,7 +49,7 @@ func NewGenesisFromJSONRaw(file string) (*Genesis, error) { if err != nil { return nil, err } - data, err := ioutil.ReadFile(filepath.Clean(fp)) + data, err := os.ReadFile(filepath.Clean(fp)) if err != nil { return nil, err } @@ -140,7 +140,7 @@ func NewGenesisSpecFromJSON(file string) (*Genesis, error) { return nil, err } - data, err := ioutil.ReadFile(filepath.Clean(fp)) + data, err := os.ReadFile(filepath.Clean(fp)) if err != nil { return nil, err } diff --git a/lib/genesis/helpers_test.go b/lib/genesis/helpers_test.go index 3df9f4e33a..2ffdb893d9 100644 --- a/lib/genesis/helpers_test.go +++ b/lib/genesis/helpers_test.go @@ -6,7 +6,6 @@ package genesis import ( "encoding/json" "fmt" - "io/ioutil" "os" "testing" @@ -18,7 +17,7 @@ import ( func TestNewGenesisRawFromJSON(t *testing.T) { // Create temp file - file, err := ioutil.TempFile("", "genesis-test") + file, err := os.CreateTemp("", "genesis-test") if err != nil { t.Fatal(err) } @@ -86,7 +85,7 @@ func TestNewGenesisFromJSON(t *testing.T) { } // Create temp file - file, err := ioutil.TempFile("", "genesis_hr-test") + file, err := os.CreateTemp("", "genesis_hr-test") require.NoError(t, err) defer os.Remove(file.Name()) diff --git a/lib/genesis/test_utils.go b/lib/genesis/test_utils.go index 6e1072ab4f..d85dd6fad3 100644 --- a/lib/genesis/test_utils.go +++ b/lib/genesis/test_utils.go @@ -5,8 +5,8 @@ package genesis import ( "encoding/json" - "io/ioutil" "math/big" + "os" "testing" "github.com/ChainSafe/gossamer/dot/types" @@ -65,7 +65,7 @@ var TestFieldsRaw = Fields{ // CreateTestGenesisJSONFile utility to create mock test genesis JSON file func CreateTestGenesisJSONFile(asRaw bool) (string, error) { // Create temp file - file, err := ioutil.TempFile("", "genesis-test") + file, err := os.CreateTemp("", "genesis-test") if err != nil { return "", err } diff --git a/lib/grandpa/grandpa_test.go b/lib/grandpa/grandpa_test.go index cd1bf2aa6c..38fc4bac10 100644 --- a/lib/grandpa/grandpa_test.go +++ b/lib/grandpa/grandpa_test.go @@ -5,7 +5,6 @@ package grandpa import ( "context" - "io/ioutil" "math/big" "math/rand" "sort" @@ -50,8 +49,7 @@ func NewMockDigestHandler() *mocks.DigestHandler { } func newTestState(t *testing.T) *state.Service { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() db, err := utils.SetupDatabase(testDatadirPath, true) require.NoError(t, err) diff --git a/lib/keystore/encrypt.go b/lib/keystore/encrypt.go index 137ef6d27f..e50c624c7b 100644 --- a/lib/keystore/encrypt.go +++ b/lib/keystore/encrypt.go @@ -11,7 +11,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "path/filepath" @@ -148,7 +147,7 @@ func ReadFromFileAndDecrypt(filename string, password []byte) (crypto.PrivateKey return nil, err } - data, err := ioutil.ReadFile(filepath.Clean(fp)) + data, err := os.ReadFile(filepath.Clean(fp)) if err != nil { return nil, err } diff --git a/lib/keystore/helpers.go b/lib/keystore/helpers.go index 6189656f7a..a4161ae5b8 100644 --- a/lib/keystore/helpers.go +++ b/lib/keystore/helpers.go @@ -8,7 +8,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -181,7 +180,7 @@ func ImportKeypair(fp, dir string) (string, error) { return "", fmt.Errorf("failed to create keystore directory: %s", err) } - keyData, err := ioutil.ReadFile(filepath.Clean(fp)) + keyData, err := os.ReadFile(filepath.Clean(fp)) if err != nil { return "", fmt.Errorf("failed to read keystore file: %s", err) } @@ -197,7 +196,7 @@ func ImportKeypair(fp, dir string) (string, error) { return "", fmt.Errorf("failed to create keystore filepath: %s", err) } - err = ioutil.WriteFile(keyFilePath, keyData, 0600) + err = os.WriteFile(keyFilePath, keyData, 0600) if err != nil { return "", fmt.Errorf("failed to write to keystore file: %s", err) } diff --git a/lib/keystore/helpers_test.go b/lib/keystore/helpers_test.go index e9561bbe2c..57cd201353 100644 --- a/lib/keystore/helpers_test.go +++ b/lib/keystore/helpers_test.go @@ -5,7 +5,6 @@ package keystore import ( "encoding/json" - "io/ioutil" "os" "path/filepath" "reflect" @@ -100,7 +99,7 @@ func TestGenerateKey_Ed25519(t *testing.T) { t.Fatalf("Fail: got %s expected %s", keys[0], keyfile) } - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) if err != nil { t.Fatal(err) } @@ -138,7 +137,7 @@ func TestGenerateKey_Secp256k1(t *testing.T) { t.Fatalf("Fail: got %s expected %s", keys[0], keyfile) } - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) if err != nil { t.Fatal(err) } @@ -163,7 +162,7 @@ func TestGenerateKey_NoType(t *testing.T) { t.Fatal(err) } - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) if err != nil { t.Fatal(err) } @@ -299,7 +298,7 @@ func TestImportRawPrivateKey_NoType(t *testing.T) { keyfile, err := ImportRawPrivateKey("0x33a6f3093f158a7109f679410bef1a0c54168145e0cecb4df006c1c2fffb1f09", "", testdir, testPassword) require.NoError(t, err) - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) require.NoError(t, err) kscontents := new(EncryptedKeystore) @@ -316,7 +315,7 @@ func TestImportRawPrivateKey_Sr25519(t *testing.T) { keyfile, err := ImportRawPrivateKey("0x33a6f3093f158a7109f679410bef1a0c54168145e0cecb4df006c1c2fffb1f09", "sr25519", testdir, testPassword) require.NoError(t, err) - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) require.NoError(t, err) kscontents := new(EncryptedKeystore) @@ -333,7 +332,7 @@ func TestImportRawPrivateKey_Ed25519(t *testing.T) { keyfile, err := ImportRawPrivateKey("0x33a6f3093f158a7109f679410bef1a0c54168145e0cecb4df006c1c2fffb1f09", "ed25519", testdir, testPassword) require.NoError(t, err) - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) require.NoError(t, err) kscontents := new(EncryptedKeystore) @@ -350,7 +349,7 @@ func TestImportRawPrivateKey_Secp256k1(t *testing.T) { keyfile, err := ImportRawPrivateKey("0x33a6f3093f158a7109f679410bef1a0c54168145e0cecb4df006c1c2fffb1f09", "secp256k1", testdir, testPassword) require.NoError(t, err) - contents, err := ioutil.ReadFile(keyfile) + contents, err := os.ReadFile(keyfile) require.NoError(t, err) kscontents := new(EncryptedKeystore) diff --git a/lib/runtime/life/instance.go b/lib/runtime/life/instance.go index 7f3262354e..ec22bf7eb3 100644 --- a/lib/runtime/life/instance.go +++ b/lib/runtime/life/instance.go @@ -6,7 +6,7 @@ package life import ( "errors" "fmt" - "io/ioutil" + "os" "path/filepath" "sync" @@ -68,7 +68,7 @@ func NewRuntimeFromGenesis(cfg *Config) (runtime.Instance, error) { // NewInstanceFromFile instantiates a runtime from a .wasm file func NewInstanceFromFile(fp string, cfg *Config) (*Instance, error) { // Reads the WebAssembly module as bytes. - bytes, err := ioutil.ReadFile(filepath.Clean(fp)) + bytes, err := os.ReadFile(filepath.Clean(fp)) if err != nil { return nil, err } diff --git a/lib/runtime/test_helpers.go b/lib/runtime/test_helpers.go index 942a6bdea9..4da3c3b963 100644 --- a/lib/runtime/test_helpers.go +++ b/lib/runtime/test_helpers.go @@ -5,7 +5,7 @@ package runtime import ( "context" - "io/ioutil" + "io" "net/http" "os" "path" @@ -23,8 +23,7 @@ import ( // NewInMemoryDB creates a new in-memory database func NewInMemoryDB(t *testing.T) chaindb.Database { - testDatadirPath, err := ioutil.TempDir("/tmp", "test-datadir-*") - require.NoError(t, err) + testDatadirPath := t.TempDir() db, err := chaindb.NewBadgerDB(&chaindb.Config{ DataDir: testDatadirPath, @@ -89,13 +88,13 @@ func GetRuntimeBlob(testRuntimeFilePath, testRuntimeURL string) error { return err } - respBody, err := ioutil.ReadAll(resp.Body) + respBody, err := io.ReadAll(resp.Body) if err != nil { return err } defer resp.Body.Close() //nolint:errcheck - return ioutil.WriteFile(testRuntimeFilePath, respBody, os.ModePerm) + return os.WriteFile(testRuntimeFilePath, respBody, os.ModePerm) } // TestRuntimeNetwork ... diff --git a/lib/runtime/wasmer/exports_test.go b/lib/runtime/wasmer/exports_test.go index 22f3bd3d9b..a396c1d424 100644 --- a/lib/runtime/wasmer/exports_test.go +++ b/lib/runtime/wasmer/exports_test.go @@ -7,8 +7,8 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "math/big" + "os" "testing" "time" @@ -1137,7 +1137,7 @@ func TestInstance_PaymentQueryInfo(t *testing.T) { } func newTrieFromPairs(t *testing.T, filename string) *trie.Trie { - data, err := ioutil.ReadFile(filename) + data, err := os.ReadFile(filename) require.NoError(t, err) rpcPairs := make(map[string]interface{}) diff --git a/lib/runtime/wasmer/imports_test.go b/lib/runtime/wasmer/imports_test.go index 6bb8fa89fe..0742ba1834 100644 --- a/lib/runtime/wasmer/imports_test.go +++ b/lib/runtime/wasmer/imports_test.go @@ -6,7 +6,6 @@ package wasmer import ( "bytes" "encoding/binary" - "io/ioutil" "os" "sort" "testing" @@ -1689,10 +1688,7 @@ func Test_ext_trie_blake2_256_root_version_1(t *testing.T) { func Test_ext_trie_blake2_256_verify_proof_version_1(t *testing.T) { t.Parallel() - tmp, err := ioutil.TempDir("", "*-test-trie") - require.NoError(t, err) - - defer os.RemoveAll(tmp) + tmp := t.TempDir() memdb, err := chaindb.NewBadgerDB(&chaindb.Config{ InMemory: true, diff --git a/lib/runtime/wasmer/instance_test.go b/lib/runtime/wasmer/instance_test.go index 4ea672a82b..08e071223e 100644 --- a/lib/runtime/wasmer/instance_test.go +++ b/lib/runtime/wasmer/instance_test.go @@ -4,7 +4,7 @@ package wasmer import ( - "io/ioutil" + "os" "path/filepath" "testing" @@ -40,7 +40,7 @@ func TestInstance_CheckRuntimeVersion(t *testing.T) { require.NoError(t, err) fp, err := filepath.Abs(runtime.POLKADOT_RUNTIME_FP) require.NoError(t, err) - code, err := ioutil.ReadFile(fp) + code, err := os.ReadFile(fp) require.NoError(t, err) version, err := instance.CheckRuntimeVersion(code) require.NoError(t, err) diff --git a/lib/trie/database_test.go b/lib/trie/database_test.go index 7b495724a7..3f9f0c432c 100644 --- a/lib/trie/database_test.go +++ b/lib/trie/database_test.go @@ -6,8 +6,6 @@ package trie import ( "bytes" "fmt" - "io/ioutil" - "os" "testing" "github.com/ChainSafe/chaindb" @@ -16,7 +14,7 @@ import ( ) func newTestDB(t *testing.T) chaindb.Database { - testDatadirPath, _ := ioutil.TempDir(os.TempDir(), "test-datadir-*") + testDatadirPath := t.TempDir() db, err := utils.SetupDatabase(testDatadirPath, true) require.NoError(t, err) return chaindb.NewTable(db, "trie") diff --git a/lib/trie/proof_test.go b/lib/trie/proof_test.go index 5fd2ec8a25..2e472e2fdc 100644 --- a/lib/trie/proof_test.go +++ b/lib/trie/proof_test.go @@ -4,7 +4,6 @@ package trie import ( - "io/ioutil" "testing" "github.com/ChainSafe/chaindb" @@ -14,8 +13,7 @@ import ( func TestProofGeneration(t *testing.T) { t.Parallel() - tmp, err := ioutil.TempDir("", "*-test-trie") - require.NoError(t, err) + tmp := t.TempDir() memdb, err := chaindb.NewBadgerDB(&chaindb.Config{ InMemory: true, @@ -55,8 +53,7 @@ func TestProofGeneration(t *testing.T) { func testGenerateProof(t *testing.T, entries []Pair, keys [][]byte) ([]byte, [][]byte, []Pair) { t.Helper() - tmp, err := ioutil.TempDir("", "*-test-trie") - require.NoError(t, err) + tmp := t.TempDir() memdb, err := chaindb.NewBadgerDB(&chaindb.Config{ InMemory: true, diff --git a/lib/trie/trie_test.go b/lib/trie/trie_test.go index 701c456ddb..9863181157 100644 --- a/lib/trie/trie_test.go +++ b/lib/trie/trie_test.go @@ -7,7 +7,6 @@ import ( "bytes" "encoding/hex" "fmt" - "io/ioutil" "math/rand" "os" "path/filepath" @@ -116,7 +115,7 @@ func writeToTestFile(tests []Test) error { return err } os.Remove(fp) - err = ioutil.WriteFile(fp, []byte(testString), 0644) + err = os.WriteFile(fp, []byte(testString), 0644) if err != nil { return err } @@ -278,7 +277,7 @@ func TestFailingTests(t *testing.T) { t.Error(err) } - data, err := ioutil.ReadFile(fp) + data, err := os.ReadFile(fp) if err != nil { t.SkipNow() } @@ -461,8 +460,7 @@ func TestDeleteOddKeyLengths(t *testing.T) { } func TestTrieDiff(t *testing.T) { - testDataDirPath, _ := ioutil.TempDir(t.TempDir(), "test-badger-datadir") - defer os.RemoveAll(testDataDirPath) + testDataDirPath := t.TempDir() cfg := &chaindb.Config{ DataDir: testDataDirPath, diff --git a/lib/utils/utils.go b/lib/utils/utils.go index 05e240f2ce..c2f8404057 100644 --- a/lib/utils/utils.go +++ b/lib/utils/utils.go @@ -5,7 +5,6 @@ package utils import ( "fmt" - "io/ioutil" "os" "os/user" "path" @@ -115,7 +114,7 @@ func KeystoreFiles(basepath string) ([]string, error) { return nil, fmt.Errorf("failed to get keystore directory: %s", err) } - files, err := ioutil.ReadDir(keystorepath) + files, err := os.ReadDir(keystorepath) if err != nil { return nil, fmt.Errorf("failed to read keystore directory: %s", err) } diff --git a/pkg/scale/decode.go b/pkg/scale/decode.go index b801a74b5d..eb51e679f4 100644 --- a/pkg/scale/decode.go +++ b/pkg/scale/decode.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "math/big" "reflect" ) @@ -286,7 +285,7 @@ func (ds *decodeState) decodeResult(dstv reflect.Value) (err error) { } dstv.Set(reflect.ValueOf(res)) default: - bytes, _ := ioutil.ReadAll(ds.Reader) + bytes, _ := io.ReadAll(ds.Reader) err = fmt.Errorf("unsupported Result value: %v, bytes: %v", rb, bytes) } return @@ -319,7 +318,7 @@ func (ds *decodeState) decodePointer(dstv reflect.Value) (err error) { dstv.Set(tempElem) } default: - bytes, _ := ioutil.ReadAll(ds.Reader) + bytes, _ := io.ReadAll(ds.Reader) err = fmt.Errorf("unsupported Option value: %v, bytes: %v", rb, bytes) } return diff --git a/tests/utils/framework.go b/tests/utils/framework.go index 656d3d1795..9b8654a5e9 100644 --- a/tests/utils/framework.go +++ b/tests/utils/framework.go @@ -5,7 +5,7 @@ package utils import ( "fmt" - "io/ioutil" + "os" "strconv" "testing" @@ -28,7 +28,7 @@ func InitFramework(qtyNodes int) (*Framework, error) { } f.nodes = nodes - tempDir, err := ioutil.TempDir("", "gossamer-stress-db") + tempDir, err := os.MkdirTemp("", "gossamer-stress-db") if err != nil { return nil, err } diff --git a/tests/utils/gossamer_utils.go b/tests/utils/gossamer_utils.go index 7cb0ab9dec..a1beec6bbb 100644 --- a/tests/utils/gossamer_utils.go +++ b/tests/utils/gossamer_utils.go @@ -7,7 +7,6 @@ import ( "bufio" "fmt" "io" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -193,7 +192,7 @@ func StartGossamer(t *testing.T, node *Node, websocket bool) error { Logger.Infof("node started with key %s and cmd.Process.Pid %d", key, node.Process.Process.Pid) } else { Logger.Criticalf("node didn't start: %s", err) - errFileContents, _ := ioutil.ReadFile(errfile.Name()) + errFileContents, _ := os.ReadFile(errfile.Name()) t.Logf("%s\n", errFileContents) return err } @@ -256,7 +255,7 @@ func KillProcess(t *testing.T, cmd *exec.Cmd) error { // InitNodes initialises given number of nodes func InitNodes(num int, config string) ([]*Node, error) { var nodes []*Node - tempDir, err := ioutil.TempDir("", "gossamer-stress-") + tempDir, err := os.MkdirTemp("", "gossamer-stress-") if err != nil { return nil, err } diff --git a/tests/utils/request_utils.go b/tests/utils/request_utils.go index c19d5075e7..309d81f1d6 100644 --- a/tests/utils/request_utils.go +++ b/tests/utils/request_utils.go @@ -9,7 +9,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" "testing" "time" @@ -52,7 +52,7 @@ func PostRPC(method, host, params string) ([]byte, error) { _ = resp.Body.Close() }() - respBody, err := ioutil.ReadAll(resp.Body) + respBody, err := io.ReadAll(resp.Body) return respBody, err