FAB-13152 fix make protos

- update go_package path
- update go:generate parameters
- run 'make protos'

Change-Id: Ie7c2825d274c4bcc12cf653d95de5b4fdaef2ade
Signed-off-by: Yoav Tock <tock@il.ibm.com>

common/grpclogging/grpclogging_suite_test.go

@@ -25,7 +25,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-//go:generate protoc --go_out=plugins=grpc:. testpb/echo.proto
+//go:generate protoc --proto_path=$GOPATH/src/github.com/hyperledger/fabric/common/grpclogging/testpb --go_out=plugins=grpc:$GOPATH/src $GOPATH/src/github.com/hyperledger/fabric/common/grpclogging/testpb/echo.proto
 
 func TestGrpclogging(t *testing.T) {
 	RegisterFailHandler(Fail)

common/grpclogging/testpb/echo.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: testpb/echo.proto
+// source: echo.proto
 
-package testpb
+package testpb // import "github.com/hyperledger/fabric/common/grpclogging/testpb"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -35,7 +35,7 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_echo_c06a4742710c8217, []int{0}
+	return fileDescriptor_echo_df132be2fdaf2191, []int{0}
 }
 func (m *Message) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Message.Unmarshal(m, b)
@@ -208,21 +208,24 @@ var _EchoService_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "testpb/echo.proto",
-}
-
-func init() { proto.RegisterFile("testpb/echo.proto", fileDescriptor_echo_c06a4742710c8217) }
-
-var fileDescriptor_echo_c06a4742710c8217 = []byte{
-	// 154 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2c, 0x49, 0x2d, 0x2e,
-	0x29, 0x48, 0xd2, 0x4f, 0x4d, 0xce, 0xc8, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83,
-	0x08, 0x29, 0xd9, 0x73, 0xb1, 0xfb, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0x49, 0x70, 0xb1,
-	0xe7, 0x42, 0x98, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x30, 0xae, 0x90, 0x14, 0x17, 0x47,
-	0x71, 0x6a, 0x61, 0x69, 0x6a, 0x5e, 0x72, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x9c,
-	0x6f, 0x94, 0xcd, 0xc5, 0xed, 0x9a, 0x9c, 0x91, 0x1f, 0x9c, 0x5a, 0x54, 0x96, 0x99, 0x9c, 0x2a,
-	0xa4, 0xc1, 0xc5, 0x02, 0xe2, 0x0a, 0xf1, 0xeb, 0x41, 0x2c, 0xd0, 0x83, 0x9a, 0x2e, 0x85, 0x2e,
-	0x20, 0x64, 0xc4, 0xc5, 0x05, 0xd6, 0x58, 0x52, 0x94, 0x9a, 0x98, 0x4b, 0x58, 0xbd, 0x06, 0xa3,
-	0x01, 0xa3, 0x13, 0x47, 0x14, 0xd4, 0xdd, 0x49, 0x6c, 0x60, 0x6f, 0x18, 0x03, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0xee, 0x2c, 0xb0, 0x05, 0xdb, 0x00, 0x00, 0x00,
+	Metadata: "echo.proto",
+}
+
+func init() { proto.RegisterFile("echo.proto", fileDescriptor_echo_df132be2fdaf2191) }
+
+var fileDescriptor_echo_df132be2fdaf2191 = []byte{
+	// 198 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8f, 0xb1, 0x4b, 0xc5, 0x30,
+	0x10, 0xc6, 0x89, 0xe8, 0x7b, 0x7a, 0x0e, 0x42, 0xa6, 0xd2, 0xa9, 0x38, 0x65, 0x4a, 0xa4, 0x0e,
+	0xe2, 0x24, 0x08, 0x8e, 0x2e, 0x75, 0x73, 0x6b, 0xce, 0x33, 0x09, 0x36, 0xbd, 0x98, 0xa4, 0x82,
+	0xff, 0xbd, 0xd8, 0xaa, 0x83, 0xcb, 0xdb, 0xee, 0x77, 0xdc, 0xfd, 0x3e, 0x3e, 0x00, 0x42, 0xcf,
+	0x3a, 0x65, 0xae, 0x2c, 0x77, 0x95, 0x4a, 0x4d, 0xf6, 0xf2, 0x0e, 0xf6, 0x8f, 0x54, 0xca, 0xe8,
+	0x48, 0x36, 0xb0, 0x8f, 0xdb, 0xd8, 0x88, 0x4e, 0xa8, 0xb3, 0xe1, 0x17, 0x65, 0x0b, 0xa7, 0x85,
+	0xde, 0x17, 0x9a, 0x91, 0x9a, 0xa3, 0x4e, 0xa8, 0x93, 0xe1, 0x8f, 0xfb, 0x37, 0x38, 0x7f, 0x40,
+	0xcf, 0x4f, 0x94, 0x3f, 0x02, 0x92, 0x54, 0x70, 0xfc, 0x8d, 0xf2, 0x42, 0x6f, 0x01, 0xfa, 0xc7,
+	0xde, 0xfe, 0x5f, 0xc8, 0x1e, 0x60, 0x7d, 0xac, 0x99, 0xc6, 0x78, 0xf8, 0x5e, 0x89, 0x2b, 0x71,
+	0x7f, 0xfb, 0x7c, 0xe3, 0x42, 0xf5, 0x8b, 0xd5, 0xc8, 0xd1, 0xf8, 0xcf, 0x44, 0x79, 0xa2, 0x17,
+	0x47, 0xd9, 0xbc, 0x8e, 0x36, 0x07, 0x34, 0xc8, 0x31, 0xf2, 0x6c, 0x5c, 0x4e, 0x38, 0xb1, 0x73,
+	0x61, 0x76, 0x66, 0xd3, 0xd8, 0xdd, 0xda, 0xfb, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x33,
+	0xa2, 0xe6, 0x05, 0x01, 0x00, 0x00,
 }

