[R4R] bump up go version and replace ioutil with io/os (#274)

* use io and os to replace ioutil * change depended repo names Co-authored-by: forcodedancing <[email protected]>
bnb-chain · Apr 20, 2022 · 9e7f042 · 9e7f042
1 parent 3b0d9d1
commit 9e7f042
Show file tree

Hide file tree

Showing 33 changed files with 194 additions and 100 deletions.
diff --git a/bsc/rlp/encode_test.go b/bsc/rlp/encode_test.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/big"
 	"sync"
 	"testing"
@@ -349,7 +348,7 @@ func TestEncodeToReader(t *testing.T) {
 		if err != nil {
 			return nil, err
 		}
-		return ioutil.ReadAll(r)
+		return io.ReadAll(r)
 	})
 }
 
@@ -390,7 +389,7 @@ func TestEncodeToReaderReturnToPool(t *testing.T) {
 		go func() {
 			for i := 0; i < 1000; i++ {
 				_, r, _ := EncodeToReader("foo")
-				ioutil.ReadAll(r)
+				io.ReadAll(r)
 				r.Read(buf)
 				r.Read(buf)
 				r.Read(buf)

diff --git a/client/config.go b/client/config.go
@@ -7,7 +7,6 @@ import (
 	"github.com/mitchellh/go-homedir"
 	"github.com/pelletier/go-toml"
 	"github.com/spf13/cobra"
-	"io/ioutil"
 	"os"
 	"path"
 )
@@ -127,5 +126,5 @@ func createGaiaCLIConfig(cfg *cliConfig) error {
 		}
 	}
 
-	return ioutil.WriteFile(cfgFile, data, os.ModePerm)
+	return os.WriteFile(cfgFile, data, os.ModePerm)
 }
diff --git a/client/keys/add.go b/client/keys/add.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"path"
@@ -225,7 +225,7 @@ func AddNewKeyRequestHandler(indent bool) http.HandlerFunc {
 			return
 		}
 
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			w.WriteHeader(http.StatusBadRequest)
 			w.Write([]byte(err.Error()))
@@ -323,7 +323,7 @@ func RecoverRequestHandler(indent bool) http.HandlerFunc {
 		vars := mux.Vars(r)
 		name := vars["name"]
 		var m RecoverKeyBody
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			w.WriteHeader(http.StatusBadRequest)
 			w.Write([]byte(err.Error()))

diff --git a/client/keys/utils_test.go b/client/keys/utils_test.go
@@ -3,13 +3,12 @@ package keys
 import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys"
 	"github.com/stretchr/testify/require"
-	"io/ioutil"
 	"os"
 	"testing"
 )
 
 func TestGetKeyBaseLocks(t *testing.T) {
-	dir, err := ioutil.TempDir("", "cosmos-sdk-keys")
+	dir, err := os.MkdirTemp("", "cosmos-sdk-keys")
 	require.Nil(t, err)
 	defer os.RemoveAll(dir)
 

diff --git a/client/lcd/certificates.go b/client/lcd/certificates.go
@@ -11,7 +11,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/big"
 	"net"
 	"os"
@@ -76,7 +76,7 @@ func writeCertAndPrivKey(certBytes []byte, priv *ecdsa.PrivateKey) (certFile str
 }
 
 func writeCertificateFile(certBytes []byte) (filename string, err error) {
-	f, err := ioutil.TempFile("", "cert_")
+	f, err := os.CreateTemp("", "cert_")
 	if err != nil {
 		return
 	}
@@ -89,7 +89,7 @@ func writeCertificateFile(certBytes []byte) (filename string, err error) {
 }
 
 func writeKeyFile(priv *ecdsa.PrivateKey) (filename string, err error) {
-	f, err := ioutil.TempFile("", "key_")
+	f, err := os.CreateTemp("", "key_")
 	if err != nil {
 		return
 	}
@@ -162,7 +162,7 @@ func fingerprintFromFile(certFile string) (string, error) {
 		return "", err
 	}
 	defer f.Close()
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return "", err
 	}

diff --git a/client/lcd/certificates_test.go b/client/lcd/certificates_test.go
@@ -3,7 +3,6 @@ package lcd
 import (
 	"crypto/ecdsa"
 	"crypto/x509"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -71,7 +70,7 @@ zj0EAwIDSQAwRgIhAKnwbhX9FrGG1otCVLwhClQ3RaLxnNpCgIGTqSimb34cAiEA
 stMN+IqMCKWlZyGqxGIiyksMLMEU3lRqKNQn2EoAZJY=
 -----END CERTIFICATE-----`
 	wantFingerprint := `SHA256 Fingerprint=0B:ED:9A:AA:A2:D1:7E:B2:53:56:F6:FC:C0:E6:1A:69:70:21:A2:B0:90:FC:AF:BB:EF:AE:2C:78:52:AB:68:40`
-	certFile, err := ioutil.TempFile("", "test_cert_")
+	certFile, err := os.CreateTemp("", "test_cert_")
 	require.Nil(t, err)
 	_, err = certFile.Write([]byte(cert))
 	require.Nil(t, err)
@@ -83,7 +82,7 @@ stMN+IqMCKWlZyGqxGIiyksMLMEU3lRqKNQn2EoAZJY=
 	require.Equal(t, wantFingerprint, fingerprint)
 
 	// test failure
-	emptyFile, err := ioutil.TempFile("", "test_cert_")
+	emptyFile, err := os.CreateTemp("", "test_cert_")
 	require.Nil(t, err)
 	err = emptyFile.Close()
 	require.Nil(t, err)

diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"os"
@@ -87,7 +87,7 @@ func GetConfig() *tmcfg.Config {
 // NOTE: memDB cannot be used because the request is expecting to interact with
 // the default location.
 func GetKeyBase(t *testing.T) crkeys.Keybase {
-	dir, err := ioutil.TempDir("", "lcd_test")
+	dir, err := os.MkdirTemp("", "lcd_test")
 	require.NoError(t, err)
 
 	viper.Set(cli.HomeFlag, dir)
@@ -265,7 +265,7 @@ func InitializeTestLCD(
 	viper.Set(client.FlagNode, config.RPC.ListenAddress)
 	viper.Set(client.FlagChainID, genDoc.ChainID)
 	viper.Set(client.FlagTrustNode, false)
-	dir, err := ioutil.TempDir("", "lcd_test")
+	dir, err := os.MkdirTemp("", "lcd_test")
 	require.NoError(t, err)
 	viper.Set(cli.HomeFlag, dir)
 
@@ -358,7 +358,7 @@ func Request(t *testing.T, port, method, path string, payload []byte) (*http.Res
 	res, err = http.DefaultClient.Do(req)
 	require.Nil(t, err)
 
-	output, err := ioutil.ReadAll(res.Body)
+	output, err := io.ReadAll(res.Body)
 	res.Body.Close()
 	require.Nil(t, err)
 

diff --git a/client/tx/broadcast.go b/client/tx/broadcast.go
@@ -1,12 +1,12 @@
 package tx
 
 import (
+	"io"
 	"net/http"
 
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/client/utils"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"io/ioutil"
 )
 
 const (
@@ -29,7 +29,7 @@ type BroadcastBody struct {
 func BroadcastTxRequest(cliCtx context.CLIContext, cdc *codec.Codec) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var m BroadcastBody
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			utils.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 			return

diff --git a/client/utils/rest.go b/client/utils/rest.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -135,7 +135,7 @@ unmarshals to the req interface.
     err := ReadRESTReq(w, r, cdc, req)
 */
 func ReadRESTReq(w http.ResponseWriter, r *http.Request, cdc *codec.Codec, req interface{}) error {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		WriteErrorResponse(w, http.StatusBadRequest, err.Error())
 		return err

diff --git a/cmd/cosmos-sdk-cli/cmd/init.go b/cmd/cosmos-sdk-cli/cmd/init.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"go/build"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -65,7 +64,7 @@ func copyBasecoinTemplate(projectName string, projectPath string, remoteProjectP
 	basecoinProjectPath := resolveProjectPath(remoteBasecoinPath)
 	filepath.Walk(basecoinProjectPath, func(path string, f os.FileInfo, err error) error {
 		if !f.IsDir() {
-			data, err := ioutil.ReadFile(path)
+			data, err := os.ReadFile(path)
 			if err != nil {
 				return err
 			}
@@ -83,7 +82,7 @@ func copyBasecoinTemplate(projectName string, projectPath string, remoteProjectP
 			fmt.Println("Creating " + projectFilePath)
 			// Writing the contents to a file in the project folder
 			contents = replacer.Replace(contents)
-			ioutil.WriteFile(projectFilePath, []byte(contents), os.ModePerm)
+			os.WriteFile(projectFilePath, []byte(contents), os.ModePerm)
 		}
 		return nil
 	})
@@ -110,7 +109,7 @@ func createGopkg(projectPath string) {
 		contents += "[[override]]\n\tname = \"" + dependency + "\"\n\tversion = \"=" + version + "\"\n\n"
 	}
 	contents += "[prune]\n\tgo-tests = true\n\tunused-packages = true"
-	ioutil.WriteFile(projectPath+"/Gopkg.toml", []byte(contents), os.ModePerm)
+	os.WriteFile(projectPath+"/Gopkg.toml", []byte(contents), os.ModePerm)
 }
 
 // nolint: errcheck
@@ -142,7 +141,7 @@ benchmark:
 	// Replacing instances of base* to project specific names
 	makefileContents = replacer.Replace(makefileContents)
 
-	ioutil.WriteFile(projectPath+"/Makefile", []byte(makefileContents), os.ModePerm)
+	os.WriteFile(projectPath+"/Makefile", []byte(makefileContents), os.ModePerm)
 
 }
 

diff --git a/cmd/gaia/app/genesis.go b/cmd/gaia/app/genesis.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -189,8 +188,8 @@ func GaiaAppGenStateJSON(cdc *codec.Codec, appGenTxs []json.RawMessage) (appStat
 // appGenTxs, and persistent peers required to generate genesis.json.
 func CollectStdTxs(moniker string, genTxsDir string, cdc *codec.Codec) (
 	validators []tmtypes.GenesisValidator, appGenTxs []auth.StdTx, persistentPeers string, err error) {
-	var fos []os.FileInfo
-	fos, err = ioutil.ReadDir(genTxsDir)
+	var fos []os.DirEntry
+	fos, err = os.ReadDir(genTxsDir)
 	if err != nil {
 		return
 	}
@@ -204,7 +203,7 @@ func CollectStdTxs(moniker string, genTxsDir string, cdc *codec.Codec) (
 
 		// get the genStdTx
 		var jsonRawTx []byte
-		jsonRawTx, err = ioutil.ReadFile(filename)
+		jsonRawTx, err = os.ReadFile(filename)
 		if err != nil {
 			return
 		}

diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go
@@ -1,11 +1,11 @@
+//go:build cli_test
 // +build cli_test
 
 package clitest
 
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -391,7 +391,7 @@ func TestGaiaCLIConfig(t *testing.T) {
 	node := fmt.Sprintf("%s:%s", servAddr, port)
 	chainID := executeInit(t, fmt.Sprintf("gaiad init -o --name=foo --home=%s --home-client=%s", gaiadHome, gaiacliHome))
 	executeWrite(t, fmt.Sprintf("gaiacli --home=%s config", gaiadHome), gaiacliHome, node, "y")
-	config, err := ioutil.ReadFile(path.Join(gaiacliHome, "config", "config.toml"))
+	config, err := os.ReadFile(path.Join(gaiacliHome, "config", "config.toml"))
 	require.NoError(t, err)
 	expectedConfig := fmt.Sprintf(`chain_id = "%s"
 encoding = "btc"
@@ -404,7 +404,7 @@ trust_node = true
 	require.Equal(t, expectedConfig, string(config))
 	// ensure a backup gets created
 	executeWrite(t, "gaiacli config", gaiacliHome, node, "y", "y")
-	configBackup, err := ioutil.ReadFile(path.Join(gaiacliHome, "config", "config.toml-old"))
+	configBackup, err := os.ReadFile(path.Join(gaiacliHome, "config", "config.toml-old"))
 	require.NoError(t, err)
 	require.Equal(t, expectedConfig, string(configBackup))
 
@@ -420,7 +420,7 @@ output = "text"
 trace = false
 trust_node = true
 `, gaiacliHome, node)
-	config, err = ioutil.ReadFile(path.Join(gaiacliHome, "config", "config.toml"))
+	config, err = os.ReadFile(path.Join(gaiacliHome, "config", "config.toml"))
 	require.NoError(t, err)
 	require.Equal(t, expectedConfig, string(config))
 }
@@ -456,7 +456,7 @@ func unmarshalStdTx(t *testing.T, s string) (stdTx auth.StdTx) {
 }
 
 func writeToNewTempFile(t *testing.T, s string) *os.File {
-	fp, err := ioutil.TempFile(os.TempDir(), "cosmos_cli_test_")
+	fp, err := os.TempFile(os.TempDir(), "cosmos_cli_test_")
 	require.Nil(t, err)
 	_, err = fp.WriteString(s)
 	require.Nil(t, err)

diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go
@@ -15,7 +15,6 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 	"github.com/tendermint/tendermint/libs/common"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -60,7 +59,7 @@ following delegation and commission default parameters:
 			prepareFlagsForTxCreateValidator(config, nodeID, ip, valPubKey)
 			createValidatorCmd := cli.GetCmdCreateValidator(cdc)
 
-			w, err := ioutil.TempFile("", "gentx")
+			w, err := os.CreateTemp("", "gentx")
 			if err != nil {
 				return err
 			}

diff --git a/cmd/gaia/init/init_test.go b/cmd/gaia/init/init_test.go
@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/tendermint/tendermint/libs/cli"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -39,7 +38,7 @@ func TestInitCmd(t *testing.T) {
 }
 
 func setupClientHome(t *testing.T) func() {
-	clientDir, err := ioutil.TempDir("", "mock-sdk-cmd")
+	clientDir, err := os.MkdirTemp("", "mock-sdk-cmd")
 	require.Nil(t, err)
 	viper.Set(flagClientHome, clientDir)
 	viper.Set(flagOverwriteKey, true)
@@ -92,7 +91,7 @@ func TestEmptyState(t *testing.T) {
 }
 
 func TestStartStandAlone(t *testing.T) {
-	home, err := ioutil.TempDir("", "mock-sdk-cmd")
+	home, err := os.MkdirTemp("", "mock-sdk-cmd")
 	require.Nil(t, err)
 	defer func() {
 		os.RemoveAll(home)
@@ -130,7 +129,7 @@ func TestStartStandAlone(t *testing.T) {
 }
 
 func TestInitNodeValidatorFiles(t *testing.T) {
-	home, err := ioutil.TempDir("", "mock-sdk-cmd")
+	home, err := os.MkdirTemp("", "mock-sdk-cmd")
 	require.Nil(t, err)
 	defer func() {
 		os.RemoveAll(home)