X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fmth_test.go;h=f3c5dfe702875bbde1a7d2b322b7dd91e10bac5a;hb=HEAD;hp=a4737c09d7efbf6399420ecefc25d04eed074703;hpb=3ccbb7d242629d0873ba75313461f7d447d5e0e8;p=nncp.git

diff --git a/src/mth_test.go b/src/mth_test.go
index a4737c0..fcdff17 100644
--- a/src/mth_test.go
+++ b/src/mth_test.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 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
@@ -26,7 +26,7 @@ import (
 	"lukechampine.com/blake3"
 )
 
-func TestMTHFatSymmetric(t *testing.T) {
+func TestMTHSeqSymmetric(t *testing.T) {
 	xof := blake3.New(32, nil).XOF()
 	f := func(size uint32, offset uint32) bool {
 		size %= 2 * 1024 * 1024
@@ -36,57 +36,53 @@ func TestMTHFatSymmetric(t *testing.T) {
 		}
 		offset = offset % size
 
-		mth := MTHFatNew(int64(size), 0)
+		mth := MTHSeqNew(int64(size), 0)
 		if _, err := io.Copy(mth, bytes.NewReader(data)); err != nil {
 			panic(err)
 		}
 		hsh0 := mth.Sum(nil)
 
-		mth = MTHFatNew(int64(size), int64(offset))
+		mth = MTHSeqNew(int64(size), int64(offset))
 		if _, err := io.Copy(mth, bytes.NewReader(data[int(offset):])); err != nil {
 			panic(err)
 		}
-		if _, err := mth.PrependFrom(bytes.NewReader(data)); err != nil {
+		if _, err := mth.PreaddFrom(bytes.NewReader(data), "", false); err != nil {
 			panic(err)
 		}
-		if bytes.Compare(hsh0, mth.Sum(nil)) != 0 {
+		if !bytes.Equal(hsh0, mth.Sum(nil)) {
 			return false
 		}
 
-		mth = MTHFatNew(0, 0)
+		mth = MTHSeqNew(0, 0)
 		mth.Write(data)
-		if bytes.Compare(hsh0, mth.Sum(nil)) != 0 {
+		if !bytes.Equal(hsh0, mth.Sum(nil)) {
 			return false
 		}
 
 		data = append(data, 0)
-		mth = MTHFatNew(int64(size)+1, 0)
+		mth = MTHSeqNew(int64(size)+1, 0)
 		if _, err := io.Copy(mth, bytes.NewReader(data)); err != nil {
 			panic(err)
 		}
 		hsh00 := mth.Sum(nil)
-		if bytes.Compare(hsh0, hsh00) == 0 {
+		if bytes.Equal(hsh0, hsh00) {
 			return false
 		}
 
-		mth = MTHFatNew(int64(size)+1, int64(offset))
+		mth = MTHSeqNew(int64(size)+1, int64(offset))
 		if _, err := io.Copy(mth, bytes.NewReader(data[int(offset):])); err != nil {
 			panic(err)
 		}
-		if _, err := mth.PrependFrom(bytes.NewReader(data)); err != nil {
+		if _, err := mth.PreaddFrom(bytes.NewReader(data), "", false); err != nil {
 			panic(err)
 		}
-		if bytes.Compare(hsh00, mth.Sum(nil)) != 0 {
+		if !bytes.Equal(hsh00, mth.Sum(nil)) {
 			return false
 		}
 
-		mth = MTHFatNew(0, 0)
+		mth = MTHSeqNew(0, 0)
 		mth.Write(data)
-		if bytes.Compare(hsh00, mth.Sum(nil)) != 0 {
-			return false
-		}
-
-		return true
+		return bytes.Equal(hsh00, mth.Sum(nil))
 	}
 	if err := quick.Check(f, nil); err != nil {
 		t.Error(err)
@@ -101,16 +97,16 @@ func TestMTHSeqAndFatEqual(t *testing.T) {
 		if _, err := io.ReadFull(xof, data); err != nil {
 			panic(err)
 		}
-		fat := MTHFatNew(int64(size), 0)
+		fat := MTHFatNew()
 		if _, err := io.Copy(fat, bytes.NewReader(data)); err != nil {
 			panic(err)
 		}
 		hshFat := fat.Sum(nil)
-		seq := MTHSeqNew()
+		seq := MTHSeqNew(int64(size), 0)
 		if _, err := io.Copy(seq, bytes.NewReader(data)); err != nil {
 			panic(err)
 		}
-		return bytes.Compare(hshFat, seq.Sum(nil)) == 0
+		return bytes.Equal(hshFat, seq.Sum(nil))
 	}
 	if err := quick.Check(f, nil); err != nil {
 		t.Error(err)
@@ -118,17 +114,17 @@ func TestMTHSeqAndFatEqual(t *testing.T) {
 }
 
 func TestMTHNull(t *testing.T) {
-	fat := MTHFatNew(0, 0)
+	fat := MTHFatNew()
 	if _, err := fat.Write(nil); err != nil {
 		t.Error(err)
 	}
 	hshFat := fat.Sum(nil)
 
-	seq := MTHSeqNew()
+	seq := MTHSeqNew(0, 0)
 	if _, err := seq.Write(nil); err != nil {
 		t.Error(err)
 	}
-	if bytes.Compare(hshFat, seq.Sum(nil)) != 0 {
+	if !bytes.Equal(hshFat, seq.Sum(nil)) {
 		t.FailNow()
 	}
 }