common/grpclogging/testpb/echo.proto

@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 
 syntax = "proto3";
 
-option go_package = "testpb";
+option go_package = "github.com/hyperledger/fabric/common/grpclogging/testpb";
 
 package testpb;
 

common/grpcmetrics/grpcmetrics_suite_test.go

@@ -14,7 +14,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-//go:generate protoc --go_out=plugins=grpc:. testpb/echo.proto
+//go:generate protoc --proto_path=$GOPATH/src/github.com/hyperledger/fabric/common/grpcmetrics/testpb --go_out=plugins=grpc:$GOPATH/src $GOPATH/src/github.com/hyperledger/fabric/common/grpcmetrics/testpb/echo.proto
 
 func TestGrpcmetrics(t *testing.T) {
 	RegisterFailHandler(Fail)

common/grpcmetrics/testpb/echo.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: testpb/echo.proto
+// source: echo.proto
 
-package testpb
+package testpb // import "github.com/hyperledger/fabric/common/grpcmetrics/testpb"
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -35,7 +35,7 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_echo_c06a4742710c8217, []int{0}
+	return fileDescriptor_echo_436b54e9f7a5436b, []int{0}
 }
 func (m *Message) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Message.Unmarshal(m, b)
@@ -208,21 +208,24 @@ var _EchoService_serviceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "testpb/echo.proto",
-}
-
-func init() { proto.RegisterFile("testpb/echo.proto", fileDescriptor_echo_c06a4742710c8217) }
-
-var fileDescriptor_echo_c06a4742710c8217 = []byte{
-	// 154 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2c, 0x49, 0x2d, 0x2e,
-	0x29, 0x48, 0xd2, 0x4f, 0x4d, 0xce, 0xc8, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83,
-	0x08, 0x29, 0xd9, 0x73, 0xb1, 0xfb, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0x49, 0x70, 0xb1,
-	0xe7, 0x42, 0x98, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x30, 0xae, 0x90, 0x14, 0x17, 0x47,
-	0x71, 0x6a, 0x61, 0x69, 0x6a, 0x5e, 0x72, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x9c,
-	0x6f, 0x94, 0xcd, 0xc5, 0xed, 0x9a, 0x9c, 0x91, 0x1f, 0x9c, 0x5a, 0x54, 0x96, 0x99, 0x9c, 0x2a,
-	0xa4, 0xc1, 0xc5, 0x02, 0xe2, 0x0a, 0xf1, 0xeb, 0x41, 0x2c, 0xd0, 0x83, 0x9a, 0x2e, 0x85, 0x2e,
-	0x20, 0x64, 0xc4, 0xc5, 0x05, 0xd6, 0x58, 0x52, 0x94, 0x9a, 0x98, 0x4b, 0x58, 0xbd, 0x06, 0xa3,
-	0x01, 0xa3, 0x13, 0x47, 0x14, 0xd4, 0xdd, 0x49, 0x6c, 0x60, 0x6f, 0x18, 0x03, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0xee, 0x2c, 0xb0, 0x05, 0xdb, 0x00, 0x00, 0x00,
+	Metadata: "echo.proto",
+}
+
+func init() { proto.RegisterFile("echo.proto", fileDescriptor_echo_436b54e9f7a5436b) }
+
+var fileDescriptor_echo_436b54e9f7a5436b = []byte{
+	// 196 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x8f, 0x31, 0x4b, 0xc0, 0x30,
+	0x10, 0x85, 0x89, 0x68, 0xab, 0xe7, 0x20, 0x64, 0x2a, 0x9d, 0x8a, 0x53, 0xa6, 0x44, 0xea, 0x20,
+	0x4e, 0x82, 0xe0, 0xe8, 0x52, 0x37, 0xb7, 0xe6, 0x3c, 0x93, 0xa0, 0x69, 0xe2, 0x25, 0x15, 0xfc,
+	0xf7, 0x62, 0xab, 0x0e, 0x2e, 0x6e, 0xf7, 0x1d, 0x77, 0xdf, 0xe3, 0x01, 0x10, 0xfa, 0xa4, 0x33,
+	0xa7, 0x9a, 0x64, 0x53, 0xa9, 0xd4, 0x6c, 0xcf, 0x6f, 0xa0, 0xbd, 0xa7, 0x52, 0x66, 0x47, 0xb2,
+	0x83, 0x36, 0xee, 0x63, 0x27, 0x06, 0xa1, 0x4e, 0xa6, 0x1f, 0x94, 0x3d, 0x1c, 0x17, 0x7a, 0x5b,
+	0x69, 0x41, 0xea, 0x0e, 0x06, 0xa1, 0x8e, 0xa6, 0x5f, 0x1e, 0x5f, 0xe0, 0xf4, 0x0e, 0x7d, 0x7a,
+	0x20, 0x7e, 0x0f, 0x48, 0x52, 0xc1, 0xe1, 0x17, 0xca, 0x33, 0xbd, 0x07, 0xe8, 0x6f, 0x7b, 0xff,
+	0x77, 0x21, 0x47, 0x80, 0xed, 0xb1, 0x32, 0xcd, 0xf1, 0xff, 0x7b, 0x25, 0x2e, 0xc4, 0xed, 0xf5,
+	0xe3, 0x95, 0x0b, 0xd5, 0xaf, 0x56, 0x63, 0x8a, 0xc6, 0x7f, 0x64, 0xe2, 0x57, 0x7a, 0x72, 0xc4,
+	0xe6, 0x79, 0xb6, 0x1c, 0xd0, 0x60, 0x8a, 0x31, 0x2d, 0xc6, 0x71, 0xc6, 0x48, 0x95, 0x03, 0x16,
+	0xb3, 0x6b, 0x6c, 0xb3, 0xf5, 0xbe, 0xfc, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x48, 0xde, 0xb3, 0x72,
+	0x05, 0x01, 0x00, 0x00,
 }

