Replace ioutil with io and os (#10541)

* Replace ioutil with io and os

* Fix build errors
This commit is contained in:
Håvard Anda Estensen
2022-04-18 22:42:07 +02:00
committed by GitHub
parent 982de94428
commit d2f4a8cc7c
102 changed files with 256 additions and 291 deletions

View File

@@ -2,7 +2,6 @@ package kv
import (
"context"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -20,7 +19,7 @@ func TestStore_Backup(t *testing.T) {
require.NoError(t, db.Backup(ctx, "", true))
backupsPath := filepath.Join(db.databasePath, backupsDirectoryName)
files, err := ioutil.ReadDir(backupsPath)
files, err := os.ReadDir(backupsPath)
require.NoError(t, err)
require.NotEqual(t, 0, len(files), "No backups created")
require.NoError(t, db.Close(), "Failed to close database")
@@ -69,7 +68,7 @@ func TestStore_NestedBackup(t *testing.T) {
require.NoError(t, db.Backup(ctx, "", true))
backupsPath := filepath.Join(db.databasePath, backupsDirectoryName)
files, err := ioutil.ReadDir(backupsPath)
files, err := os.ReadDir(backupsPath)
require.NoError(t, err)
require.NotEqual(t, 0, len(files), "No backups created")
require.NoError(t, db.Close(), "Failed to close database")

View File

@@ -2,7 +2,7 @@ package kv
import (
"context"
"io/ioutil"
"io"
"testing"
fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
@@ -12,7 +12,7 @@ import (
func TestMain(m *testing.M) {
logrus.SetLevel(logrus.DebugLevel)
logrus.SetOutput(ioutil.Discard)
logrus.SetOutput(io.Discard)
m.Run()
}

View File

@@ -3,7 +3,6 @@ package db
import (
"context"
"flag"
"io/ioutil"
"os"
"path"
"testing"
@@ -47,7 +46,7 @@ func TestRestore(t *testing.T) {
assert.NoError(t, Restore(cliCtx))
files, err := ioutil.ReadDir(restoreDir)
files, err := os.ReadDir(restoreDir)
require.NoError(t, err)
assert.Equal(t, 1, len(files))
assert.Equal(t, kv.ProtectionDbFileName, files[0].Name())