Fixups

Author: gdbelvin

cmd/keytransparency-server/main.go

@@ -181,7 +181,7 @@ func main() {
 		glog.Exitf("grpc.Dial(%v): %v", *mapURL, err)
 	}
 	tmap := trillian.NewTrillianMapClient(mconn)
-	tadmin = trillian.NewTrillianAdminClient(mconn)
+	tadmin := trillian.NewTrillianAdminClient(mconn)
 
 	// Create gRPC server.
 	svr := keyserver.New(*logID, tlog, *mapID, tmap, tadmin, commitments,

core/client/kt/verify.go

@@ -47,21 +47,18 @@ var (
 
 // Verifier is a client helper library for verifying request and responses.
 type Verifier struct {
-	mapID  int64
 	vrf    vrf.PublicKey
 	hasher hashers.MapHasher
 	sig    crypto.PublicKey
 	log    client.LogVerifier
 }
 
 // New creates a new instance of the client verifier.
-func New(mapID int64,
-	vrf vrf.PublicKey,
+func New(vrf vrf.PublicKey,
 	hasher hashers.MapHasher,
 	sig crypto.PublicKey,
 	log client.LogVerifier) *Verifier {
 	return &Verifier{
-		mapID:  mapID,
 		vrf:    vrf,
 		hasher: hasher,
 		sig:    sig,

core/tree/sparse/common_test.go

@@ -22,15 +22,15 @@ import (
 
 func TestComputeNodeValues(t *testing.T) {
 	for _, tc := range []struct {
-		bindex    string
-		leafHash  []byte
-		neighbors []Hash
-		expected  []string
+		bindex      string
+		leafHash    []byte
+		neighbors   []Hash
+		expectedLen int
 	}{
-		{"0100", []byte(""), make([]Hash, 4), []string{"0100", "010", "01", "0", ""}},
+		{"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", []byte(""), make([]Hash, 256), 256},
 	} {
 		actual := NodeValues(0, coniks.Default, tc.bindex, tc.leafHash, tc.neighbors)
-		if got, want := len(actual), len(tc.expected); got != want {
+		if got, want := len(actual), tc.expectedLen; got != want {
 			t.Errorf("len(%v)=%v, want %v", actual, got, want)
 		}
 	}

integration/client_test.go

@@ -259,7 +259,7 @@ func (e *Env) setupHistory(ctx context.Context, userID string, signers []signatu
 	// did not submit a new profile in that epoch, or contains the profile
 	// that the user is submitting. The user profile history contains the
 	// following profiles:
-	// [nil, nil, 1, 2, 2, 2, 3, 3, 4, 5, 5, 5, 5, 5, 5, 6, 6, 5, 7, 7].
+	// [nil, 1, 2, 2, 2, 3, 3, 4, 5, 5, 5, 5, 5, 5, 6, 6, 5, 7, 7].
 	// Note that profile 5 is submitted twice by the user to test that
 	// filtering case.
 	for i, p := range [][]byte{