common/grpcmetrics/testpb/echo.proto

@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 
 syntax = "proto3";
 
-option go_package = "testpb";
+option go_package = "github.com/hyperledger/fabric/common/grpcmetrics/testpb";
 
 package testpb;
 

protos/peer/lifecycle/lifecycle.pb.go

@@ -117,8 +117,8 @@ func (m *InstallChaincodeResult) GetHash() []byte {
 // QueryInstalledChaincodeArgs is the message returned by
 // '+lifecycle.QueryInstalledChaincode'
 type QueryInstalledChaincodeArgs struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Version              string   `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Version              string   `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`

protos/peer/proposal.pb.go

@@ -59,7 +59,7 @@ func (m *SignedProposal) Reset()         { *m = SignedProposal{} }
 func (m *SignedProposal) String() string { return proto.CompactTextString(m) }
 func (*SignedProposal) ProtoMessage()    {}
 func (*SignedProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_proposal_33e23f5bd2671745, []int{0}
+	return fileDescriptor_proposal_2be65988745cf952, []int{0}
 }
 func (m *SignedProposal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignedProposal.Unmarshal(m, b)
@@ -131,7 +131,7 @@ func (m *Proposal) Reset()         { *m = Proposal{} }
 func (m *Proposal) String() string { return proto.CompactTextString(m) }
 func (*Proposal) ProtoMessage()    {}
 func (*Proposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_proposal_33e23f5bd2671745, []int{1}
+	return fileDescriptor_proposal_2be65988745cf952, []int{1}
 }
 func (m *Proposal) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Proposal.Unmarshal(m, b)
@@ -189,7 +189,7 @@ type ChaincodeHeaderExtension struct {
 	// this field impacts the content of ProposalResponsePayload.proposalHash.
 	PayloadVisibility []byte `protobuf:"bytes,1,opt,name=payload_visibility,json=payloadVisibility,proto3" json:"payload_visibility,omitempty"`
 	// The ID of the chaincode to target.
-	ChaincodeId          *ChaincodeID `protobuf:"bytes,2,opt,name=chaincode_id,json=chaincodeId" json:"chaincode_id,omitempty"`
+	ChaincodeId          *ChaincodeID `protobuf:"bytes,2,opt,name=chaincode_id,json=chaincodeId,proto3" json:"chaincode_id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
 	XXX_unrecognized     []byte       `json:"-"`
 	XXX_sizecache        int32        `json:"-"`
@@ -199,7 +199,7 @@ func (m *ChaincodeHeaderExtension) Reset()         { *m = ChaincodeHeaderExtensi
 func (m *ChaincodeHeaderExtension) String() string { return proto.CompactTextString(m) }
 func (*ChaincodeHeaderExtension) ProtoMessage()    {}
 func (*ChaincodeHeaderExtension) Descriptor() ([]byte, []int) {
-	return fileDescriptor_proposal_33e23f5bd2671745, []int{2}
+	return fileDescriptor_proposal_2be65988745cf952, []int{2}
 }
 func (m *ChaincodeHeaderExtension) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChaincodeHeaderExtension.Unmarshal(m, b)
@@ -245,7 +245,7 @@ type ChaincodeProposalPayload struct {
 	// to implement some form of application-level confidentiality. The contents
 	// of this field are supposed to always be omitted from the transaction and
 	// excluded from the ledger.
-	TransientMap         map[string][]byte `protobuf:"bytes,2,rep,name=TransientMap" json:"TransientMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	TransientMap         map[string][]byte `protobuf:"bytes,2,rep,name=TransientMap,proto3" json:"TransientMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -255,7 +255,7 @@ func (m *ChaincodeProposalPayload) Reset()         { *m = ChaincodeProposalPaylo
 func (m *ChaincodeProposalPayload) String() string { return proto.CompactTextString(m) }
 func (*ChaincodeProposalPayload) ProtoMessage()    {}
 func (*ChaincodeProposalPayload) Descriptor() ([]byte, []int) {
-	return fileDescriptor_proposal_33e23f5bd2671745, []int{3}
+	return fileDescriptor_proposal_2be65988745cf952, []int{3}
 }
 func (m *ChaincodeProposalPayload) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChaincodeProposalPayload.Unmarshal(m, b)
@@ -299,16 +299,16 @@ type ChaincodeAction struct {
 	// invocation.
 	Events []byte `protobuf:"bytes,2,opt,name=events,proto3" json:"events,omitempty"`
 	// This field contains the result of executing this invocation.
-	Response *Response `protobuf:"bytes,3,opt,name=response" json:"response,omitempty"`
+	Response *Response `protobuf:"bytes,3,opt,name=response,proto3" json:"response,omitempty"`
 	// This field contains the ChaincodeID of executing this invocation. Endorser
 	// will set it with the ChaincodeID called by endorser while simulating proposal.
 	// Committer will validate the version matching with latest chaincode version.
 	// Adding ChaincodeID to keep version opens up the possibility of multiple
 	// ChaincodeAction per transaction.
-	ChaincodeId *ChaincodeID `protobuf:"bytes,4,opt,name=chaincode_id,json=chaincodeId" json:"chaincode_id,omitempty"`
+	ChaincodeId *ChaincodeID `protobuf:"bytes,4,opt,name=chaincode_id,json=chaincodeId,proto3" json:"chaincode_id,omitempty"`
 	// This field contains the token expectation generated by the chaincode
 	// executing this invocation
-	TokenExpectation     *token.TokenExpectation `protobuf:"bytes,5,opt,name=token_expectation,json=tokenExpectation" json:"token_expectation,omitempty"`
+	TokenExpectation     *token.TokenExpectation `protobuf:"bytes,5,opt,name=token_expectation,json=tokenExpectation,proto3" json:"token_expectation,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
 	XXX_unrecognized     []byte                  `json:"-"`
 	XXX_sizecache        int32                   `json:"-"`
@@ -318,7 +318,7 @@ func (m *ChaincodeAction) Reset()         { *m = ChaincodeAction{} }
 func (m *ChaincodeAction) String() string { return proto.CompactTextString(m) }
 func (*ChaincodeAction) ProtoMessage()    {}
 func (*ChaincodeAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_proposal_33e23f5bd2671745, []int{4}
+	return fileDescriptor_proposal_2be65988745cf952, []int{4}
 }
 func (m *ChaincodeAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ChaincodeAction.Unmarshal(m, b)
@@ -382,9 +382,9 @@ func init() {
 	proto.RegisterType((*ChaincodeAction)(nil), "protos.ChaincodeAction")
 }
 
-func init() { proto.RegisterFile("peer/proposal.proto", fileDescriptor_proposal_33e23f5bd2671745) }
+func init() { proto.RegisterFile("peer/proposal.proto", fileDescriptor_proposal_2be65988745cf952) }
 
-var fileDescriptor_proposal_33e23f5bd2671745 = []byte{
+var fileDescriptor_proposal_2be65988745cf952 = []byte{
 	// 487 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4f, 0x6f, 0xd3, 0x30,
 	0x14, 0x57, 0x5a, 0x36, 0x36, 0xb7, 0x6c, 0xad, 0x37, 0xa1, 0xa8, 0xda, 0x61, 0x8a, 0x84, 0x34,

protos/token/expectations.pb.go

@@ -58,7 +58,7 @@ type isTokenExpectation_Expectation interface {
 }
 
 type TokenExpectation_PlainExpectation struct {
-	PlainExpectation *PlainExpectation `protobuf:"bytes,1,opt,name=plain_expectation,json=plainExpectation,oneof"`
+	PlainExpectation *PlainExpectation `protobuf:"bytes,1,opt,name=plain_expectation,json=plainExpectation,proto3,oneof"`
 }
 
 func (*TokenExpectation_PlainExpectation) isTokenExpectation_Expectation() {}
@@ -172,13 +172,15 @@ type isPlainExpectation_Payload interface {
 }
 
 type PlainExpectation_ImportExpectation struct {
-	ImportExpectation *PlainTokenExpectation `protobuf:"bytes,1,opt,name=import_expectation,json=importExpectation,oneof"`
+	ImportExpectation *PlainTokenExpectation `protobuf:"bytes,1,opt,name=import_expectation,json=importExpectation,proto3,oneof"`
 }
+
 type PlainExpectation_TransferExpectation struct {
-	TransferExpectation *PlainTokenExpectation `protobuf:"bytes,2,opt,name=transfer_expectation,json=transferExpectation,oneof"`
+	TransferExpectation *PlainTokenExpectation `protobuf:"bytes,2,opt,name=transfer_expectation,json=transferExpectation,proto3,oneof"`
 }
 
-func (*PlainExpectation_ImportExpectation) isPlainExpectation_Payload()   {}
+func (*PlainExpectation_ImportExpectation) isPlainExpectation_Payload() {}
+
 func (*PlainExpectation_TransferExpectation) isPlainExpectation_Payload() {}
 
 func (m *PlainExpectation) GetPayload() isPlainExpectation_Payload {
@@ -280,7 +282,7 @@ func _PlainExpectation_OneofSizer(msg proto.Message) (n int) {
 // certain outputs will be matched
 type PlainTokenExpectation struct {
 	// Outputs contains the expected outputs
-	Outputs              []*PlainOutput `protobuf:"bytes,1,rep,name=outputs" json:"outputs,omitempty"`
+	Outputs              []*PlainOutput `protobuf:"bytes,1,rep,name=outputs,proto3" json:"outputs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`

protos/token/transaction.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: token/transaction.proto
 
-package token
+package token // import "github.com/hyperledger/fabric/protos/token"
 
-import (
-	fmt "fmt"
-	math "math"
-
-	proto "github.com/golang/protobuf/proto"
-)
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -39,17 +36,16 @@ func (m *TokenTransaction) Reset()         { *m = TokenTransaction{} }
 func (m *TokenTransaction) String() string { return proto.CompactTextString(m) }
 func (*TokenTransaction) ProtoMessage()    {}
 func (*TokenTransaction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{0}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{0}
 }
-
 func (m *TokenTransaction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TokenTransaction.Unmarshal(m, b)
 }
 func (m *TokenTransaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_TokenTransaction.Marshal(b, m, deterministic)
 }
-func (m *TokenTransaction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TokenTransaction.Merge(m, src)
+func (dst *TokenTransaction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TokenTransaction.Merge(dst, src)
 }
 func (m *TokenTransaction) XXX_Size() int {
 	return xxx_messageInfo_TokenTransaction.Size(m)
@@ -158,17 +154,16 @@ func (m *PlainTokenAction) Reset()         { *m = PlainTokenAction{} }
 func (m *PlainTokenAction) String() string { return proto.CompactTextString(m) }
 func (*PlainTokenAction) ProtoMessage()    {}
 func (*PlainTokenAction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{1}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{1}
 }
-
 func (m *PlainTokenAction) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainTokenAction.Unmarshal(m, b)
 }
 func (m *PlainTokenAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainTokenAction.Marshal(b, m, deterministic)
 }
-func (m *PlainTokenAction) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainTokenAction.Merge(m, src)
+func (dst *PlainTokenAction) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainTokenAction.Merge(dst, src)
 }
 func (m *PlainTokenAction) XXX_Size() int {
 	return xxx_messageInfo_PlainTokenAction.Size(m)
@@ -399,17 +394,16 @@ func (m *PlainImport) Reset()         { *m = PlainImport{} }
 func (m *PlainImport) String() string { return proto.CompactTextString(m) }
 func (*PlainImport) ProtoMessage()    {}
 func (*PlainImport) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{2}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{2}
 }
-
 func (m *PlainImport) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainImport.Unmarshal(m, b)
 }
 func (m *PlainImport) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainImport.Marshal(b, m, deterministic)
 }
-func (m *PlainImport) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainImport.Merge(m, src)
+func (dst *PlainImport) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainImport.Merge(dst, src)
 }
 func (m *PlainImport) XXX_Size() int {
 	return xxx_messageInfo_PlainImport.Size(m)
@@ -442,17 +436,16 @@ func (m *PlainTransfer) Reset()         { *m = PlainTransfer{} }
 func (m *PlainTransfer) String() string { return proto.CompactTextString(m) }
 func (*PlainTransfer) ProtoMessage()    {}
 func (*PlainTransfer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{3}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{3}
 }
-
 func (m *PlainTransfer) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainTransfer.Unmarshal(m, b)
 }
 func (m *PlainTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainTransfer.Marshal(b, m, deterministic)
 }
-func (m *PlainTransfer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainTransfer.Merge(m, src)
+func (dst *PlainTransfer) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainTransfer.Merge(dst, src)
 }
 func (m *PlainTransfer) XXX_Size() int {
 	return xxx_messageInfo_PlainTransfer.Size(m)
@@ -494,17 +487,16 @@ func (m *PlainApprove) Reset()         { *m = PlainApprove{} }
 func (m *PlainApprove) String() string { return proto.CompactTextString(m) }
 func (*PlainApprove) ProtoMessage()    {}
 func (*PlainApprove) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{4}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{4}
 }
-
 func (m *PlainApprove) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainApprove.Unmarshal(m, b)
 }
 func (m *PlainApprove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainApprove.Marshal(b, m, deterministic)
 }
