fixup! Replace SignerFactory with global protobuf handlers for keys

Author: Rob Percival

.travis.yml

@@ -9,12 +9,12 @@ go:
   - 1.8
 
 env:
-  - GOFLAGS=""
-  - GOFLAGS="-race"
-  - GOFLAGS=""                     WITH_ETCD=true
-  - GOFLAGS="-race"                WITH_ETCD=true
-  - GOFLAGS="--tags pkcs11"        WITH_PKCS11=true
-  - GOFLAGS=""-race --tags pkcs11" WITH_PKCS11=true
+  - GOFLAGS=''
+  - GOFLAGS='-race'
+  - GOFLAGS=''                    WITH_ETCD=true
+  - GOFLAGS='-race'               WITH_ETCD=true
+  - GOFLAGS='--tags pkcs11'       WITH_PKCS11=true
+  - GOFLAGS='-race --tags pkcs11' WITH_PKCS11=true
 
 matrix:
   fast_finish: true

server/sequencer_manager_test.go

@@ -351,11 +351,11 @@ func createTestInfo(registry extension.Registry) *LogOperationInfo {
 	}
 }
 
-func fakeKeyProtoHandler(pb proto.Message, signer crypto.Signer, err error) (proto.Message, keys.ProtoHandler) {
-	return pb, func(ctx context.Context, pb2 proto.Message) (crypto.Signer, error) {
-		if proto.Equal(pb, pb2) {
+func fakeKeyProtoHandler(wantKeyProto proto.Message, signer crypto.Signer, err error) (proto.Message, keys.ProtoHandler) {
+	return wantKeyProto, func(ctx context.Context, gotKeyProto proto.Message) (crypto.Signer, error) {
+		if proto.Equal(wantKeyProto, gotKeyProto) {
 			return signer, err
 		}
-		return nil, fmt.Errorf("fakeKeyProtoHandler: got %s, want %s", pb2, pb)
+		return nil, fmt.Errorf("fakeKeyProtoHandler: got %s, want %s", gotKeyProto, wantKeyProto)
 	}
 }