fix: stop using the deprecated io/ioutil package

ipfs · Aug 14, 2023 · 55ef175 · 55ef175
1 parent 4acf3fc
commit 55ef175
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/internal/stores/filestore_test.go b/internal/stores/filestore_test.go
@@ -3,7 +3,6 @@ package stores
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -112,7 +111,7 @@ func dagToNormalFile(t *testing.T, ctx context.Context, root cid.Cid, bs bstore.
 		return nil, err
 	}
 
-	finalBytes, err := ioutil.ReadAll(outputF)
+	finalBytes, err := io.ReadAll(outputF)
 	if err != nil {
 		return nil, err
 	}
@@ -136,7 +135,7 @@ func createFile(t *testing.T, rseed int64, size int64) (path string, contents []
 
 	_, err = file.Seek(0, io.SeekStart)
 	require.NoError(t, err)
-	bz, err := ioutil.ReadAll(file)
+	bz, err := io.ReadAll(file)
 	require.NoError(t, err)
 	require.NoError(t, file.Close())
 

diff --git a/internal/stores/kvcarbs.go b/internal/stores/kvcarbs.go
@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"sync"
 
@@ -331,10 +330,10 @@ func (drsb *discardingReadSeekerPlusByte) Seek(offset int64, whence int) (int64,
 		if n < 0 {
 			panic("unsupported rewind via whence: io.SeekStart")
 		}
-		_, err := io.CopyN(ioutil.Discard, drsb, n)
+		_, err := io.CopyN(io.Discard, drsb, n)
 		return drsb.offset, err
 	case io.SeekCurrent:
-		_, err := io.CopyN(ioutil.Discard, drsb, offset)
+		_, err := io.CopyN(io.Discard, drsb, offset)
 		return drsb.offset, err
 	default:
 		panic("unsupported whence: io.SeekEnd")

diff --git a/pkg/unixfsstore/sql/dirlinks_test.go b/pkg/unixfsstore/sql/dirlinks_test.go
@@ -3,7 +3,7 @@ package sql_test
 import (
 	"context"
 	"database/sql"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/ipfs/go-cid"
@@ -129,7 +129,7 @@ func TestDirLinksDB(t *testing.T) {
 }
 
 func CreateTestTmpDB(t *testing.T) *sql.DB {
-	f, err := ioutil.TempFile(t.TempDir(), "*.db")
+	f, err := os.CreateTemp(t.TempDir(), "*.db")
 	require.NoError(t, err)
 	require.NoError(t, f.Close())
 	d, err := ufssql.SqlDB(f.Name())