compile again

Author: liamsi

core/monitor/verify.go

@@ -19,9 +19,9 @@
 package monitor
 
 import (
-	"fmt"
 	"crypto"
 	"errors"
+	"fmt"
 
 	"github.com/golang/glog"
 
@@ -82,7 +82,6 @@ func VerifyResponse(logPubKey, mapPubKey crypto.PublicKey, resp *ktpb.GetMutatio
 	return errors.New("TODO: implement verification logic")
 }
 
-
 func verifyMutations(muts []*ktpb.Mutation, expectedRoot []byte) error {
 	// TODO: export applyMutations in CreateEpoch / signer.go?
 	//
@@ -103,8 +102,11 @@ func verifyMutations(muts []*ktpb.Mutation, expectedRoot []byte) error {
 		//	glog.Errorf("VerifyMapInclusionProof(%x): %v", index, err)
 		//	return ErrInvalidMutation
 		//}
-
-		newLeaf, err := mutator.Mutate(m.GetProof().GetLeaf().GetLeafValue(), m.GetUpdate())
+		leafVal, err := entry.FromLeafValue(m.GetProof().GetLeaf().GetLeafValue())
+		if err != nil {
+			return ErrInvalidMutation
+		}
+		newLeaf, err := mutator.Mutate(leafVal, m.GetUpdate())
 		if err != nil {
 			// TODO(ismail): do not return; collect other errors if any
 			return ErrInvalidMutation
@@ -139,8 +141,6 @@ func verifyMutations(muts []*ktpb.Mutation, expectedRoot []byte) error {
 
 	}
 
-
-
 	// compute the new leaf and store the intermediate hashes locally.
 	// compute the new root using local intermediate hashes from epoch e.
 	// verify rootHash

core/monitor/verify_test.go

@@ -14,24 +14,9 @@
 
 package monitor
 
-import (
-	"testing"
-	"github.com/google/trillian/merkle"
-	"fmt"
-)
-
-
 // TODO(ismail): write extensive tests for verification steps (if not existing
 // in trillian)
 const (
 	emptyMapRootB64 = "xmifEIEqCYCXbZUz2Dh1KCFmFZVn7DUVVxbBQTr1PWo="
-	mapID          = int64(0)
+	mapID           = int64(0)
 )
-
-func TestServerVerifyMutations(t *testing.T) {
-	// verifyInclusionProof for empty leaf
-	if err := merkle.VerifyMapInclusionProof(mapID, index,
-		leafHash, rootHash, proof, hasher); err != nil {
-		return fmt.Errorf("VerifyMapInclusionProof(%x): %v", index, err)
-	}
-}

impl/monitor/monitor.go

@@ -35,9 +35,8 @@ import (
 	tcrypto "github.com/google/trillian/crypto"
 
 	cmon "github.com/google/keytransparency/core/monitor"
-	mopb "github.com/google/keytransparency/core/proto/monitor_v1_types"
 	ktpb "github.com/google/keytransparency/core/proto/keytransparency_v1_types"
-
+	mopb "github.com/google/keytransparency/core/proto/monitor_v1_types"
 
 	mupb "github.com/google/keytransparency/impl/proto/mutation_v1_service"
 )