github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace ioutil with io and os (#10541)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

7
io/file/fileutil.go
View File

@@ -5,7 +5,6 @@ import (
"encoding/base64"
"fmt"
"io"
"io/ioutil"
"os"
"os/user"
"path"
@@ -102,7 +101,7 @@ func WriteFile(file string, data []byte) error {
return errors.New("file already exists without proper 0600 permissions")
}
}
return ioutil.WriteFile(expanded, data, params.BeaconIoConfig().ReadWritePermissions)
return os.WriteFile(expanded, data, params.BeaconIoConfig().ReadWritePermissions)
}
// HomeDir for a user.
@@ -197,7 +196,7 @@ func ReadFileAsBytes(filename string) ([]byte, error) {
if err != nil {
return nil, errors.Wrap(err, "could not determine absolute path of password file")
}
return ioutil.ReadFile(filePath) // #nosec G304
return os.ReadFile(filePath) // #nosec G304
}
// CopyFile copy a file from source to destination path.
@@ -226,7 +225,7 @@ func CopyDir(src, dst string) error {
if dstExists {
return errors.New("destination directory already exists")
}
fds, err := ioutil.ReadDir(src)
fds, err := os.ReadDir(src)
if err != nil {
return err
}

13
io/file/fileutil_test.go
View File

@@ -18,7 +18,6 @@ package file_test
import (
"bufio"
"bytes"
"io/ioutil"
"os"
"os/user"
"path/filepath"
@@ -112,7 +111,7 @@ func TestWriteFile_AlreadyExists_WrongPermissions(t *testing.T) {
err := os.MkdirAll(dirName, os.ModePerm)
require.NoError(t, err)
someFileName := filepath.Join(dirName, "somefile.txt")
require.NoError(t, ioutil.WriteFile(someFileName, []byte("hi"), os.ModePerm))
require.NoError(t, os.WriteFile(someFileName, []byte("hi"), os.ModePerm))
err = file.WriteFile(someFileName, []byte("hi"))
assert.ErrorContains(t, "already exists without proper 0600 permissions", err)
}
@@ -122,7 +121,7 @@ func TestWriteFile_AlreadyExists_OK(t *testing.T) {
err := os.MkdirAll(dirName, os.ModePerm)
require.NoError(t, err)
someFileName := filepath.Join(dirName, "somefile.txt")
require.NoError(t, ioutil.WriteFile(someFileName, []byte("hi"), params.BeaconIoConfig().ReadWritePermissions))
require.NoError(t, os.WriteFile(someFileName, []byte("hi"), params.BeaconIoConfig().ReadWritePermissions))
assert.NoError(t, file.WriteFile(someFileName, []byte("hi")))
}
@@ -138,7 +137,7 @@ func TestWriteFile_OK(t *testing.T) {
func TestCopyFile(t *testing.T) {
fName := t.TempDir() + "testfile"
err := ioutil.WriteFile(fName, []byte{1, 2, 3}, params.BeaconIoConfig().ReadWritePermissions)
err := os.WriteFile(fName, []byte{1, 2, 3}, params.BeaconIoConfig().ReadWritePermissions)
require.NoError(t, err)
err = file.CopyFile(fName, fName+"copy")
@@ -360,7 +359,7 @@ func tmpDirWithContents(t *testing.T) (string, []string) {
require.NoError(t, os.MkdirAll(filepath.Join(dir, "subfolder1", "subfolder12"), 0777))
require.NoError(t, os.MkdirAll(filepath.Join(dir, "subfolder2"), 0777))
for _, fname := range fnames {
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, fname), []byte(fname), 0777))
require.NoError(t, os.WriteFile(filepath.Join(dir, fname), []byte(fname), 0777))
}
sort.Strings(fnames)
return dir, fnames
@@ -378,7 +377,7 @@ func tmpDirWithContentsForRecursiveFind(t *testing.T) (string, []string) {
require.NoError(t, os.MkdirAll(filepath.Join(dir, "subfolder1", "subfolder11"), 0777))
require.NoError(t, os.MkdirAll(filepath.Join(dir, "subfolder2"), 0777))
for _, fname := range fnames {
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, fname), []byte(fname), 0777))
require.NoError(t, os.WriteFile(filepath.Join(dir, fname), []byte(fname), 0777))
}
sort.Strings(fnames)
return dir, fnames
@@ -415,7 +414,7 @@ func TestHasReadWritePermissions(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
fullPath := filepath.Join(os.TempDir(), tt.args.itemPath)
require.NoError(t, ioutil.WriteFile(fullPath, []byte("foo"), tt.args.perms))
require.NoError(t, os.WriteFile(fullPath, []byte("foo"), tt.args.perms))
t.Cleanup(func() {
if err := os.RemoveAll(fullPath); err != nil {
t.Fatalf("Could not delete temp dir: %v", err)

3
io/prompt/prompt.go
View File

@@ -4,7 +4,6 @@ import (
"bufio"
"fmt"
"io"
"io/ioutil"
"os"
"strings"
@@ -132,7 +131,7 @@ func InputPassword(
if err != nil {
return "", errors.Wrap(err, "could not determine absolute path of password file")
}
data, err := ioutil.ReadFile(passwordFilePath) // #nosec G304
data, err := os.ReadFile(passwordFilePath) // #nosec G304
if err != nil {
return "", errors.Wrap(err, "could not read password file")
}

3
io/prompt/validate_test.go
View File

@@ -1,7 +1,6 @@
package prompt
import (
"io/ioutil"
"os"
"testing"
@@ -114,7 +113,7 @@ func TestDefaultAndValidatePrompt(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
content := []byte(tt.input + "\n")
tmpfile, err := ioutil.TempFile("", "content")
tmpfile, err := os.CreateTemp("", "content")
require.NoError(t, err)
defer func() {
err := os.Remove(tmpfile.Name())