X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Ftoss_test.go;h=e2b3145e988e47d8541eb6a5bf4625fbc4d5b4d6;hb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;hp=3a6f29fa36334c0f8924e3c53568e73a64058b69;hpb=2ac16acad8de20005793cbadd61068d38dc3b0ca;p=nncp.git

diff --git a/src/toss_test.go b/src/toss_test.go
index 3a6f29f..e2b3145 100644
--- a/src/toss_test.go
+++ b/src/toss_test.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@ import (
 	"testing/quick"
 
 	xdr "github.com/davecgh/go-xdr/xdr2"
-	"golang.org/x/crypto/blake2b"
 )
 
 var (
@@ -99,6 +98,8 @@ func TestTossExec(t *testing.T) {
 				[]string{"arg0", "arg1"},
 				strings.NewReader("BODY\n"),
 				1<<15,
+				false,
+				false,
 			); err != nil {
 				t.Error(err)
 				return false
@@ -188,8 +189,9 @@ func TestTossFile(t *testing.T) {
 		ctx.Neigh[*nodeOur.Id] = nodeOur.Their()
 		incomingPath := filepath.Join(spool, "incoming")
 		for _, fileData := range files {
-			checksum := blake2b.Sum256(fileData)
-			fileName := ToBase32(checksum[:])
+			hasher := MTHNew(0, 0)
+			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 {
 				panic(err)
@@ -219,8 +221,9 @@ func TestTossFile(t *testing.T) {
 			return false
 		}
 		for _, fileData := range files {
-			checksum := blake2b.Sum256(fileData)
-			fileName := ToBase32(checksum[:])
+			hasher := MTHNew(0, 0)
+			hasher.Write(fileData)
+			fileName := Base32Codec.EncodeToString(hasher.Sum(nil))
 			data, err := ioutil.ReadFile(filepath.Join(incomingPath, fileName))
 			if err != nil {
 				panic(err)
@@ -381,7 +384,12 @@ func TestTossFreq(t *testing.T) {
 		}
 		for job := range ctx.Jobs(ctx.Self.Id, TTx) {
 			var buf bytes.Buffer
-			_, _, err := PktEncRead(ctx.Self, ctx.Neigh, job.Fd, &buf)
+			fd, err := os.Open(job.Path)
+			if err != nil {
+				t.Error(err)
+				return false
+			}
+			_, _, err = PktEncRead(ctx.Self, ctx.Neigh, fd, &buf)
 			if err != nil {
 				t.Error(err)
 				return false
@@ -448,12 +456,11 @@ func TestTossTrns(t *testing.T) {
 			pktTrans := Pkt{
 				Magic:   MagicNNCPPv3,
 				Type:    PktTypeTrns,
-				PathLen: blake2b.Size256,
-				Path:    new([MaxPathSize]byte),
+				PathLen: MTHSize,
 			}
 			copy(pktTrans.Path[:], nodeOur.Id[:])
 			var dst bytes.Buffer
-			if err := PktEncWrite(
+			if _, err := PktEncWrite(
 				ctx.Self,
 				ctx.Neigh[*nodeOur.Id],
 				&pktTrans,
@@ -466,9 +473,10 @@ func TestTossTrns(t *testing.T) {
 				t.Error(err)
 				return false
 			}
-			checksum := blake2b.Sum256(dst.Bytes())
+			hasher := MTHNew(0, 0)
+			hasher.Write(dst.Bytes())
 			if err := ioutil.WriteFile(
-				filepath.Join(rxPath, ToBase32(checksum[:])),
+				filepath.Join(rxPath, Base32Codec.EncodeToString(hasher.Sum(nil))),
 				dst.Bytes(),
 				os.FileMode(0600),
 			); err != nil {