mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-07 13:55:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not use ioutil (#9206)

Browse Source
This commit is contained in:
Jacob Gadikian
2022-08-11 01:35:14 +07:00
committed by Sam Ricotta
parent 2e28427dab
commit 4bf6d69090
59 changed files with 165 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/key.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/hex"
"fmt"
"io/ioutil"
"os"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
@@ -70,7 +70,7 @@ func LoadOrGenNodeKey(filePath string) (*NodeKey, error) {
// LoadNodeKey loads NodeKey located in filePath.
func LoadNodeKey(filePath string) (*NodeKey, error) {
jsonBytes, err := ioutil.ReadFile(filePath)
jsonBytes, err := os.ReadFile(filePath)
if err != nil {
return nil, err
}
@@ -88,7 +88,7 @@ func (nodeKey *NodeKey) SaveAs(filePath string) error {
if err != nil {
return err
}
err = ioutil.WriteFile(filePath, jsonBytes, 0600)
err = os.WriteFile(filePath, jsonBytes, 0600)
if err != nil {
return err
}

3
p2p/pex/addrbook_test.go
View File

@@ -3,7 +3,6 @@ package pex
import (
"encoding/hex"
"fmt"
"io/ioutil"
"math"
"net"
"os"
@@ -718,7 +717,7 @@ func assertMOldAndNNewAddrsInSelection(t *testing.T, m, n int, addrs []*p2p.NetA
}
func createTempFileName(prefix string) string {
f, err := ioutil.TempFile("", prefix)
f, err := os.CreateTemp("", prefix)
if err != nil {
panic(err)
}

19
p2p/pex/pex_reactor_test.go
View File

@@ -3,7 +3,6 @@ package pex
import (
"encoding/hex"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -73,7 +72,7 @@ func TestPEXReactorRunning(t *testing.T) {
switches := make([]*p2p.Switch, N)
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -208,7 +207,7 @@ func TestPEXReactorAddrsMessageAbuse(t *testing.T) {
func TestCheckSeeds(t *testing.T) {
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -247,7 +246,7 @@ func TestCheckSeeds(t *testing.T) {
func TestPEXReactorUsesSeedsIfNeeded(t *testing.T) {
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -267,7 +266,7 @@ func TestPEXReactorUsesSeedsIfNeeded(t *testing.T) {
func TestConnectionSpeedForPeerReceivedFromSeed(t *testing.T) {
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -296,7 +295,7 @@ func TestConnectionSpeedForPeerReceivedFromSeed(t *testing.T) {
func TestPEXReactorSeedMode(t *testing.T) {
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -335,7 +334,7 @@ func TestPEXReactorSeedMode(t *testing.T) {
func TestPEXReactorDoesNotDisconnectFromPersistentPeerInSeedMode(t *testing.T) {
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -373,7 +372,7 @@ func TestPEXReactorDoesNotDisconnectFromPersistentPeerInSeedMode(t *testing.T) {
func TestPEXReactorDialsPeerUpToMaxAttemptsInSeedMode(t *testing.T) {
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -409,7 +408,7 @@ func TestPEXReactorSeedModeFlushStop(t *testing.T) {
switches := make([]*p2p.Switch, N)
// directory to store address books
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
require.Nil(t, err)
defer os.RemoveAll(dir)
@@ -646,7 +645,7 @@ func testCreatePeerWithSeed(dir string, id int, seed *p2p.Switch) *p2p.Switch {
func createReactor(conf *ReactorConfig) (r *Reactor, book AddrBook) {
// directory to store address book
dir, err := ioutil.TempDir("", "pex_reactor")
dir, err := os.MkdirTemp("", "pex_reactor")
if err != nil {
panic(err)
}

4
p2p/switch_test.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"errors"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/http/httptest"
@@ -400,7 +400,7 @@ func TestSwitchStopPeerForError(t *testing.T) {
resp, err := http.Get(s.URL)
require.NoError(t, err)
defer resp.Body.Close()
buf, _ := ioutil.ReadAll(resp.Body)
buf, _ := io.ReadAll(resp.Body)
return string(buf)
}

3
p2p/trust/store_test.go
View File

@@ -5,7 +5,6 @@ package trust
import (
"fmt"
"io/ioutil"
"os"
"testing"
@@ -17,7 +16,7 @@ import (
)
func TestTrustMetricStoreSaveLoad(t *testing.T) {
dir, err := ioutil.TempDir("", "trust_test")
dir, err := os.MkdirTemp("", "trust_test")
require.NoError(t, err)
defer os.Remove(dir)

6
p2p/upnp/upnp.go
View File

@@ -10,7 +10,7 @@ import (
"encoding/xml"
"errors"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"strconv"
@@ -312,7 +312,7 @@ func (n *upnpNAT) getExternalIPAddress() (info statusInfo, err error) {
return
}
var envelope Envelope
data, err := ioutil.ReadAll(response.Body)
data, err := io.ReadAll(response.Body)
if err != nil {
return
}
@@ -374,7 +374,7 @@ func (n *upnpNAT) AddPortMapping(
// TODO: check response to see if the port was forwarded
// log.Println(message, response)
// JAE:
// body, err := ioutil.ReadAll(response.Body)
// body, err := io.ReadAll(response.Body)
// fmt.Println(string(body), err)
mappedExternalPort = externalPort
_ = response