FAB-16051 MSP IDENTITY Principal Deserialization

Jason Yellick · Jason Yellick · commit 88bc15d18ff1 · 2019-07-23T16:46:32.000-04:00
There is a comment in the proto translation extensions for the MSP
principal indicating that once the Identity proto is moved from the MSP
impl to the protos dir, we can appropriately deserialize.  This move has
occurred so the serialization can now be fixed.

Change-Id: I8e13fe699c35183cb9f2056ebe3f3a3f19a7e3f8
Signed-off-by: Jason Yellick &lt;jyellick@us.ibm.com&gt;
diff --git a/common/tools/protolator/protoext/mspext/msp_principal.go b/common/tools/protolator/protoext/mspext/msp_principal.go
@@ -33,7 +33,7 @@ func (mp *MSPPrincipal) VariablyOpaqueFieldProto(name string) (proto.Message, er
 	case msp.MSPPrincipal_ORGANIZATION_UNIT:
 		return &msp.OrganizationUnit{}, nil
 	case msp.MSPPrincipal_IDENTITY:
-		return nil, fmt.Errorf("unable to decode MSP type IDENTITY until the protos are fixed to include the IDENTITY proto in protos/msp")
+		return &msp.SerializedIdentity{}, nil
 	default:
 		return nil, fmt.Errorf("unable to decode MSP type: %v", mp.PrincipalClassification)
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (mp *MSPPrincipal) VariablyOpaqueFieldProto(name string) (proto.Message, er`
`33`	`33`	`case msp.MSPPrincipal_ORGANIZATION_UNIT:`
`34`	`34`	`return &msp.OrganizationUnit{}, nil`
`35`	`35`	`case msp.MSPPrincipal_IDENTITY:`
`36`		`- return nil, fmt.Errorf("unable to decode MSP type IDENTITY until the protos are fixed to include the IDENTITY proto in protos/msp")`
	`36`	`+ return &msp.SerializedIdentity{}, nil`
`37`	`37`	`default:`
`38`	`38`	`return nil, fmt.Errorf("unable to decode MSP type: %v", mp.PrincipalClassification)`
`39`	`39`	`}`