X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=blobdiff_plain;f=src%2Ftoss_test.go;h=aea765d9ec602057ec9cc6193966bf374417a823;hp=966b2b84ae4a0914d42ad2681e64dbca6b4e4bc1;hb=beefc4fd7137435caf9c653633ab938947df07f8;hpb=7243c73e65e260476dc6ddb900b2d3367583aebc

diff --git a/src/toss_test.go b/src/toss_test.go
index 966b2b8..aea765d 100644
--- a/src/toss_test.go
+++ b/src/toss_test.go
@@ -22,7 +22,6 @@ import (
 	"crypto/rand"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -56,7 +55,7 @@ func TestTossExec(t *testing.T) {
 		for i, recipient := range recipients {
 			recipients[i] = recipient % 8
 		}
-		spool, err := ioutil.TempDir("", "testtoss")
+		spool, err := os.MkdirTemp("", "testtoss")
 		if err != nil {
 			panic(err)
 		}
@@ -138,7 +137,7 @@ func TestTossExec(t *testing.T) {
 				return false
 			}
 		}
-		mbox, err := ioutil.ReadFile(filepath.Join(spool, "mbox"))
+		mbox, err := os.ReadFile(filepath.Join(spool, "mbox"))
 		if err != nil {
 			return false
 		}
@@ -174,7 +173,7 @@ func TestTossFile(t *testing.T) {
 			}
 			files[strconv.Itoa(i)] = data
 		}
-		spool, err := ioutil.TempDir("", "testtoss")
+		spool, err := os.MkdirTemp("", "testtoss")
 		if err != nil {
 			panic(err)
 		}
@@ -200,7 +199,7 @@ func TestTossFile(t *testing.T) {
 			hasher.Write(fileData)
 			fileName := Base32Codec.EncodeToString(hasher.Sum(nil))
 			src := filepath.Join(spool, fileName)
-			if err := ioutil.WriteFile(src, fileData, os.FileMode(0600)); err != nil {
+			if err := os.WriteFile(src, fileData, os.FileMode(0600)); err != nil {
 				panic(err)
 			}
 			if err := ctx.TxFile(
@@ -236,7 +235,7 @@ func TestTossFile(t *testing.T) {
 			hasher := MTHNew(0, 0)
 			hasher.Write(fileData)
 			fileName := Base32Codec.EncodeToString(hasher.Sum(nil))
-			data, err := ioutil.ReadFile(filepath.Join(incomingPath, fileName))
+			data, err := os.ReadFile(filepath.Join(incomingPath, fileName))
 			if err != nil {
 				panic(err)
 			}
@@ -254,7 +253,7 @@ func TestTossFile(t *testing.T) {
 func TestTossFileSameName(t *testing.T) {
 	f := func(filesRaw uint8) bool {
 		files := int(filesRaw)%8 + 1
-		spool, err := ioutil.TempDir("", "testtoss")
+		spool, err := os.MkdirTemp("", "testtoss")
 		if err != nil {
 			panic(err)
 		}
@@ -275,7 +274,7 @@ func TestTossFileSameName(t *testing.T) {
 		}
 		ctx.Neigh[*nodeOur.Id] = nodeOur.Their()
 		srcPath := filepath.Join(spool, "junk")
-		if err = ioutil.WriteFile(
+		if err = os.WriteFile(
 			srcPath,
 			[]byte("doesnotmatter"),
 			os.FileMode(0600),
@@ -327,7 +326,7 @@ func TestTossFreq(t *testing.T) {
 		if len(fileSizes) == 0 {
 			return true
 		}
-		spool, err := ioutil.TempDir("", "testtoss")
+		spool, err := os.MkdirTemp("", "testtoss")
 		if err != nil {
 			panic(err)
 		}
@@ -387,7 +386,7 @@ func TestTossFreq(t *testing.T) {
 			return false
 		}
 		for fileName, fileData := range files {
-			if err := ioutil.WriteFile(
+			if err := os.WriteFile(
 				filepath.Join(spool, fileName),
 				fileData,
 				os.FileMode(0600),
@@ -445,7 +444,7 @@ func TestTossTrns(t *testing.T) {
 			}
 			datum[i] = data
 		}
-		spool, err := ioutil.TempDir("", "testtoss")
+		spool, err := os.MkdirTemp("", "testtoss")
 		if err != nil {
 			panic(err)
 		}
@@ -491,7 +490,7 @@ func TestTossTrns(t *testing.T) {
 			}
 			hasher := MTHNew(0, 0)
 			hasher.Write(dst.Bytes())
-			if err := ioutil.WriteFile(
+			if err := os.WriteFile(
 				filepath.Join(rxPath, Base32Codec.EncodeToString(hasher.Sum(nil))),
 				dst.Bytes(),
 				os.FileMode(0600),
@@ -505,7 +504,7 @@ func TestTossTrns(t *testing.T) {
 			return false
 		}
 		for _, filename := range dirFiles(txPath) {
-			dataRead, err := ioutil.ReadFile(filepath.Join(txPath, filename))
+			dataRead, err := os.ReadFile(filepath.Join(txPath, filename))
 			if err != nil {
 				panic(err)
 			}