stop using the deprecated io/ioutil package

libp2p · Aug 16, 2022 · ad35f63 · ad35f63
1 parent a91bf7b
commit ad35f63
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 65 deletions.
diff --git a/examples/echo/main.go b/examples/echo/main.go
@@ -7,7 +7,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	mrand "math/rand"
 
@@ -173,7 +172,7 @@ func runSender(ctx context.Context, ha host.Host, targetPeer string) {
 		return
 	}
 
-	out, err := ioutil.ReadAll(s)
+	out, err := io.ReadAll(s)
 	if err != nil {
 		log.Println(err)
 		return

diff --git a/examples/ipfs-camp-2019/05-Discovery/protocol.go b/examples/ipfs-camp-2019/05-Discovery/protocol.go
@@ -2,13 +2,11 @@ package main
 
 import (
 	"bufio"
+	"context"
 	"fmt"
+	"io"
 	"os"
 
-	"context"
-
-	"io/ioutil"
-
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/protocol"
@@ -17,7 +15,7 @@ import (
 const chatProtocol = protocol.ID("/libp2p/chat/1.0.0")
 
 func chatHandler(s network.Stream) {
-	data, err := ioutil.ReadAll(s)
+	data, err := io.ReadAll(s)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 	}
@@ -38,7 +36,7 @@ func chatSend(msg string, s network.Stream) error {
 		return err
 	}
 	s.Close()
-	data, err := ioutil.ReadAll(s)
+	data, err := io.ReadAll(s)
 	if err != nil {
 		return err
 	}

diff --git a/examples/ipfs-camp-2019/06-Pubsub/protocol.go b/examples/ipfs-camp-2019/06-Pubsub/protocol.go
@@ -2,13 +2,11 @@ package main
 
 import (
 	"bufio"
+	"context"
 	"fmt"
+	"io"
 	"os"
 
-	"context"
-
-	"io/ioutil"
-
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/protocol"
@@ -19,7 +17,7 @@ const chatProtocol = protocol.ID("/libp2p/chat/1.0.0")
 // TODO: Replace this handler with a function that handles message from a
 // pubsub Subscribe channel.
 func chatHandler(s network.Stream) {
-	data, err := ioutil.ReadAll(s)
+	data, err := io.ReadAll(s)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 	}
@@ -42,7 +40,7 @@ func chatSend(msg string, s network.Stream) error {
 		return err
 	}
 	s.Close()
-	data, err := ioutil.ReadAll(s)
+	data, err := io.ReadAll(s)
 	if err != nil {
 		return err
 	}

diff --git a/examples/multipro/echo.go b/examples/multipro/echo.go
@@ -2,14 +2,14 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/network"
 
 	"github.com/gogo/protobuf/proto"
-	uuid "github.com/google/uuid"
+	"github.com/google/uuid"
 	pb "github.com/libp2p/go-libp2p/examples/multipro/pb"
 )
 
@@ -39,7 +39,7 @@ func (e *EchoProtocol) onEchoRequest(s network.Stream) {
 
 	// get request data
 	data := &pb.EchoRequest{}
-	buf, err := ioutil.ReadAll(s)
+	buf, err := io.ReadAll(s)
 	if err != nil {
 		s.Reset()
 		log.Println(err)
@@ -93,7 +93,7 @@ func (e *EchoProtocol) onEchoRequest(s network.Stream) {
 func (e *EchoProtocol) onEchoResponse(s network.Stream) {
 
 	data := &pb.EchoResponse{}
-	buf, err := ioutil.ReadAll(s)
+	buf, err := io.ReadAll(s)
 	if err != nil {
 		s.Reset()
 		log.Println(err)

diff --git a/examples/multipro/ping.go b/examples/multipro/ping.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 
 	"github.com/libp2p/go-libp2p-core/host"
@@ -36,7 +36,7 @@ func (p *PingProtocol) onPingRequest(s network.Stream) {
 
 	// get request data
 	data := &p2p.PingRequest{}
-	buf, err := ioutil.ReadAll(s)
+	buf, err := io.ReadAll(s)
 	if err != nil {
 		s.Reset()
 		log.Println(err)
@@ -88,7 +88,7 @@ func (p *PingProtocol) onPingRequest(s network.Stream) {
 // remote ping response handler
 func (p *PingProtocol) onPingResponse(s network.Stream) {
 	data := &p2p.PingResponse{}
-	buf, err := ioutil.ReadAll(s)
+	buf, err := io.ReadAll(s)
 	if err != nil {
 		s.Reset()
 		log.Println(err)

diff --git a/examples/routed-echo/bootstrap.go b/examples/routed-echo/bootstrap.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"sync"
@@ -47,7 +47,7 @@ func getLocalPeerInfo() []peer.AddrInfo {
 	if err != nil {
 		log.Fatalln(err)
 	}
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Fatalln(err)
 	}

diff --git a/examples/routed-echo/main.go b/examples/routed-echo/main.go
@@ -7,7 +7,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	mrand "math/rand"
 
@@ -173,7 +172,7 @@ func main() {
 		log.Fatalln(err)
 	}
 
-	out, err := ioutil.ReadAll(s)
+	out, err := io.ReadAll(s)
 	if err != nil {
 		log.Fatalln(err)
 	}

diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"reflect"
 	"strings"
 	"sync"
@@ -490,7 +489,7 @@ func TestProtoDowngrade(t *testing.T) {
 	connectedOn := make(chan protocol.ID)
 	h2.SetStreamHandler("/testing/1.0.0", func(s network.Stream) {
 		defer s.Close()
-		result, err := ioutil.ReadAll(s)
+		result, err := io.ReadAll(s)
 		assert.NoError(t, err)
 		assert.Equal(t, string(result), "bar")
 		connectedOn <- s.Protocol()
@@ -511,7 +510,7 @@ func TestProtoDowngrade(t *testing.T) {
 	h2.RemoveStreamHandler("/testing/1.0.0")
 	h2.SetStreamHandler("/testing", func(s network.Stream) {
 		defer s.Close()
-		result, err := ioutil.ReadAll(s)
+		result, err := io.ReadAll(s)
 		assert.NoError(t, err)
 		assert.Equal(t, string(result), "foo")
 		connectedOn <- s.Protocol()

diff --git a/p2p/host/peerstore/pstoreds/ds_test.go b/p2p/host/peerstore/pstoreds/ds_test.go
@@ -2,7 +2,6 @@ package pstoreds
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -106,7 +105,7 @@ func BenchmarkDsPeerstore(b *testing.B) {
 //
 //lint:ignore U1000 disabled for now
 func badgerStore(tb testing.TB) (ds.Batching, func()) {
-	dataPath, err := ioutil.TempDir(os.TempDir(), "badger")
+	dataPath, err := os.MkdirTemp(os.TempDir(), "badger")
 	if err != nil {
 		tb.Fatal(err)
 	}

diff --git a/p2p/muxer/yamux/transport.go b/p2p/muxer/yamux/transport.go
@@ -1,7 +1,7 @@
 package yamux
 
 import (
-	"io/ioutil"
+	"io"
 	"math"
 	"net"
 
@@ -21,7 +21,7 @@ func init() {
 	// totally unacceptable.
 	config.MaxStreamWindowSize = uint32(16 * 1024 * 1024)
 	// don't spam
-	config.LogOutput = ioutil.Discard
+	config.LogOutput = io.Discard
 	// We always run over a security transport that buffers internally
 	// (i.e., uses a block cipher).
 	config.ReadBufSize = 0

diff --git a/p2p/net/swarm/swarm_net_test.go b/p2p/net/swarm/swarm_net_test.go
@@ -3,7 +3,7 @@ package swarm_test
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -115,7 +115,7 @@ func TestNetworkOpenStream(t *testing.T) {
 		defer close(done)
 		defer s.Close()
 
-		buf, err := ioutil.ReadAll(s)
+		buf, err := io.ReadAll(s)
 		if err != nil {
 			t.Error(err)
 			return

diff --git a/p2p/protocol/internal/circuitv1-deprecated/relay_test.go b/p2p/protocol/internal/circuitv1-deprecated/relay_test.go
@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"testing"
 	"time"
@@ -191,7 +190,7 @@ func TestRelayReset(t *testing.T) {
 
 	close(ready)
 
-	_, err = ioutil.ReadAll(con)
+	_, err = io.ReadAll(con)
 	if err == nil {
 		t.Fatal("expected error for reset relayed connection")
 	}

diff --git a/p2p/protocol/internal/circuitv1-deprecated/transport_test.go b/p2p/protocol/internal/circuitv1-deprecated/transport_test.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -87,7 +87,7 @@ func TestFullAddressTransportDial(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(s)
+	data, err := io.ReadAll(s)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -120,7 +120,7 @@ func TestSpecificRelayTransportDial(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, err := ioutil.ReadAll(s)
+	data, err := io.ReadAll(s)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/p2p/security/noise/benchmark_test.go b/p2p/security/noise/benchmark_test.go
@@ -3,7 +3,6 @@ package noise
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net"
 	"testing"
@@ -178,7 +177,7 @@ func benchDataTransfer(b *benchenv, dataSize int64, m testMode) {
 		case readBufferLtPlainText:
 			rbuf = make([]byte, len(plainTextBufs[i])-2)
 		}
-		writeTos[i] = &discardWithBuffer{rbuf, ioutil.Discard}
+		writeTos[i] = &discardWithBuffer{rbuf, io.Discard}
 	}
 
 	b.ResetTimer()

diff --git a/p2p/security/tls/cmd/tlsdiag/client.go b/p2p/security/tls/cmd/tlsdiag/client.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"time"
 
@@ -54,7 +54,7 @@ func StartClient() error {
 		return err
 	}
 	fmt.Printf("Authenticated server: %s\n", sconn.RemotePeer().Pretty())
-	data, err := ioutil.ReadAll(sconn)
+	data, err := io.ReadAll(sconn)
 	if err != nil {
 		return err
 	}

diff --git a/p2p/transport/quic/cmd/client/main.go b/p2p/transport/quic/cmd/client/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"crypto/rand"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -62,7 +62,7 @@ func run(raddr string, p string) error {
 	if err := str.CloseWrite(); err != nil {
 		return err
 	}
-	data, err := ioutil.ReadAll(str)
+	data, err := io.ReadAll(str)
 	if err != nil {
 		return err
 	}

diff --git a/p2p/transport/quic/cmd/server/main.go b/p2p/transport/quic/cmd/server/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"crypto/rand"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -67,7 +67,7 @@ func handleConn(conn tpt.CapableConn) error {
 	if err != nil {
 		return err
 	}
-	data, err := ioutil.ReadAll(str)
+	data, err := io.ReadAll(str)
 	if err != nil {
 		return err
 	}