-func (m *PlainApprove) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainApprove.Merge(m, src)
+func (dst *PlainApprove) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainApprove.Merge(dst, src)
 }
 func (m *PlainApprove) XXX_Size() int {
 	return xxx_messageInfo_PlainApprove.Size(m)
@@ -554,17 +546,16 @@ func (m *PlainTransferFrom) Reset()         { *m = PlainTransferFrom{} }
 func (m *PlainTransferFrom) String() string { return proto.CompactTextString(m) }
 func (*PlainTransferFrom) ProtoMessage()    {}
 func (*PlainTransferFrom) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{5}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{5}
 }
-
 func (m *PlainTransferFrom) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainTransferFrom.Unmarshal(m, b)
 }
 func (m *PlainTransferFrom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainTransferFrom.Marshal(b, m, deterministic)
 }
-func (m *PlainTransferFrom) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainTransferFrom.Merge(m, src)
+func (dst *PlainTransferFrom) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainTransferFrom.Merge(dst, src)
 }
 func (m *PlainTransferFrom) XXX_Size() int {
 	return xxx_messageInfo_PlainTransferFrom.Size(m)
@@ -613,17 +604,16 @@ func (m *PlainOutput) Reset()         { *m = PlainOutput{} }
 func (m *PlainOutput) String() string { return proto.CompactTextString(m) }
 func (*PlainOutput) ProtoMessage()    {}
 func (*PlainOutput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{6}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{6}
 }
-
 func (m *PlainOutput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainOutput.Unmarshal(m, b)
 }
 func (m *PlainOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainOutput.Marshal(b, m, deterministic)
 }
-func (m *PlainOutput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainOutput.Merge(m, src)
+func (dst *PlainOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainOutput.Merge(dst, src)
 }
 func (m *PlainOutput) XXX_Size() int {
 	return xxx_messageInfo_PlainOutput.Size(m)
@@ -670,17 +660,16 @@ func (m *InputId) Reset()         { *m = InputId{} }
 func (m *InputId) String() string { return proto.CompactTextString(m) }
 func (*InputId) ProtoMessage()    {}
 func (*InputId) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{7}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{7}
 }
-
 func (m *InputId) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InputId.Unmarshal(m, b)
 }
 func (m *InputId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_InputId.Marshal(b, m, deterministic)
 }
-func (m *InputId) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_InputId.Merge(m, src)
+func (dst *InputId) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_InputId.Merge(dst, src)
 }
 func (m *InputId) XXX_Size() int {
 	return xxx_messageInfo_InputId.Size(m)
@@ -725,17 +714,16 @@ func (m *PlainDelegatedOutput) Reset()         { *m = PlainDelegatedOutput{} }
 func (m *PlainDelegatedOutput) String() string { return proto.CompactTextString(m) }
 func (*PlainDelegatedOutput) ProtoMessage()    {}
 func (*PlainDelegatedOutput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fadc60fa5929c0a6, []int{8}
+	return fileDescriptor_transaction_a359b0c8d648a383, []int{8}
 }
-
 func (m *PlainDelegatedOutput) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PlainDelegatedOutput.Unmarshal(m, b)
 }
 func (m *PlainDelegatedOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PlainDelegatedOutput.Marshal(b, m, deterministic)
 }
-func (m *PlainDelegatedOutput) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PlainDelegatedOutput.Merge(m, src)
+func (dst *PlainDelegatedOutput) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PlainDelegatedOutput.Merge(dst, src)
 }
 func (m *PlainDelegatedOutput) XXX_Size() int {
 	return xxx_messageInfo_PlainDelegatedOutput.Size(m)
@@ -786,9 +774,11 @@ func init() {
 	proto.RegisterType((*PlainDelegatedOutput)(nil), "PlainDelegatedOutput")
 }
 
-func init() { proto.RegisterFile("token/transaction.proto", fileDescriptor_fadc60fa5929c0a6) }
+func init() {
+	proto.RegisterFile("token/transaction.proto", fileDescriptor_transaction_a359b0c8d648a383)
+}
 
-var fileDescriptor_fadc60fa5929c0a6 = []byte{
+var fileDescriptor_transaction_a359b0c8d648a383 = []byte{
 	// 505 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x8f, 0xd2, 0x40,
 	0x14, 0xa7, 0x50, 0xba, 0xf8, 0x68, 0x57, 0x98, 0x5d, 0x63, 0xe3, 0xc1, 0x90, 0xc6, 0x18, 0x63,