Adjust tests for off-by-one TreeRevision starts at 1 now

Author: gdbelvin

core/tree/sparse/common.go

@@ -47,8 +47,8 @@ func NodeValues(mapID int64, hasher hashers.MapHasher, bindex string, value []by
 	levels := len(bindex) + 1
 	steps := len(bindex)
 	nodeValues := make([]Hash, levels)
-	index, depth := tree.InvertBitString(bindex)
-	nodeValues[0] = hasher.HashLeaf(mapID, index, depth, value)
+	index, _ := tree.InvertBitString(bindex)
+	nodeValues[0] = hasher.HashLeaf(mapID, index, value)
 	// assert len(nbrValues) == levels - 1
 	for i := 0; i < steps; i++ {
 		// Is the last node 0 or 1?

core/tree/sparse/common_test.go

@@ -16,6 +16,8 @@ package sparse
 
 import (
 	"testing"
+
+	"github.com/google/trillian/merkle/coniks"
 )
 
 func TestComputeNodeValues(t *testing.T) {
@@ -27,7 +29,7 @@ func TestComputeNodeValues(t *testing.T) {
 	}{
 		{"0100", []byte(""), make([]Hash, 4), []string{"0100", "010", "01", "0", ""}},
 	} {
-		actual := NodeValues(0, CONIKSHasher, tc.bindex, tc.leafHash, tc.neighbors)
+		actual := NodeValues(0, coniks.Default, tc.bindex, tc.leafHash, tc.neighbors)
 		if got, want := len(actual), len(tc.expected); got != want {
 			t.Errorf("len(%v)=%v, want %v", actual, got, want)
 		}

integration/client_test.go

@@ -249,7 +249,7 @@ func TestListHistory(t *testing.T) {
 		}
 
 		if got := sortHistory(resp); !reflect.DeepEqual(got, tc.wantHistory) {
-			t.Errorf("ListHistory(%v, %v): \n%v, want \n%v", tc.start, tc.end, got, tc.wantHistory)
+			t.Errorf("ListHistory(%v, %v): %x, want %x", tc.start, tc.end, got, tc.wantHistory)
 		}
 	}
 }
@@ -263,7 +263,7 @@ func (e *Env) setupHistory(ctx context.Context, userID string, signers []signatu
 	// Note that profile 5 is submitted twice by the user to test that
 	// filtering case.
 	for i, p := range [][]byte{
-		nil, nil, cp(1), cp(2), nil, nil, cp(3), nil,
+		nil, cp(1), cp(2), nil, nil, cp(3), nil,
 		cp(4), cp(5), cp(5), nil, nil, nil, nil, cp(6),
 		nil, cp(5), cp(7), nil,
 	} {