SubtreeConsitency fuzztest + rename Consistency fuzztest args

Author: phbnf

testonly/tree_fuzz_test.go

@@ -12,32 +12,32 @@ import (
 
 // Compute and verify consistency proofs
 func FuzzConsistencyProofAndVerify(f *testing.F) {
-	for size := 1; size <= 8; size++ {
-		for end := 1; end <= size; end++ {
-			for begin := 1; begin <= end; begin++ {
-				f.Add(uint64(size), uint64(begin), uint64(end))
+	for tSize := 1; tSize <= 8; tSize++ {
+		for first := 1; first <= tSize; first++ {
+			for second := 1; second <= first; second++ {
+				f.Add(uint64(tSize), uint64(second), uint64(first))
 			}
 		}
 	}
-	f.Fuzz(func(t *testing.T, size, begin, end uint64) {
+	f.Fuzz(func(t *testing.T, tSize, first, second uint64) {
 		// necessary to restrict size for compile_native_go_fuzzer
-		if size >= math.MaxUint16 {
+		if tSize >= math.MaxUint16 {
 			return
 		}
-		t.Logf("size=%d, begin=%d, end=%d", size, begin, end)
-		if begin > end || end > size {
+		t.Logf("size=%d, begin=%d, end=%d", tSize, first, second)
+		if first > second || second > tSize {
 			return
 		}
-		if begin == 0 {
+		if first == 0 {
 			return
 		}
-		tree := newTree(genEntries(size))
-		p, err := tree.ConsistencyProof(begin, end)
+		tree := newTree(genEntries(tSize))
+		p, err := tree.ConsistencyProof(first, second)
 		t.Logf("proof=%v", p)
 		if err != nil {
 			t.Error(err)
 		}
-		err = proof.VerifyConsistency(tree.hasher, begin, end, p, tree.HashAt(begin), tree.HashAt(end))
+		err = proof.VerifyConsistency(tree.hasher, first, second, p, tree.HashAt(first), tree.HashAt(second))
 		if err != nil {
 			t.Error(err)
 		}
@@ -70,6 +70,9 @@ func FuzzSubtreeConsistencyProofAndVerify(f *testing.F) {
 		if begin > end || end > size {
 			return
 		}
+		if begin == 0 && end > 0 {
+			return
+		}
 		tree := newTree(genEntries(treeSize))
 		p, err := tree.SubtreeConsistencyProof(begin, end, size)
 		t.Logf("proof=%v", p)