[FAB-2693] (PA) Move identities.proto to proto/msp

This is intended for (PA) post-alpha.

https://jira.hyperledger.org/browse/FAB-2693

For some reason, identities.proto is still in fabric/msp rather than in
protos/msp/.  This CR fixes this bug.

Change-Id: I3b337af8f4302866fbeb73d3a7fc5f8f586d5c37
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

core/peer/peer.go

@@ -39,6 +39,7 @@ import (
 	"github.com/hyperledger/fabric/msp"
 	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
+	mspprotos "github.com/hyperledger/fabric/protos/msp"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"
@@ -368,7 +369,7 @@ func buildTrustedRootsForChain(cm configtxapi.Manager) {
 				for _, root := range v.GetRootCerts() {
 					sid, err := root.Serialize()
 					if err == nil {
-						id := &msp.SerializedIdentity{}
+						id := &mspprotos.SerializedIdentity{}
 						err = proto.Unmarshal(sid, id)
 						if err == nil {
 							appRootCAs = append(appRootCAs, id.IdBytes)
@@ -378,7 +379,7 @@ func buildTrustedRootsForChain(cm configtxapi.Manager) {
 				for _, intermediate := range v.GetIntermediateCerts() {
 					sid, err := intermediate.Serialize()
 					if err == nil {
-						id := &msp.SerializedIdentity{}
+						id := &mspprotos.SerializedIdentity{}
 						err = proto.Unmarshal(sid, id)
 						if err == nil {
 							appRootCAs = append(appRootCAs, id.IdBytes)

msp/identities.go

@@ -28,6 +28,7 @@ import (
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/hyperledger/fabric/bccsp/signer"
 	"github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/msp"
 	"github.com/op/go-logging"
 )
 
@@ -86,7 +87,7 @@ func (id *identity) GetOrganizationalUnits() []string {
 func NewSerializedIdentity(mspID string, certPEM []byte) ([]byte, error) {
 	// We serialize identities by prepending the MSPID
 	// and appending the x509 cert in PEM format
-	sId := &SerializedIdentity{Mspid: mspID, IdBytes: certPEM}
+	sId := &msp.SerializedIdentity{Mspid: mspID, IdBytes: certPEM}
 	raw, err := proto.Marshal(sId)
 	if err != nil {
 		return nil, fmt.Errorf("Failed serializing identity [%s][% X]: [%s]", mspID, certPEM, err)
@@ -143,7 +144,7 @@ func (id *identity) Serialize() ([]byte, error) {
 	}
 
 	// We serialize identities by prepending the MSPID and appending the ASN.1 DER content of the cert
-	sId := &SerializedIdentity{Mspid: id.id.Mspid, IdBytes: pemBytes}
+	sId := &msp.SerializedIdentity{Mspid: id.id.Mspid, IdBytes: pemBytes}
 	idBytes, err := proto.Marshal(sId)
 	if err != nil {
 		return nil, fmt.Errorf("Could not marshal a SerializedIdentity structure for identity %s, err %s", id.id, err)

msp/msp_test.go

@@ -130,7 +130,7 @@ func TestSerializeIdentitiesWithWrongMSP(t *testing.T) {
 		return
 	}
 
-	sid := &SerializedIdentity{}
+	sid := &msp.SerializedIdentity{}
 	err = proto.Unmarshal(serializedID, sid)
 	assert.NoError(t, err)
 
@@ -159,7 +159,7 @@ func TestSerializeIdentitiesWithMSPManager(t *testing.T) {
 	_, err = mspMgr.DeserializeIdentity(serializedID)
 	assert.NoError(t, err)
 
-	sid := &SerializedIdentity{}
+	sid := &msp.SerializedIdentity{}
 	err = proto.Unmarshal(serializedID, sid)
 	assert.NoError(t, err)
 

msp/mspimpl.go

@@ -481,7 +481,7 @@ func (msp *bccspmsp) DeserializeIdentity(serializedID []byte) (Identity, error)
 	mspLogger.Infof("Obtaining identity")
 
 	// We first deserialize to a SerializedIdentity to get the MSP ID
-	sId := &SerializedIdentity{}
+	sId := &m.SerializedIdentity{}
 	err := proto.Unmarshal(serializedID, sId)
 	if err != nil {
 		return nil, fmt.Errorf("Could not deserialize a SerializedIdentity, err %s", err)

msp/mspmgrimpl.go

@@ -19,6 +19,8 @@ package msp
 import (
 	"fmt"
 
+	"github.com/hyperledger/fabric/protos/msp"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/op/go-logging"
 )
@@ -84,7 +86,7 @@ func (mgr *mspManagerImpl) GetMSPs() (map[string]MSP, error) {
 // DeserializeIdentity returns an identity given its serialized version supplied as argument
 func (mgr *mspManagerImpl) DeserializeIdentity(serializedID []byte) (Identity, error) {
 	// We first deserialize to a SerializedIdentity to get the MSP ID
-	sId := &SerializedIdentity{}
+	sId := &msp.SerializedIdentity{}
 	err := proto.Unmarshal(serializedID, sId)
 	if err != nil {
 		return nil, fmt.Errorf("Could not deserialize a SerializedIdentity, err %s", err)

msp/identities.proto → protos/msp/identities.proto

@@ -16,7 +16,7 @@ limitations under the License.
 
 syntax = "proto3";
 
-option go_package = "github.com/hyperledger/fabric/msp";
+option go_package = "github.com/hyperledger/fabric/protos/msp";
 
 package msp;