From ba49209d8aee25913b79996056a0099065050c5d Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Wed, 2 Feb 2022 12:54:28 +0300 Subject: [PATCH] cli: use ioutil instead of os to read/write files Go 1.15 doesn't have os.ReadFile and os.WiteFile. --- cli/contract_test.go | 4 ++-- cli/dump_test.go | 4 ++-- cli/server/server_test.go | 16 ++++++++-------- cli/server_test.go | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cli/contract_test.go b/cli/contract_test.go index db7525b24..7ecacd70d 100644 --- a/cli/contract_test.go +++ b/cli/contract_test.go @@ -370,7 +370,7 @@ func TestContractManifestGroups(t *testing.T) { }) t.Run("corrupted NEF file", func(t *testing.T) { f := filepath.Join(tmpDir, "invalid.nef") - require.NoError(t, os.WriteFile(f, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(f, []byte{1, 2, 3}, os.ModePerm)) e.RunWithError(t, "neo-go", "contract", "manifest", "add-group", "--wallet", testWalletPath, "--account", testWalletAccount, "--sender", testWalletAccount, "--nef", f) @@ -383,7 +383,7 @@ func TestContractManifestGroups(t *testing.T) { }) t.Run("corrupted manifest file", func(t *testing.T) { f := filepath.Join(tmpDir, "invalid.manifest.json") - require.NoError(t, os.WriteFile(f, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(f, []byte{1, 2, 3}, os.ModePerm)) e.RunWithError(t, "neo-go", "contract", "manifest", "add-group", "--wallet", testWalletPath, "--account", testWalletAccount, "--sender", testWalletAccount, "--nef", nefName, diff --git a/cli/dump_test.go b/cli/dump_test.go index 63cc84936..1d42283eb 100644 --- a/cli/dump_test.go +++ b/cli/dump_test.go @@ -61,7 +61,7 @@ func TestDBRestoreDump(t *testing.T) { t.Run("bad logger config", func(t *testing.T) { badConfigDir := t.TempDir() logfile := filepath.Join(badConfigDir, "logdir") - require.NoError(t, os.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) cfg = loadConfig(t) cfg.ApplicationConfiguration.LogPath = filepath.Join(logfile, "file.log") out, err = yaml.Marshal(cfg) @@ -76,7 +76,7 @@ func TestDBRestoreDump(t *testing.T) { t.Run("bad storage config", func(t *testing.T) { badConfigDir := t.TempDir() logfile := filepath.Join(badConfigDir, "logdir") - require.NoError(t, os.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) cfg = loadConfig(t) cfg.ApplicationConfiguration.DBConfiguration.Type = "" out, err = yaml.Marshal(cfg) diff --git a/cli/server/server_test.go b/cli/server/server_test.go index 8046a457f..7d0e8ebce 100644 --- a/cli/server/server_test.go +++ b/cli/server/server_test.go @@ -47,7 +47,7 @@ func TestHandleLoggingParams(t *testing.T) { t.Run("logdir is a file", func(t *testing.T) { logfile := filepath.Join(d, "logdir") - require.NoError(t, os.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) set := flag.NewFlagSet("flagSet", flag.ExitOnError) ctx := cli.NewContext(cli.NewApp(), set, nil) cfg := config.ApplicationConfiguration{ @@ -181,7 +181,7 @@ func TestRestoreDB(t *testing.T) { t.Run("invalid logger path", func(t *testing.T) { badCfgDir := t.TempDir() logfile := filepath.Join(badCfgDir, "logdir") - require.NoError(t, os.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) cfg, err := config.LoadFile(filepath.Join(goodCfg, "protocol.privnet.yml")) require.NoError(t, err, "could not load config") cfg.ApplicationConfiguration.LogPath = filepath.Join(logfile, "file.log") @@ -223,7 +223,7 @@ func TestRestoreDB(t *testing.T) { }) t.Run("corrupted in: invalid block count", func(t *testing.T) { inPath := filepath.Join(t.TempDir(), "file3.acc") - require.NoError(t, os.WriteFile(inPath, []byte{1, 2, 3}, // file is expected to start from uint32 + require.NoError(t, ioutil.WriteFile(inPath, []byte{1, 2, 3}, // file is expected to start from uint32 os.ModePerm)) *in = inPath require.Error(t, restoreDB(ctx)) @@ -232,10 +232,10 @@ func TestRestoreDB(t *testing.T) { }) t.Run("corrupted in: corrupted block", func(t *testing.T) { inPath := filepath.Join(t.TempDir(), "file3.acc") - b, err := os.ReadFile(testDump) + b, err := ioutil.ReadFile(testDump) require.NoError(t, err) b[5] = 0xff // file is expected to start from uint32 (4 bytes) followed by the first block, so corrupt the first block bytes - require.NoError(t, os.WriteFile(inPath, b, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(inPath, b, os.ModePerm)) *in = inPath require.Error(t, restoreDB(ctx)) @@ -243,12 +243,12 @@ func TestRestoreDB(t *testing.T) { }) t.Run("incremental dump", func(t *testing.T) { inPath := filepath.Join(t.TempDir(), "file1_incremental.acc") - b, err := os.ReadFile(testDump) + b, err := ioutil.ReadFile(testDump) require.NoError(t, err) start := make([]byte, 4) t.Run("good", func(t *testing.T) { binary.LittleEndian.PutUint32(start, 1) // start from the first block - require.NoError(t, os.WriteFile(inPath, append(start, b...), + require.NoError(t, ioutil.WriteFile(inPath, append(start, b...), os.ModePerm)) *in = inPath *incremental = true @@ -257,7 +257,7 @@ func TestRestoreDB(t *testing.T) { }) t.Run("dump is too high", func(t *testing.T) { binary.LittleEndian.PutUint32(start, 2) // start from the second block - require.NoError(t, os.WriteFile(inPath, append(start, b...), + require.NoError(t, ioutil.WriteFile(inPath, append(start, b...), os.ModePerm)) *in = inPath *incremental = true diff --git a/cli/server_test.go b/cli/server_test.go index 200c3e7d8..308ce98fc 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -47,7 +47,7 @@ func TestServerStart(t *testing.T) { t.Run("bad logger config", func(t *testing.T) { badConfigDir := t.TempDir() logfile := filepath.Join(badConfigDir, "logdir") - require.NoError(t, os.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) + require.NoError(t, ioutil.WriteFile(logfile, []byte{1, 2, 3}, os.ModePerm)) saveCfg(t, func(cfg *config.Config) { cfg.ApplicationConfiguration.LogPath = filepath.Join(logfile, "file.log") })