diff --git a/core/comm/testdata/grpc/test.pb.go b/core/comm/testdata/grpc/test.pb.go index c8676919b1c..e4e596985d6 100644 --- a/core/comm/testdata/grpc/test.pb.go +++ b/core/comm/testdata/grpc/test.pb.go @@ -3,7 +3,7 @@ // DO NOT EDIT! /* -Package test is a generated protocol buffer package. +Package grpc is a generated protocol buffer package. It is generated from these files: test.proto @@ -11,7 +11,7 @@ It is generated from these files: It has these top-level messages: Empty */ -package test +package grpc import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -19,7 +19,7 @@ import math "math" import ( context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + grpc1 "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. @@ -47,29 +47,29 @@ func init() { // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc1.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion3 +const _ = grpc1.SupportPackageIsVersion3 // Client API for TestService service type TestServiceClient interface { - EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) + EmptyCall(ctx context.Context, in *Empty, opts ...grpc1.CallOption) (*Empty, error) } type testServiceClient struct { - cc *grpc.ClientConn + cc *grpc1.ClientConn } -func NewTestServiceClient(cc *grpc.ClientConn) TestServiceClient { +func NewTestServiceClient(cc *grpc1.ClientConn) TestServiceClient { return &testServiceClient{cc} } -func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) { +func (c *testServiceClient) EmptyCall(ctx context.Context, in *Empty, opts ...grpc1.CallOption) (*Empty, error) { out := new(Empty) - err := grpc.Invoke(ctx, "/TestService/EmptyCall", in, out, c.cc, opts...) + err := grpc1.Invoke(ctx, "/TestService/EmptyCall", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -82,11 +82,11 @@ type TestServiceServer interface { EmptyCall(context.Context, *Empty) (*Empty, error) } -func RegisterTestServiceServer(s *grpc.Server, srv TestServiceServer) { +func RegisterTestServiceServer(s *grpc1.Server, srv TestServiceServer) { s.RegisterService(&_TestService_serviceDesc, srv) } -func _TestService_EmptyCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestService_EmptyCall_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc1.UnaryServerInterceptor) (interface{}, error) { in := new(Empty) if err := dec(in); err != nil { return nil, err @@ -94,7 +94,7 @@ func _TestService_EmptyCall_Handler(srv interface{}, ctx context.Context, dec fu if interceptor == nil { return srv.(TestServiceServer).EmptyCall(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc1.UnaryServerInfo{ Server: srv, FullMethod: "/TestService/EmptyCall", } @@ -104,27 +104,30 @@ func _TestService_EmptyCall_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } -var _TestService_serviceDesc = grpc.ServiceDesc{ +var _TestService_serviceDesc = grpc1.ServiceDesc{ ServiceName: "TestService", HandlerType: (*TestServiceServer)(nil), - Methods: []grpc.MethodDesc{ + Methods: []grpc1.MethodDesc{ { MethodName: "EmptyCall", Handler: _TestService_EmptyCall_Handler, }, }, - Streams: []grpc.StreamDesc{}, + Streams: []grpc1.StreamDesc{}, Metadata: fileDescriptor0, } func init() { proto.RegisterFile("test.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 81 bytes of a gzipped FileDescriptorProto + // 138 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0x49, 0x2d, 0x2e, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x57, 0x62, 0xe7, 0x62, 0x75, 0xcd, 0x2d, 0x28, 0xa9, 0x34, - 0xd2, 0xe2, 0xe2, 0x0e, 0x01, 0x0a, 0x07, 0xa7, 0x16, 0x95, 0x65, 0x26, 0xa7, 0x0a, 0x49, 0x73, - 0x71, 0x82, 0xc5, 0x9d, 0x13, 0x73, 0x72, 0x84, 0xd8, 0xf4, 0xc0, 0x6c, 0x29, 0x28, 0x9d, 0xc4, - 0x06, 0xd6, 0x6b, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xed, 0x32, 0x6a, 0x04, 0x49, 0x00, 0x00, - 0x00, + 0xd2, 0xe2, 0xe2, 0x0e, 0x49, 0x2d, 0x2e, 0x09, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x15, 0x92, + 0xe6, 0xe2, 0x04, 0x8b, 0x3b, 0x27, 0xe6, 0xe4, 0x08, 0xb1, 0xe9, 0x81, 0xd9, 0x52, 0x50, 0xda, + 0xc9, 0x3c, 0xca, 0x34, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0xa3, + 0xb2, 0x20, 0xb5, 0x28, 0x27, 0x35, 0x25, 0x3d, 0xb5, 0x48, 0x3f, 0x2d, 0x31, 0xa9, 0x28, 0x33, + 0x59, 0x3f, 0x39, 0xbf, 0x28, 0x55, 0x3f, 0x39, 0x3f, 0x37, 0x57, 0x1f, 0x64, 0x55, 0x4a, 0x62, + 0x49, 0xa2, 0x7e, 0x7a, 0x51, 0x41, 0x72, 0x12, 0x1b, 0xd8, 0x52, 0x63, 0x40, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xd3, 0x15, 0xec, 0x45, 0x82, 0x00, 0x00, 0x00, } diff --git a/core/comm/testdata/grpc/test.proto b/core/comm/testdata/grpc/test.proto index 1d45b0b3acf..bb61f89ba22 100644 --- a/core/comm/testdata/grpc/test.proto +++ b/core/comm/testdata/grpc/test.proto @@ -16,10 +16,12 @@ limitations under the License. syntax = "proto3"; +option go_package = "github.com/hyperledger/fabric/core/comm/testdata/grpc"; + message Empty {} service TestService { rpc EmptyCall(Empty) returns (Empty); -} \ No newline at end of file +} diff --git a/protos/common/chain-config.pb.go b/protos/common/chain-config.pb.go index 3cddac12aa8..52c7213d3b5 100644 --- a/protos/common/chain-config.pb.go +++ b/protos/common/chain-config.pb.go @@ -126,13 +126,13 @@ type MSPPrincipal struct { // "Principal" contains a specific identity. Default value // denotes that Principal contains one of the groups by // default supported by all MSPs ("admin" or "member"). - PrincipalClassification MSPPrincipal_Classification `protobuf:"varint,1,opt,name=PrincipalClassification,json=principalClassification,enum=common.MSPPrincipal_Classification" json:"PrincipalClassification,omitempty"` + PrincipalClassification MSPPrincipal_Classification `protobuf:"varint,1,opt,name=PrincipalClassification,enum=common.MSPPrincipal_Classification" json:"PrincipalClassification,omitempty"` // Principal completes the policy principal definition. For the default // principal types, Principal can be either "Admin" or "Member". // For the ByOrganizationUnit/ByIdentity values of Classification, // PolicyPrincipal acquires its value from an organization unit or // identity, respectively. - Principal []byte `protobuf:"bytes,3,opt,name=Principal,json=principal,proto3" json:"Principal,omitempty"` + Principal []byte `protobuf:"bytes,3,opt,name=Principal,proto3" json:"Principal,omitempty"` } func (m *MSPPrincipal) Reset() { *m = MSPPrincipal{} } @@ -140,30 +140,16 @@ func (m *MSPPrincipal) String() string { return proto.CompactTextStri func (*MSPPrincipal) ProtoMessage() {} func (*MSPPrincipal) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *MSPPrincipal) GetPrincipalClassification() MSPPrincipal_Classification { - if m != nil { - return m.PrincipalClassification - } - return MSPPrincipal_ByMSPRole -} - -func (m *MSPPrincipal) GetPrincipal() []byte { - if m != nil { - return m.Principal - } - return nil -} - // OrganizationUnit governs the organization of the Principal // field of a policy principal when a specific organization unity members // are to be defined within a policy principal. type OrganizationUnit struct { // MSPIdentifier represents the identifier of the MSP this organization unit // refers to - MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier,json=mSPIdentifier" json:"MSPIdentifier,omitempty"` + MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier" json:"MSPIdentifier,omitempty"` // OrganizationUnitIdentifier defines the organization unit under the // MSP identified with MSPIdentifier - OrganizationUnitIdentifier string `protobuf:"bytes,2,opt,name=OrganizationUnitIdentifier,json=organizationUnitIdentifier" json:"OrganizationUnitIdentifier,omitempty"` + OrganizationUnitIdentifier string `protobuf:"bytes,2,opt,name=OrganizationUnitIdentifier" json:"OrganizationUnitIdentifier,omitempty"` } func (m *OrganizationUnit) Reset() { *m = OrganizationUnit{} } @@ -171,30 +157,16 @@ func (m *OrganizationUnit) String() string { return proto.CompactText func (*OrganizationUnit) ProtoMessage() {} func (*OrganizationUnit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } -func (m *OrganizationUnit) GetMSPIdentifier() string { - if m != nil { - return m.MSPIdentifier - } - return "" -} - -func (m *OrganizationUnit) GetOrganizationUnitIdentifier() string { - if m != nil { - return m.OrganizationUnitIdentifier - } - return "" -} - // MSPRole governs the organization of the Principal // field of an MSPPrincipal when it aims to define one of the // two dedicated roles within an MSP: Admin and Members. type MSPRole struct { // MSPIdentifier represents the identifier of the MSP this principal // refers to - MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier,json=mSPIdentifier" json:"MSPIdentifier,omitempty"` + MSPIdentifier string `protobuf:"bytes,1,opt,name=MSPIdentifier" json:"MSPIdentifier,omitempty"` // MSPRoleType defines which of the available, pre-defined MSP-roles // an identiy should posess inside the MSP with identifier MSPidentifier - Role MSPRole_MSPRoleType `protobuf:"varint,2,opt,name=Role,json=role,enum=common.MSPRole_MSPRoleType" json:"Role,omitempty"` + Role MSPRole_MSPRoleType `protobuf:"varint,2,opt,name=Role,enum=common.MSPRole_MSPRoleType" json:"Role,omitempty"` } func (m *MSPRole) Reset() { *m = MSPRole{} } @@ -202,20 +174,6 @@ func (m *MSPRole) String() string { return proto.CompactTextString(m) func (*MSPRole) ProtoMessage() {} func (*MSPRole) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } -func (m *MSPRole) GetMSPIdentifier() string { - if m != nil { - return m.MSPIdentifier - } - return "" -} - -func (m *MSPRole) GetRole() MSPRole_MSPRoleType { - if m != nil { - return m.Role - } - return MSPRole_Member -} - func init() { proto.RegisterType((*MSPPrincipal)(nil), "common.MSPPrincipal") proto.RegisterType((*OrganizationUnit)(nil), "common.OrganizationUnit") @@ -227,26 +185,25 @@ func init() { func init() { proto.RegisterFile("common/chain-config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 325 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4b, 0xfb, 0x30, - 0x18, 0xc6, 0xff, 0xdd, 0x7f, 0x4e, 0xfa, 0xba, 0x95, 0x92, 0x83, 0x9b, 0xd3, 0x83, 0xd4, 0x1d, - 0x04, 0x59, 0x0b, 0xf3, 0x2e, 0x58, 0x0f, 0xe2, 0x61, 0x38, 0xaa, 0x5e, 0x04, 0x0f, 0x6d, 0x96, - 0x76, 0x2f, 0xb4, 0x49, 0xc9, 0x22, 0x58, 0x3f, 0x80, 0x9f, 0xd0, 0x0f, 0x64, 0x96, 0xea, 0xa8, - 0x45, 0xc1, 0x53, 0xf2, 0xbe, 0xf9, 0x3d, 0xcf, 0x93, 0xbc, 0x04, 0x0e, 0xa8, 0x28, 0x0a, 0xc1, - 0x03, 0xba, 0x8a, 0x91, 0x4f, 0xa9, 0xe0, 0x29, 0x66, 0x7e, 0x29, 0x85, 0x12, 0xa4, 0x57, 0x1f, - 0x79, 0xef, 0x16, 0xf4, 0xe7, 0x77, 0x8b, 0x85, 0x44, 0x4e, 0xb1, 0x8c, 0x73, 0xf2, 0x04, 0xc3, - 0x6d, 0x71, 0x95, 0xc7, 0xeb, 0x35, 0xa6, 0x48, 0x63, 0x85, 0x82, 0x8f, 0xac, 0x63, 0xeb, 0xd4, - 0x99, 0x9d, 0xf8, 0xb5, 0xd4, 0x6f, 0xca, 0xfc, 0xef, 0x68, 0x34, 0x2c, 0x7f, 0xf6, 0x20, 0x47, - 0x60, 0x6f, 0x45, 0xa3, 0xff, 0xda, 0xb0, 0x1f, 0xd9, 0x5b, 0xd6, 0xbb, 0x06, 0xa7, 0xc5, 0x0f, - 0xc0, 0x0e, 0x2b, 0x9d, 0x14, 0x89, 0x9c, 0xb9, 0xff, 0xc8, 0x3e, 0x90, 0xb0, 0xba, 0x95, 0x59, - 0xcc, 0xf1, 0xd5, 0x00, 0x0f, 0x1c, 0x95, 0x6b, 0x11, 0x07, 0x20, 0xac, 0x6e, 0x96, 0x8c, 0x2b, - 0x54, 0x95, 0xdb, 0xf1, 0x5e, 0xc0, 0x6d, 0x53, 0x64, 0x02, 0x03, 0x6d, 0x54, 0x43, 0x29, 0x32, - 0x69, 0xde, 0x63, 0x47, 0x83, 0xa2, 0xd9, 0x24, 0x17, 0x30, 0x6e, 0x2b, 0x1b, 0x92, 0x8e, 0x91, - 0x8c, 0xc5, 0xaf, 0x84, 0xf7, 0x66, 0xc1, 0xee, 0xe7, 0x7d, 0xff, 0x98, 0x18, 0x40, 0x77, 0x43, - 0x1b, 0x6f, 0x67, 0x76, 0xd8, 0x18, 0xef, 0xa6, 0xfd, 0xb5, 0xde, 0x57, 0x25, 0x8b, 0xba, 0x52, - 0xef, 0xbc, 0x09, 0xec, 0x35, 0x9a, 0x04, 0xa0, 0x37, 0x67, 0x45, 0xc2, 0xa4, 0x9e, 0x8f, 0x0d, - 0x3b, 0x97, 0xcb, 0x02, 0xb9, 0x6b, 0x85, 0xd3, 0xc7, 0xb3, 0x0c, 0xd5, 0xea, 0x39, 0xd9, 0x18, - 0x06, 0x2b, 0x4d, 0xca, 0x9c, 0x2d, 0x33, 0x26, 0x83, 0x34, 0x4e, 0x24, 0xd2, 0xc0, 0x7c, 0x84, - 0x75, 0x50, 0xc7, 0x25, 0x3d, 0x53, 0x9e, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x84, 0xd1, - 0x7b, 0x34, 0x02, 0x00, 0x00, + // 319 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xc3, 0x40, + 0x10, 0xc6, 0xbb, 0x55, 0x2b, 0x19, 0xdb, 0x10, 0xf6, 0xa0, 0xf5, 0xcf, 0xa1, 0xc4, 0x1e, 0x0a, + 0xd2, 0x04, 0xea, 0x5d, 0x30, 0x1e, 0xc4, 0x43, 0x30, 0xa4, 0x7a, 0x11, 0x3c, 0x24, 0xe9, 0x26, + 0x1d, 0x48, 0x76, 0xc3, 0x36, 0x82, 0xeb, 0x03, 0xf8, 0x84, 0x3e, 0x90, 0x74, 0xa3, 0x35, 0x0d, + 0x28, 0x9e, 0x96, 0xf9, 0xe6, 0xf7, 0x7d, 0xb3, 0xbb, 0x0c, 0x1c, 0x27, 0xa2, 0x28, 0x04, 0x77, + 0x93, 0x65, 0x84, 0x7c, 0x9a, 0x08, 0x9e, 0x62, 0xe6, 0x94, 0x52, 0x54, 0x82, 0xf6, 0xea, 0x96, + 0xfd, 0x41, 0xa0, 0xef, 0xcf, 0x83, 0x40, 0x22, 0x4f, 0xb0, 0x8c, 0x72, 0xfa, 0x0c, 0x47, 0x9b, + 0xe2, 0x26, 0x8f, 0x56, 0x2b, 0x4c, 0x31, 0x89, 0x2a, 0x14, 0x7c, 0x48, 0x46, 0x64, 0x62, 0xce, + 0xce, 0x9d, 0xda, 0xea, 0x34, 0x6d, 0xce, 0x36, 0x1a, 0xfe, 0x96, 0x41, 0xcf, 0xc0, 0xd8, 0xb4, + 0x86, 0x3b, 0x23, 0x32, 0xe9, 0x87, 0x3f, 0x82, 0x7d, 0x0b, 0x66, 0x8b, 0x1f, 0x80, 0xe1, 0x29, + 0x7f, 0x1e, 0x84, 0x22, 0x67, 0x56, 0x87, 0x1e, 0x02, 0xf5, 0xd4, 0xbd, 0xcc, 0x22, 0x8e, 0x6f, + 0x1a, 0x78, 0xe4, 0x58, 0x59, 0x84, 0x9a, 0x00, 0x9e, 0xba, 0x5b, 0x30, 0x5e, 0x61, 0xa5, 0xac, + 0xae, 0xfd, 0x0a, 0x56, 0x9b, 0xa2, 0x63, 0x18, 0xf8, 0xf3, 0xa0, 0x86, 0x52, 0x64, 0x52, 0xbf, + 0xc7, 0x08, 0xb7, 0x45, 0x7a, 0x05, 0x27, 0x6d, 0x67, 0xc3, 0xd2, 0xd5, 0x96, 0x3f, 0x08, 0xfb, + 0x9d, 0xc0, 0xfe, 0xd7, 0x7d, 0xff, 0x39, 0xd1, 0x85, 0xdd, 0x35, 0xad, 0xb3, 0xcd, 0xd9, 0x69, + 0xe3, 0x7b, 0xd7, 0xf2, 0xf7, 0xf9, 0xa0, 0x4a, 0x16, 0x6a, 0xd0, 0x1e, 0xc3, 0x41, 0x43, 0xa4, + 0x00, 0x3d, 0x9f, 0x15, 0x31, 0x93, 0x56, 0x87, 0x1a, 0xb0, 0x77, 0xbd, 0x28, 0x90, 0x5b, 0xc4, + 0x9b, 0x3e, 0x5d, 0x64, 0x58, 0x2d, 0x5f, 0xe2, 0x75, 0xa0, 0xbb, 0x54, 0x25, 0x93, 0x39, 0x5b, + 0x64, 0x4c, 0xba, 0x69, 0x14, 0x4b, 0x4c, 0x5c, 0xbd, 0x08, 0x2b, 0xb7, 0x1e, 0x17, 0xf7, 0x74, + 0x79, 0xf9, 0x19, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x96, 0x7c, 0x95, 0x34, 0x02, 0x00, 0x00, } diff --git a/protos/common/common.pb.go b/protos/common/common.pb.go index 38348574ef8..27249be5b73 100644 --- a/protos/common/common.pb.go +++ b/protos/common/common.pb.go @@ -167,20 +167,6 @@ func (m *ChainHeader) String() string { return proto.CompactTextStrin func (*ChainHeader) ProtoMessage() {} func (*ChainHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } -func (m *ChainHeader) GetType() int32 { - if m != nil { - return m.Type - } - return 0 -} - -func (m *ChainHeader) GetVersion() int32 { - if m != nil { - return m.Version - } - return 0 -} - func (m *ChainHeader) GetTimestamp() *google_protobuf.Timestamp { if m != nil { return m.Timestamp @@ -188,34 +174,6 @@ func (m *ChainHeader) GetTimestamp() *google_protobuf.Timestamp { return nil } -func (m *ChainHeader) GetChainID() string { - if m != nil { - return m.ChainID - } - return "" -} - -func (m *ChainHeader) GetTxID() string { - if m != nil { - return m.TxID - } - return "" -} - -func (m *ChainHeader) GetEpoch() uint64 { - if m != nil { - return m.Epoch - } - return 0 -} - -func (m *ChainHeader) GetExtension() []byte { - if m != nil { - return m.Extension - } - return nil -} - type SignatureHeader struct { // Creator of the message, specified as a certificate chain Creator []byte `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` @@ -228,20 +186,6 @@ func (m *SignatureHeader) String() string { return proto.CompactTextS func (*SignatureHeader) ProtoMessage() {} func (*SignatureHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } -func (m *SignatureHeader) GetCreator() []byte { - if m != nil { - return m.Creator - } - return nil -} - -func (m *SignatureHeader) GetNonce() []byte { - if m != nil { - return m.Nonce - } - return nil -} - // Payload is the message contents (and header to allow for signing) type Payload struct { // Header is included to provide identity and prevent replay @@ -262,13 +206,6 @@ func (m *Payload) GetHeader() *Header { return nil } -func (m *Payload) GetData() []byte { - if m != nil { - return m.Data - } - return nil -} - // Envelope wraps a Payload with a signature so that the message may be authenticated type Envelope struct { // A marshaled Payload @@ -282,28 +219,14 @@ func (m *Envelope) String() string { return proto.CompactTextString(m func (*Envelope) ProtoMessage() {} func (*Envelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } -func (m *Envelope) GetPayload() []byte { - if m != nil { - return m.Payload - } - return nil -} - -func (m *Envelope) GetSignature() []byte { - if m != nil { - return m.Signature - } - return nil -} - // This is finalized block structure to be shared among the orderer and peer // Note that the BlockHeader chains to the previous BlockHeader, and the BlockData hash is embedded // in the BlockHeader. This makes it natural and obvious that the Data is included in the hash, but // the Metadata is not. type Block struct { - Header *BlockHeader `protobuf:"bytes,1,opt,name=Header,json=header" json:"Header,omitempty"` - Data *BlockData `protobuf:"bytes,2,opt,name=Data,json=data" json:"Data,omitempty"` - Metadata *BlockMetadata `protobuf:"bytes,3,opt,name=Metadata,json=metadata" json:"Metadata,omitempty"` + Header *BlockHeader `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"` + Data *BlockData `protobuf:"bytes,2,opt,name=Data" json:"Data,omitempty"` + Metadata *BlockMetadata `protobuf:"bytes,3,opt,name=Metadata" json:"Metadata,omitempty"` } func (m *Block) Reset() { *m = Block{} } @@ -333,9 +256,9 @@ func (m *Block) GetMetadata() *BlockMetadata { } type BlockHeader struct { - Number uint64 `protobuf:"varint,1,opt,name=Number,json=number" json:"Number,omitempty"` - PreviousHash []byte `protobuf:"bytes,2,opt,name=PreviousHash,json=previousHash,proto3" json:"PreviousHash,omitempty"` - DataHash []byte `protobuf:"bytes,3,opt,name=DataHash,json=dataHash,proto3" json:"DataHash,omitempty"` + Number uint64 `protobuf:"varint,1,opt,name=Number" json:"Number,omitempty"` + PreviousHash []byte `protobuf:"bytes,2,opt,name=PreviousHash,proto3" json:"PreviousHash,omitempty"` + DataHash []byte `protobuf:"bytes,3,opt,name=DataHash,proto3" json:"DataHash,omitempty"` } func (m *BlockHeader) Reset() { *m = BlockHeader{} } @@ -343,29 +266,8 @@ func (m *BlockHeader) String() string { return proto.CompactTextStrin func (*BlockHeader) ProtoMessage() {} func (*BlockHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } -func (m *BlockHeader) GetNumber() uint64 { - if m != nil { - return m.Number - } - return 0 -} - -func (m *BlockHeader) GetPreviousHash() []byte { - if m != nil { - return m.PreviousHash - } - return nil -} - -func (m *BlockHeader) GetDataHash() []byte { - if m != nil { - return m.DataHash - } - return nil -} - type BlockData struct { - Data [][]byte `protobuf:"bytes,1,rep,name=Data,json=data,proto3" json:"Data,omitempty"` + Data [][]byte `protobuf:"bytes,1,rep,name=Data,proto3" json:"Data,omitempty"` } func (m *BlockData) Reset() { *m = BlockData{} } @@ -373,15 +275,8 @@ func (m *BlockData) String() string { return proto.CompactTextString( func (*BlockData) ProtoMessage() {} func (*BlockData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } -func (m *BlockData) GetData() [][]byte { - if m != nil { - return m.Data - } - return nil -} - type BlockMetadata struct { - Metadata [][]byte `protobuf:"bytes,1,rep,name=Metadata,json=metadata,proto3" json:"Metadata,omitempty"` + Metadata [][]byte `protobuf:"bytes,1,rep,name=Metadata,proto3" json:"Metadata,omitempty"` } func (m *BlockMetadata) Reset() { *m = BlockMetadata{} } @@ -389,13 +284,6 @@ func (m *BlockMetadata) String() string { return proto.CompactTextStr func (*BlockMetadata) ProtoMessage() {} func (*BlockMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} } -func (m *BlockMetadata) GetMetadata() [][]byte { - if m != nil { - return m.Metadata - } - return nil -} - func init() { proto.RegisterType((*Header)(nil), "common.Header") proto.RegisterType((*ChainHeader)(nil), "common.ChainHeader") @@ -414,54 +302,54 @@ func init() { func init() { proto.RegisterFile("common/common.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 769 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x54, 0xdd, 0x6e, 0xda, 0x48, - 0x18, 0x8d, 0x63, 0x7e, 0x3f, 0xd8, 0xac, 0x77, 0x48, 0x36, 0x6c, 0xb4, 0xab, 0x44, 0x96, 0x76, - 0xb5, 0x4a, 0xb4, 0xa0, 0xcd, 0x6a, 0xa5, 0xbd, 0x35, 0x78, 0x48, 0xac, 0x25, 0xe3, 0x74, 0x6c, - 0xa7, 0x6a, 0x6f, 0x2c, 0x03, 0x13, 0x40, 0x05, 0x1b, 0x19, 0x13, 0x25, 0xb7, 0xed, 0x7d, 0x55, - 0xa9, 0xbd, 0xed, 0x0b, 0xf4, 0x49, 0xfa, 0x06, 0x7d, 0x91, 0x4a, 0xbd, 0xed, 0x78, 0x6c, 0x03, - 0xe6, 0x8a, 0x39, 0xdf, 0xef, 0x39, 0x67, 0x06, 0x43, 0x63, 0x18, 0xcc, 0xe7, 0x81, 0xdf, 0x4e, - 0x7e, 0x5a, 0x8b, 0x30, 0x88, 0x02, 0x54, 0x4a, 0xd0, 0xc9, 0xe9, 0x38, 0x08, 0xc6, 0x33, 0xd6, - 0x16, 0xd1, 0xc1, 0xea, 0xbe, 0x1d, 0x4d, 0xe7, 0x6c, 0x19, 0x79, 0xf3, 0x45, 0x52, 0xa8, 0xbe, - 0x96, 0xa0, 0x74, 0xcd, 0xbc, 0x11, 0x0b, 0xd1, 0xbf, 0x50, 0x1b, 0x4e, 0xbc, 0xa9, 0x9f, 0xc0, - 0xa6, 0x74, 0x26, 0xfd, 0x59, 0xbb, 0x6c, 0xb4, 0xd2, 0xb9, 0xdd, 0x4d, 0x8a, 0x6e, 0xd7, 0x21, - 0x0d, 0x7e, 0x5c, 0x4e, 0xc7, 0xbe, 0x17, 0xad, 0x42, 0x96, 0xb6, 0xee, 0x8b, 0xd6, 0xe3, 0xac, - 0xd5, 0xca, 0xa7, 0xe9, 0x6e, 0xbd, 0xfa, 0x45, 0x82, 0xda, 0xd6, 0x7c, 0x84, 0xa0, 0x10, 0x3d, - 0x2d, 0x98, 0xa0, 0x50, 0xa4, 0xe2, 0x8c, 0x9a, 0x50, 0x7e, 0x60, 0xe1, 0x72, 0x1a, 0xf8, 0x62, - 0x7c, 0x91, 0x66, 0x10, 0xfd, 0x07, 0xd5, 0xb5, 0xaa, 0xa6, 0x2c, 0x56, 0x9f, 0xb4, 0x12, 0xdd, - 0xad, 0x4c, 0x77, 0xcb, 0xce, 0x2a, 0xe8, 0xa6, 0x38, 0x9e, 0x29, 0x94, 0x18, 0x7a, 0xb3, 0xc0, - 0xfb, 0xaa, 0x34, 0x83, 0x82, 0xc1, 0x23, 0x0f, 0x17, 0x45, 0x58, 0x9c, 0xd1, 0x21, 0x14, 0xd9, - 0x22, 0x18, 0x4e, 0x9a, 0x25, 0x1e, 0x2c, 0xd0, 0x04, 0xa0, 0x5f, 0xa1, 0xca, 0x1e, 0x23, 0xe6, - 0x0b, 0x66, 0x65, 0x9e, 0xa9, 0xd3, 0x4d, 0x40, 0xe5, 0xe6, 0xec, 0xa8, 0x17, 0x4b, 0x43, 0xe6, - 0x45, 0x41, 0x62, 0x71, 0x9d, 0x66, 0x30, 0x5e, 0xe0, 0x07, 0xfe, 0x90, 0x09, 0x81, 0x75, 0x9a, - 0x00, 0x15, 0x43, 0xf9, 0xd6, 0x7b, 0x9a, 0x05, 0xde, 0x08, 0xfd, 0x01, 0xa5, 0xc9, 0xf6, 0xe5, - 0x1c, 0x64, 0x0e, 0xa7, 0xc6, 0xa6, 0xd9, 0x98, 0xfd, 0xc8, 0x8b, 0xbc, 0x74, 0x8e, 0x38, 0xab, - 0x1d, 0xa8, 0x60, 0xff, 0x81, 0xcd, 0x82, 0xc4, 0xcb, 0x45, 0x32, 0x32, 0xa3, 0x90, 0xc2, 0x58, - 0xcd, 0xfa, 0x72, 0xd2, 0xf6, 0x4d, 0x40, 0x7d, 0x2b, 0x41, 0xb1, 0x33, 0x0b, 0x86, 0xaf, 0xd0, - 0x45, 0xf6, 0x6a, 0x76, 0x9f, 0x89, 0x48, 0xef, 0xd0, 0xf9, 0x1d, 0x0a, 0x7a, 0x46, 0xa7, 0x76, - 0xf9, 0x53, 0xae, 0x34, 0x4e, 0x24, 0x0c, 0xd1, 0xdf, 0x50, 0xb9, 0x61, 0x91, 0x27, 0x98, 0x27, - 0xd7, 0x78, 0x94, 0x2b, 0xcd, 0x92, 0xb4, 0x32, 0x4f, 0x4f, 0x2a, 0x83, 0xda, 0xd6, 0x42, 0xf4, - 0x33, 0x94, 0xc8, 0x6a, 0x3e, 0x48, 0x59, 0x15, 0x68, 0xc9, 0x17, 0x08, 0xa9, 0x50, 0xbf, 0x0d, - 0xd9, 0xc3, 0x34, 0x58, 0x2d, 0xaf, 0xbd, 0xe5, 0x24, 0x15, 0x56, 0x5f, 0x6c, 0xc5, 0xd0, 0x09, - 0x54, 0x62, 0x2e, 0x22, 0x2f, 0x8b, 0x7c, 0x65, 0x94, 0x62, 0xf5, 0x14, 0xaa, 0x6b, 0xb2, 0xb1, - 0xb9, 0x42, 0x8d, 0x74, 0x26, 0xaf, 0xcd, 0xbd, 0x80, 0x1f, 0x72, 0x14, 0xe3, 0x69, 0x6b, 0x2d, - 0x49, 0xe1, 0x9a, 0xf4, 0xf9, 0x27, 0xfe, 0x97, 0xb3, 0x22, 0xee, 0xe8, 0x12, 0xd5, 0xa0, 0xec, - 0x90, 0xff, 0x89, 0xf9, 0x9c, 0x28, 0x7b, 0xa8, 0x0e, 0x65, 0xcb, 0xe9, 0x76, 0xb1, 0x65, 0x29, - 0x9f, 0x25, 0xa4, 0x70, 0x69, 0x9a, 0xee, 0x52, 0xfc, 0xcc, 0xc1, 0x96, 0xad, 0xbc, 0x93, 0xd1, - 0x01, 0x54, 0x7b, 0x26, 0xed, 0x18, 0xba, 0x8e, 0x89, 0xf2, 0x5e, 0x60, 0x62, 0xda, 0x6e, 0xcf, - 0x74, 0x88, 0xae, 0x7c, 0x90, 0xd1, 0x6f, 0xd0, 0x4c, 0xab, 0x5d, 0x4c, 0x6c, 0xc3, 0x7e, 0xe1, - 0xda, 0xa6, 0xe9, 0xf6, 0x35, 0x7a, 0x85, 0x95, 0x8f, 0x32, 0xa7, 0x74, 0x64, 0x10, 0x1b, 0x53, - 0xa2, 0xf5, 0x5d, 0x0b, 0xd3, 0x3b, 0x4c, 0x5d, 0x4c, 0xa9, 0x49, 0x95, 0xaf, 0x32, 0x7f, 0x10, - 0x8d, 0x38, 0x64, 0x74, 0xb1, 0xeb, 0x10, 0xed, 0x4e, 0x33, 0xfa, 0x5a, 0xa7, 0x8f, 0x95, 0x6f, - 0xf2, 0xf9, 0x1b, 0x09, 0x20, 0x71, 0xd7, 0x8e, 0xff, 0x85, 0x9c, 0xf0, 0x0d, 0x27, 0xa8, 0xf1, - 0x91, 0x7b, 0x7c, 0xe1, 0x2f, 0x5d, 0x93, 0xf4, 0x8c, 0x2b, 0x87, 0x6a, 0xb6, 0x61, 0x12, 0xd7, - 0xa6, 0x1a, 0xb1, 0xb4, 0x6e, 0x7c, 0x56, 0x24, 0x7e, 0x1b, 0x28, 0x9f, 0x36, 0x6c, 0x7c, 0xa3, - 0xec, 0xf3, 0x65, 0x87, 0x98, 0xe8, 0x26, 0xe5, 0x1b, 0x73, 0x1d, 0x32, 0x3a, 0x86, 0x86, 0x49, - 0x75, 0x4c, 0x77, 0x12, 0x85, 0x73, 0x07, 0x50, 0xce, 0x5f, 0xc3, 0x1f, 0xb1, 0x47, 0x6e, 0x00, - 0x58, 0xc6, 0x15, 0xd1, 0x6c, 0x87, 0x62, 0x8b, 0xf3, 0xe1, 0x0b, 0xfb, 0x1a, 0x57, 0x9f, 0xdb, - 0xca, 0x89, 0xf0, 0xb1, 0x5b, 0xe3, 0x2c, 0xb7, 0x67, 0xf4, 0xb9, 0x0f, 0xca, 0x7e, 0xe7, 0xaf, - 0x97, 0x17, 0xe3, 0x69, 0x34, 0x59, 0x0d, 0xe2, 0x77, 0xd6, 0x9e, 0x70, 0x81, 0xe1, 0x8c, 0x8d, - 0xc6, 0x2c, 0x6c, 0xdf, 0x7b, 0x83, 0x70, 0x3a, 0x4c, 0x3e, 0x9b, 0xcb, 0xf4, 0xd3, 0x3a, 0x28, - 0x09, 0xf8, 0xcf, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x57, 0xf4, 0xb8, 0x72, 0x05, 0x00, - 0x00, + // 771 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x54, 0xcd, 0x6e, 0xf2, 0x46, + 0x14, 0x8d, 0x63, 0x7e, 0xc2, 0x35, 0xcd, 0xe7, 0x0e, 0xdf, 0x97, 0xb8, 0xa8, 0x51, 0x90, 0xa5, + 0x56, 0x28, 0x51, 0x41, 0x4d, 0x55, 0xa9, 0x5b, 0x83, 0x07, 0x62, 0x95, 0x8c, 0xd3, 0xb1, 0x9d, + 0xaa, 0xdd, 0x58, 0x06, 0x26, 0x80, 0x0a, 0x36, 0x32, 0x26, 0x4a, 0xb6, 0xed, 0xbe, 0xaa, 0xd4, + 0x6e, 0xfb, 0x02, 0x7d, 0x92, 0xbe, 0x41, 0x5f, 0xa4, 0x52, 0xb7, 0xd5, 0x8c, 0x6d, 0xc0, 0xac, + 0x98, 0x73, 0xcf, 0xfd, 0x39, 0xe7, 0xce, 0x60, 0x68, 0x4c, 0xa2, 0xd5, 0x2a, 0x0a, 0xbb, 0xe9, + 0x4f, 0x67, 0x1d, 0x47, 0x49, 0x84, 0x2a, 0x29, 0x6a, 0x5e, 0xcf, 0xa2, 0x68, 0xb6, 0x64, 0x5d, + 0x11, 0x1d, 0x6f, 0x9f, 0xbb, 0xc9, 0x62, 0xc5, 0x36, 0x49, 0xb0, 0x5a, 0xa7, 0x89, 0xfa, 0xcf, + 0x12, 0x54, 0xee, 0x59, 0x30, 0x65, 0x31, 0xfa, 0x1a, 0x94, 0xc9, 0x3c, 0x58, 0x84, 0x29, 0xd4, + 0xa4, 0x96, 0xd4, 0x56, 0xee, 0x1a, 0x9d, 0xac, 0x6f, 0x7f, 0x4f, 0xd1, 0xc3, 0x3c, 0x64, 0xc0, + 0xbb, 0xcd, 0x62, 0x16, 0x06, 0xc9, 0x36, 0x66, 0x59, 0xe9, 0xa9, 0x28, 0xbd, 0xcc, 0x4b, 0x9d, + 0x22, 0x4d, 0x8f, 0xf3, 0xf5, 0x7f, 0x24, 0x50, 0x0e, 0xfa, 0x23, 0x04, 0xa5, 0xe4, 0x6d, 0xcd, + 0x84, 0x84, 0x32, 0x15, 0x67, 0xa4, 0x41, 0xf5, 0x85, 0xc5, 0x9b, 0x45, 0x14, 0x8a, 0xf6, 0x65, + 0x9a, 0x43, 0xf4, 0x0d, 0xd4, 0x76, 0xae, 0x34, 0x59, 0x8c, 0x6e, 0x76, 0x52, 0xdf, 0x9d, 0xdc, + 0x77, 0xc7, 0xcd, 0x33, 0xe8, 0x3e, 0x99, 0xf7, 0x14, 0x4e, 0x2c, 0x53, 0x2b, 0xb5, 0xa4, 0x76, + 0x8d, 0xe6, 0x50, 0x28, 0x78, 0xb5, 0x4c, 0xad, 0x2c, 0xc2, 0xe2, 0x8c, 0xde, 0x43, 0x99, 0xad, + 0xa3, 0xc9, 0x5c, 0xab, 0xb4, 0xa4, 0x76, 0x89, 0xa6, 0x00, 0x7d, 0x0a, 0x35, 0xf6, 0x9a, 0xb0, + 0x50, 0x28, 0xab, 0xb6, 0xa4, 0x76, 0x9d, 0xee, 0x03, 0xba, 0x01, 0xef, 0x8e, 0xdc, 0x8b, 0xa1, + 0x31, 0x0b, 0x92, 0x28, 0x5d, 0x71, 0x9d, 0xe6, 0x90, 0x0f, 0x08, 0xa3, 0x70, 0xc2, 0x84, 0xc1, + 0x3a, 0x4d, 0x81, 0x8e, 0xa1, 0xfa, 0x18, 0xbc, 0x2d, 0xa3, 0x60, 0x8a, 0x3e, 0x87, 0xca, 0xfc, + 0xf0, 0x72, 0xce, 0xf3, 0x0d, 0x67, 0x8b, 0xcd, 0x58, 0xae, 0x7e, 0x1a, 0x24, 0x41, 0xd6, 0x47, + 0x9c, 0xf5, 0x1e, 0x9c, 0xe1, 0xf0, 0x85, 0x2d, 0xa3, 0x74, 0x97, 0xeb, 0xb4, 0x65, 0x2e, 0x21, + 0x83, 0xdc, 0xcd, 0xee, 0x72, 0xb2, 0xf2, 0x7d, 0x40, 0xff, 0x55, 0x82, 0x72, 0x6f, 0x19, 0x4d, + 0x7e, 0x42, 0xb7, 0xf9, 0xab, 0x39, 0x7e, 0x26, 0x82, 0xce, 0xe5, 0x64, 0x8e, 0x3f, 0x83, 0x92, + 0x99, 0xcb, 0x51, 0xee, 0x3e, 0x2e, 0xa4, 0x72, 0x82, 0x0a, 0x1a, 0x7d, 0x09, 0x67, 0x0f, 0x2c, + 0x09, 0x84, 0xf2, 0xf4, 0x1a, 0x3f, 0x14, 0x52, 0x73, 0x92, 0xee, 0xd2, 0x74, 0x06, 0xca, 0xc1, + 0x40, 0x74, 0x01, 0x15, 0xb2, 0x5d, 0x8d, 0x33, 0x55, 0x25, 0x9a, 0x21, 0xa4, 0x43, 0xfd, 0x31, + 0x66, 0x2f, 0x8b, 0x68, 0xbb, 0xb9, 0x0f, 0x36, 0xf3, 0xcc, 0x58, 0x21, 0x86, 0x9a, 0x70, 0xc6, + 0x55, 0x08, 0x5e, 0x16, 0xfc, 0x0e, 0xeb, 0xd7, 0x50, 0xdb, 0x89, 0xe5, 0xcb, 0x15, 0x6e, 0xa4, + 0x96, 0xcc, 0x97, 0xcb, 0xcf, 0xfa, 0x2d, 0x7c, 0x54, 0x90, 0xc8, 0xbb, 0xed, 0xbc, 0xa4, 0x89, + 0x3b, 0x7c, 0xf3, 0x97, 0x04, 0x15, 0x27, 0x09, 0x92, 0xed, 0x06, 0x29, 0x50, 0xf5, 0xc8, 0xb7, + 0xc4, 0xfe, 0x9e, 0xa8, 0x27, 0xa8, 0x0e, 0x55, 0xc7, 0xeb, 0xf7, 0xb1, 0xe3, 0xa8, 0x7f, 0x4b, + 0x48, 0x05, 0xa5, 0x67, 0x98, 0x3e, 0xc5, 0xdf, 0x79, 0xd8, 0x71, 0xd5, 0xdf, 0x64, 0x74, 0x0e, + 0xb5, 0x81, 0x4d, 0x7b, 0x96, 0x69, 0x62, 0xa2, 0xfe, 0x2e, 0x30, 0xb1, 0x5d, 0x7f, 0x60, 0x7b, + 0xc4, 0x54, 0xff, 0x90, 0xd1, 0x15, 0x68, 0x59, 0xb6, 0x8f, 0x89, 0x6b, 0xb9, 0x3f, 0xf8, 0xae, + 0x6d, 0xfb, 0x23, 0x83, 0x0e, 0xb1, 0xfa, 0xa7, 0x8c, 0x9a, 0xf0, 0xc1, 0x22, 0x2e, 0xa6, 0xc4, + 0x18, 0xf9, 0x0e, 0xa6, 0x4f, 0x98, 0xfa, 0x98, 0x52, 0x9b, 0xaa, 0xff, 0xca, 0x48, 0x83, 0x06, + 0x0f, 0x59, 0x7d, 0xec, 0x7b, 0xc4, 0x78, 0x32, 0xac, 0x91, 0xd1, 0x1b, 0x61, 0xf5, 0x3f, 0xf9, + 0xe6, 0x17, 0x09, 0x20, 0xdd, 0xae, 0xcb, 0xff, 0x85, 0x0a, 0x54, 0x1f, 0xb0, 0xe3, 0x18, 0x43, + 0xac, 0x9e, 0xa0, 0x2b, 0xf8, 0xa4, 0x6f, 0x93, 0x81, 0x35, 0xf4, 0xa8, 0xe1, 0x5a, 0x36, 0xf1, + 0x5d, 0x6a, 0x10, 0xc7, 0xe8, 0xf3, 0xb3, 0x2a, 0xa1, 0x0b, 0x40, 0x45, 0xda, 0x72, 0xf1, 0x83, + 0x7a, 0x8a, 0x34, 0x78, 0x8f, 0x89, 0x69, 0x53, 0x07, 0xd3, 0x42, 0x85, 0x8c, 0x2e, 0xa1, 0x61, + 0x53, 0x13, 0xd3, 0x23, 0xa2, 0x74, 0xe3, 0x01, 0x2a, 0xec, 0xd7, 0x0a, 0xa7, 0xec, 0x15, 0x9d, + 0x03, 0x38, 0xd6, 0x90, 0x18, 0xae, 0x47, 0xb1, 0xa3, 0x9e, 0xf0, 0x81, 0x23, 0xc3, 0x71, 0xfd, + 0xc2, 0x54, 0x55, 0xe2, 0x6d, 0x0f, 0xda, 0x39, 0xfe, 0xc0, 0x1a, 0xb9, 0x98, 0xaa, 0xa7, 0xbd, + 0x2f, 0x7e, 0xbc, 0x9d, 0x2d, 0x92, 0xf9, 0x76, 0xcc, 0xdf, 0x59, 0x77, 0xfe, 0xb6, 0x66, 0xf1, + 0x92, 0x4d, 0x67, 0x2c, 0xee, 0x3e, 0x07, 0xe3, 0x78, 0x31, 0x49, 0x3f, 0x9b, 0x9b, 0xec, 0xd3, + 0x3a, 0xae, 0x08, 0xf8, 0xd5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x69, 0x37, 0x92, 0x72, + 0x05, 0x00, 0x00, } diff --git a/protos/common/configuration.pb.go b/protos/common/configuration.pb.go index 0348c9081ba..04005089836 100644 --- a/protos/common/configuration.pb.go +++ b/protos/common/configuration.pb.go @@ -88,7 +88,7 @@ func (Policy_PolicyType) EnumDescriptor() ([]byte, []int) { return fileDescripto // 4. All configuration changes have a LastModification of one more than the last configuration's highest LastModification number // 5. All configuration changes satisfy the corresponding modification policy type ConfigurationEnvelope struct { - Items []*SignedConfigurationItem `protobuf:"bytes,1,rep,name=Items,json=items" json:"Items,omitempty"` + Items []*SignedConfigurationItem `protobuf:"bytes,1,rep,name=Items" json:"Items,omitempty"` } func (m *ConfigurationEnvelope) Reset() { *m = ConfigurationEnvelope{} } @@ -105,8 +105,8 @@ func (m *ConfigurationEnvelope) GetItems() []*SignedConfigurationItem { // This message may change slightly depending on the finalization of signature schemes for transactions type SignedConfigurationItem struct { - ConfigurationItem []byte `protobuf:"bytes,1,opt,name=ConfigurationItem,json=configurationItem,proto3" json:"ConfigurationItem,omitempty"` - Signatures []*ConfigurationSignature `protobuf:"bytes,2,rep,name=Signatures,json=signatures" json:"Signatures,omitempty"` + ConfigurationItem []byte `protobuf:"bytes,1,opt,name=ConfigurationItem,proto3" json:"ConfigurationItem,omitempty"` + Signatures []*ConfigurationSignature `protobuf:"bytes,2,rep,name=Signatures" json:"Signatures,omitempty"` } func (m *SignedConfigurationItem) Reset() { *m = SignedConfigurationItem{} } @@ -114,13 +114,6 @@ func (m *SignedConfigurationItem) String() string { return proto.Comp func (*SignedConfigurationItem) ProtoMessage() {} func (*SignedConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } -func (m *SignedConfigurationItem) GetConfigurationItem() []byte { - if m != nil { - return m.ConfigurationItem - } - return nil -} - func (m *SignedConfigurationItem) GetSignatures() []*ConfigurationSignature { if m != nil { return m.Signatures @@ -129,12 +122,12 @@ func (m *SignedConfigurationItem) GetSignatures() []*ConfigurationSignature { } type ConfigurationItem struct { - Header *ChainHeader `protobuf:"bytes,1,opt,name=Header,json=header" json:"Header,omitempty"` - Type ConfigurationItem_ConfigurationType `protobuf:"varint,2,opt,name=Type,json=type,enum=common.ConfigurationItem_ConfigurationType" json:"Type,omitempty"` - LastModified uint64 `protobuf:"varint,3,opt,name=LastModified,json=lastModified" json:"LastModified,omitempty"` - ModificationPolicy string `protobuf:"bytes,4,opt,name=ModificationPolicy,json=modificationPolicy" json:"ModificationPolicy,omitempty"` - Key string `protobuf:"bytes,5,opt,name=Key,json=key" json:"Key,omitempty"` - Value []byte `protobuf:"bytes,6,opt,name=Value,json=value,proto3" json:"Value,omitempty"` + Header *ChainHeader `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"` + Type ConfigurationItem_ConfigurationType `protobuf:"varint,2,opt,name=Type,enum=common.ConfigurationItem_ConfigurationType" json:"Type,omitempty"` + LastModified uint64 `protobuf:"varint,3,opt,name=LastModified" json:"LastModified,omitempty"` + ModificationPolicy string `protobuf:"bytes,4,opt,name=ModificationPolicy" json:"ModificationPolicy,omitempty"` + Key string `protobuf:"bytes,5,opt,name=Key" json:"Key,omitempty"` + Value []byte `protobuf:"bytes,6,opt,name=Value,proto3" json:"Value,omitempty"` } func (m *ConfigurationItem) Reset() { *m = ConfigurationItem{} } @@ -149,41 +142,6 @@ func (m *ConfigurationItem) GetHeader() *ChainHeader { return nil } -func (m *ConfigurationItem) GetType() ConfigurationItem_ConfigurationType { - if m != nil { - return m.Type - } - return ConfigurationItem_Policy -} - -func (m *ConfigurationItem) GetLastModified() uint64 { - if m != nil { - return m.LastModified - } - return 0 -} - -func (m *ConfigurationItem) GetModificationPolicy() string { - if m != nil { - return m.ModificationPolicy - } - return "" -} - -func (m *ConfigurationItem) GetKey() string { - if m != nil { - return m.Key - } - return "" -} - -func (m *ConfigurationItem) GetValue() []byte { - if m != nil { - return m.Value - } - return nil -} - type ConfigurationSignature struct { SignatureHeader []byte `protobuf:"bytes,1,opt,name=signatureHeader,proto3" json:"signatureHeader,omitempty"` Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` @@ -194,20 +152,6 @@ func (m *ConfigurationSignature) String() string { return proto.Compa func (*ConfigurationSignature) ProtoMessage() {} func (*ConfigurationSignature) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} } -func (m *ConfigurationSignature) GetSignatureHeader() []byte { - if m != nil { - return m.SignatureHeader - } - return nil -} - -func (m *ConfigurationSignature) GetSignature() []byte { - if m != nil { - return m.Signature - } - return nil -} - // Policy expresses a policy which the orderer can evaluate, because there has been some desire expressed to support // multiple policy engines, this is typed as a oneof for now type Policy struct { @@ -220,25 +164,11 @@ func (m *Policy) String() string { return proto.CompactTextString(m) func (*Policy) ProtoMessage() {} func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} } -func (m *Policy) GetType() int32 { - if m != nil { - return m.Type - } - return 0 -} - -func (m *Policy) GetPolicy() []byte { - if m != nil { - return m.Policy - } - return nil -} - // SignaturePolicyEnvelope wraps a SignaturePolicy and includes a version for future enhancements type SignaturePolicyEnvelope struct { - Version int32 `protobuf:"varint,1,opt,name=Version,json=version" json:"Version,omitempty"` - Policy *SignaturePolicy `protobuf:"bytes,2,opt,name=Policy,json=policy" json:"Policy,omitempty"` - Identities [][]byte `protobuf:"bytes,3,rep,name=Identities,json=identities,proto3" json:"Identities,omitempty"` + Version int32 `protobuf:"varint,1,opt,name=Version" json:"Version,omitempty"` + Policy *SignaturePolicy `protobuf:"bytes,2,opt,name=Policy" json:"Policy,omitempty"` + Identities [][]byte `protobuf:"bytes,3,rep,name=Identities,proto3" json:"Identities,omitempty"` } func (m *SignaturePolicyEnvelope) Reset() { *m = SignaturePolicyEnvelope{} } @@ -246,13 +176,6 @@ func (m *SignaturePolicyEnvelope) String() string { return proto.Comp func (*SignaturePolicyEnvelope) ProtoMessage() {} func (*SignaturePolicyEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} } -func (m *SignaturePolicyEnvelope) GetVersion() int32 { - if m != nil { - return m.Version - } - return 0 -} - func (m *SignaturePolicyEnvelope) GetPolicy() *SignaturePolicy { if m != nil { return m.Policy @@ -260,13 +183,6 @@ func (m *SignaturePolicyEnvelope) GetPolicy() *SignaturePolicy { return nil } -func (m *SignaturePolicyEnvelope) GetIdentities() [][]byte { - if m != nil { - return m.Identities - } - return nil -} - // SignaturePolicy is a recursive message structure which defines a featherweight DSL for describing // policies which are more complicated than 'exactly this signature'. The NOutOf operator is sufficent // to express AND as well as OR, as well as of course N out of the following M policies @@ -290,10 +206,10 @@ type isSignaturePolicy_Type interface { } type SignaturePolicy_SignedBy struct { - SignedBy int32 `protobuf:"varint,1,opt,name=SignedBy,json=signedBy,oneof"` + SignedBy int32 `protobuf:"varint,1,opt,name=SignedBy,oneof"` } type SignaturePolicy_From struct { - From *SignaturePolicy_NOutOf `protobuf:"bytes,2,opt,name=From,json=from,oneof"` + From *SignaturePolicy_NOutOf `protobuf:"bytes,2,opt,name=From,oneof"` } func (*SignaturePolicy_SignedBy) isSignaturePolicy_Type() {} @@ -390,8 +306,8 @@ func _SignaturePolicy_OneofSizer(msg proto.Message) (n int) { } type SignaturePolicy_NOutOf struct { - N int32 `protobuf:"varint,1,opt,name=N,json=n" json:"N,omitempty"` - Policies []*SignaturePolicy `protobuf:"bytes,2,rep,name=Policies,json=policies" json:"Policies,omitempty"` + N int32 `protobuf:"varint,1,opt,name=N" json:"N,omitempty"` + Policies []*SignaturePolicy `protobuf:"bytes,2,rep,name=Policies" json:"Policies,omitempty"` } func (m *SignaturePolicy_NOutOf) Reset() { *m = SignaturePolicy_NOutOf{} } @@ -399,13 +315,6 @@ func (m *SignaturePolicy_NOutOf) String() string { return proto.Compa func (*SignaturePolicy_NOutOf) ProtoMessage() {} func (*SignaturePolicy_NOutOf) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6, 0} } -func (m *SignaturePolicy_NOutOf) GetN() int32 { - if m != nil { - return m.N - } - return 0 -} - func (m *SignaturePolicy_NOutOf) GetPolicies() []*SignaturePolicy { if m != nil { return m.Policies @@ -429,43 +338,42 @@ func init() { func init() { proto.RegisterFile("common/configuration.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 596 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xcd, 0x6e, 0xda, 0x4c, - 0x14, 0x8d, 0xf1, 0x0f, 0x70, 0xf1, 0xf7, 0xc5, 0xb9, 0x69, 0x13, 0x2b, 0xaa, 0xd2, 0xca, 0x2b, - 0xa4, 0xb4, 0xa0, 0x92, 0x76, 0xdb, 0xaa, 0x89, 0x92, 0x26, 0xa2, 0x31, 0xd1, 0x90, 0xa4, 0x52, - 0x57, 0x35, 0xf6, 0x00, 0xa3, 0x82, 0x8d, 0x6c, 0x83, 0xc4, 0xbe, 0x52, 0xdf, 0xa9, 0xcb, 0x3e, - 0x59, 0xc7, 0x33, 0xc6, 0xe5, 0x77, 0x83, 0x99, 0x33, 0xe7, 0xdc, 0x7b, 0xee, 0xd1, 0xcc, 0xc0, - 0x89, 0x1f, 0x8d, 0xc7, 0x51, 0xd8, 0xf4, 0xa3, 0xb0, 0xcf, 0x06, 0xd3, 0xd8, 0x4b, 0x59, 0x14, - 0x36, 0x26, 0x71, 0x94, 0x46, 0x68, 0xc8, 0xbd, 0x93, 0xc3, 0x82, 0x93, 0x7d, 0xe4, 0xa6, 0xe3, - 0xc2, 0xf3, 0xcb, 0x65, 0xcd, 0x55, 0x38, 0xa3, 0xa3, 0x68, 0x42, 0xf1, 0x3d, 0xe8, 0xb7, 0x29, - 0x1d, 0x27, 0xb6, 0xf2, 0x4a, 0xad, 0xd7, 0x5a, 0x2f, 0x1b, 0xb9, 0xac, 0xcb, 0x06, 0x21, 0x0d, - 0x56, 0x34, 0x19, 0x8f, 0xe8, 0x2c, 0x63, 0x3b, 0xbf, 0x14, 0x38, 0xde, 0x41, 0xc1, 0xd7, 0x70, - 0xb0, 0x01, 0xf2, 0xf2, 0x4a, 0xdd, 0x24, 0x07, 0xfe, 0x06, 0xfb, 0x03, 0x40, 0x56, 0xc8, 0x4b, - 0xa7, 0x31, 0x4d, 0xec, 0x92, 0x70, 0x71, 0xba, 0x70, 0xb1, 0x52, 0xa7, 0xa0, 0x11, 0x48, 0x0a, - 0x85, 0xf3, 0xa7, 0xb4, 0xa5, 0x1d, 0x9e, 0x81, 0x71, 0x43, 0xbd, 0x80, 0xc6, 0xa2, 0x71, 0xad, - 0x75, 0x58, 0x54, 0x1c, 0x7a, 0x2c, 0x94, 0x5b, 0xc4, 0x18, 0x8a, 0x2f, 0x7e, 0x04, 0xed, 0x61, - 0x3e, 0xa1, 0xbc, 0xb9, 0x52, 0xff, 0xbf, 0x75, 0xb6, 0xb5, 0x79, 0x56, 0x75, 0x15, 0xc9, 0x24, - 0x44, 0x4b, 0xf9, 0x2f, 0x3a, 0x60, 0x7e, 0xf1, 0x92, 0xf4, 0x2e, 0x0a, 0x58, 0x9f, 0xd1, 0xc0, - 0x56, 0x79, 0x21, 0x8d, 0x98, 0xa3, 0x25, 0x0c, 0x1b, 0x80, 0xf2, 0xbf, 0x2f, 0xd4, 0xf7, 0xd1, - 0x88, 0xf9, 0x73, 0x5b, 0xe3, 0xcc, 0x2a, 0xc1, 0xf1, 0xc6, 0x0e, 0x5a, 0xa0, 0xb6, 0xe9, 0xdc, - 0xd6, 0x05, 0x41, 0xfd, 0x41, 0xe7, 0xf8, 0x0c, 0xf4, 0x27, 0x6f, 0x34, 0xa5, 0xb6, 0x21, 0xb2, - 0xd4, 0x67, 0xd9, 0xc2, 0xb9, 0x5c, 0x1b, 0x3f, 0xb3, 0x85, 0x00, 0x86, 0x2c, 0x63, 0xed, 0x61, - 0x15, 0x74, 0x31, 0xb4, 0xa5, 0x60, 0x0d, 0xca, 0x9d, 0x98, 0x4f, 0x4c, 0x63, 0xab, 0x94, 0x71, - 0xae, 0xbd, 0x5e, 0xcc, 0x7c, 0x4b, 0x75, 0xbe, 0xc3, 0xd1, 0xf6, 0xa8, 0xb1, 0x0e, 0xfb, 0x45, - 0xd8, 0x4b, 0x89, 0x9a, 0x64, 0x1d, 0xc6, 0x17, 0x50, 0x2d, 0x20, 0x11, 0xa5, 0x49, 0xfe, 0x01, - 0xce, 0x60, 0xe1, 0x08, 0x11, 0x44, 0x68, 0xa2, 0x8c, 0x9e, 0x07, 0x78, 0x04, 0xc6, 0x44, 0x06, - 0x22, 0x85, 0xf9, 0xca, 0x79, 0x0b, 0x20, 0x55, 0x62, 0x2a, 0x6e, 0xff, 0xd1, 0x6d, 0xbb, 0x9d, - 0xaf, 0x2e, 0x1f, 0xeb, 0x3f, 0xa8, 0x76, 0x6f, 0x3f, 0xbb, 0x9f, 0x1e, 0x1e, 0xc9, 0x15, 0x1f, - 0xad, 0x0c, 0xea, 0x5d, 0xf7, 0xde, 0x2a, 0x39, 0x3f, 0xf3, 0x93, 0x29, 0xda, 0x4a, 0x71, 0x71, - 0xd8, 0x6d, 0x28, 0x3f, 0xd1, 0x38, 0xe1, 0x03, 0xe6, 0xdd, 0xcb, 0x33, 0xb9, 0xc4, 0xe6, 0xc2, - 0x9e, 0x30, 0x50, 0x6b, 0x1d, 0x2f, 0xdf, 0x83, 0xa5, 0x52, 0x0b, 0x67, 0x78, 0x0a, 0x70, 0x1b, - 0xd0, 0x30, 0x65, 0x29, 0xe3, 0xc7, 0x56, 0xe5, 0xc7, 0xd6, 0x24, 0xc0, 0x0a, 0xc4, 0xf9, 0xad, - 0xc0, 0xfe, 0x9a, 0x96, 0x27, 0x54, 0x91, 0x77, 0xe6, 0x62, 0x2e, 0xfb, 0xdf, 0xec, 0x91, 0x4a, - 0x92, 0x23, 0xf8, 0x0e, 0xb4, 0xeb, 0x38, 0x1a, 0xe7, 0x06, 0x4e, 0x77, 0x18, 0x68, 0xb8, 0x9d, - 0x69, 0xda, 0xe9, 0x73, 0xa5, 0xd6, 0xe7, 0xec, 0x93, 0x36, 0x18, 0x12, 0x41, 0x13, 0x14, 0x37, - 0x1f, 0x4b, 0x09, 0xf1, 0x1c, 0x2a, 0x42, 0xc0, 0x8a, 0x4b, 0xb5, 0x73, 0xa4, 0xca, 0x24, 0x27, - 0x5e, 0x18, 0xf2, 0x22, 0x5c, 0xbc, 0xf9, 0x76, 0x36, 0x60, 0xe9, 0x70, 0xda, 0xcb, 0x24, 0xcd, - 0x21, 0x87, 0xe2, 0x11, 0x0d, 0x06, 0x34, 0x6e, 0xf6, 0xc5, 0x89, 0x69, 0x8a, 0x47, 0x25, 0xc9, - 0x9f, 0x98, 0x9e, 0x21, 0x96, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x4e, 0xe3, 0xee, - 0x9e, 0x04, 0x00, 0x00, + // 579 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0xcd, 0xc6, 0x89, 0xd3, 0x4c, 0x0c, 0x35, 0x53, 0x68, 0xad, 0xaa, 0x2a, 0x96, 0x4f, 0x96, + 0x0a, 0x89, 0x48, 0xe1, 0x0a, 0xa2, 0x55, 0x4b, 0xab, 0x52, 0xa7, 0xda, 0xb4, 0x45, 0xe2, 0x84, + 0x13, 0x6f, 0x92, 0x95, 0x12, 0x3b, 0x5a, 0x3b, 0x48, 0xb9, 0x23, 0xf1, 0x4f, 0x1c, 0xf9, 0x32, + 0xe4, 0x5d, 0xdb, 0x38, 0x69, 0x72, 0xf2, 0xce, 0x9b, 0xf7, 0x66, 0xde, 0x8c, 0x76, 0x0d, 0x87, + 0xc3, 0x68, 0x36, 0x8b, 0xc2, 0xce, 0x30, 0x0a, 0x47, 0x7c, 0xbc, 0x10, 0x7e, 0xc2, 0xa3, 0xb0, + 0x3d, 0x17, 0x51, 0x12, 0xa1, 0xae, 0x72, 0x87, 0x7b, 0x05, 0x27, 0xfd, 0xa8, 0xa4, 0xe3, 0xc1, + 0xab, 0xf3, 0xb2, 0xe6, 0x22, 0xfc, 0xc9, 0xa6, 0xd1, 0x9c, 0xe1, 0x07, 0xa8, 0x5f, 0x27, 0x6c, + 0x16, 0x5b, 0xc4, 0xd6, 0xdc, 0x56, 0xf7, 0x75, 0x3b, 0x93, 0xf5, 0xf9, 0x38, 0x64, 0xc1, 0x8a, + 0x26, 0xe5, 0x51, 0xc5, 0x76, 0x7e, 0x13, 0x38, 0xd8, 0x42, 0xc1, 0x37, 0xf0, 0xe2, 0x09, 0x68, + 0x11, 0x9b, 0xb8, 0x06, 0x7d, 0x9a, 0xc0, 0x8f, 0x00, 0x69, 0x21, 0x3f, 0x59, 0x08, 0x16, 0x5b, + 0x55, 0xe9, 0xe2, 0x38, 0x77, 0xb1, 0x42, 0x2f, 0x68, 0xb4, 0xa4, 0x70, 0xfe, 0x56, 0x37, 0xb4, + 0xc3, 0x13, 0xd0, 0xaf, 0x98, 0x1f, 0x30, 0x21, 0x1b, 0xb7, 0xba, 0x7b, 0x45, 0xc5, 0x89, 0xcf, + 0x43, 0x95, 0xa2, 0x19, 0x05, 0x3f, 0x41, 0xed, 0x7e, 0x39, 0x67, 0x56, 0xd5, 0x26, 0xee, 0xf3, + 0xee, 0xc9, 0xc6, 0xe6, 0x69, 0xd5, 0x55, 0x24, 0x95, 0x50, 0x29, 0x44, 0x07, 0x8c, 0xaf, 0x7e, + 0x9c, 0xdc, 0x46, 0x01, 0x1f, 0x71, 0x16, 0x58, 0x9a, 0x4d, 0xdc, 0x1a, 0x5d, 0xc1, 0xb0, 0x0d, + 0xa8, 0xce, 0x43, 0xa9, 0xbe, 0x8b, 0xa6, 0x7c, 0xb8, 0xb4, 0x6a, 0x36, 0x71, 0x9b, 0x74, 0x43, + 0x06, 0x4d, 0xd0, 0x6e, 0xd8, 0xd2, 0xaa, 0x4b, 0x42, 0x7a, 0xc4, 0x97, 0x50, 0x7f, 0xf4, 0xa7, + 0x0b, 0x66, 0xe9, 0x72, 0x97, 0x2a, 0x70, 0xce, 0xd7, 0xc6, 0x97, 0x86, 0x00, 0x74, 0x55, 0xc6, + 0xac, 0x60, 0x13, 0xea, 0x72, 0x68, 0x93, 0x60, 0x0b, 0x1a, 0x3d, 0x11, 0x30, 0xc1, 0x84, 0x59, + 0x4d, 0x39, 0x97, 0xfe, 0x40, 0xf0, 0xa1, 0xa9, 0x39, 0x3f, 0x60, 0x7f, 0xf3, 0xaa, 0xd1, 0x85, + 0xdd, 0x38, 0x0f, 0x4a, 0x1b, 0x35, 0xe8, 0x3a, 0x8c, 0x47, 0xd0, 0x2c, 0x20, 0xb9, 0x4a, 0x83, + 0xfe, 0x07, 0x9c, 0x71, 0xee, 0x08, 0x11, 0x6a, 0x49, 0xba, 0xed, 0xb4, 0x4c, 0x9d, 0xca, 0x33, + 0xee, 0x83, 0x3e, 0x57, 0x0b, 0x51, 0xc2, 0x2c, 0x72, 0xde, 0x01, 0x28, 0x95, 0x9c, 0xaa, 0x05, + 0x8d, 0x07, 0xef, 0xc6, 0xeb, 0x7d, 0xf3, 0xcc, 0x0a, 0x3e, 0x83, 0x66, 0xff, 0xfa, 0x8b, 0xf7, + 0xf9, 0xfe, 0x81, 0x5e, 0x98, 0x04, 0x1b, 0xa0, 0xdd, 0xf6, 0xef, 0xcc, 0xaa, 0xf3, 0x2b, 0xbb, + 0x99, 0xb2, 0xad, 0x12, 0x17, 0x97, 0xdd, 0x82, 0xc6, 0x23, 0x13, 0x31, 0x8f, 0xc2, 0xac, 0x7b, + 0x1e, 0x62, 0x27, 0xb7, 0x27, 0x0d, 0xb4, 0xba, 0x07, 0xe5, 0x77, 0x50, 0x2a, 0x45, 0xf3, 0x29, + 0x8e, 0x01, 0xae, 0x03, 0x16, 0x26, 0x3c, 0xe1, 0x2c, 0xb6, 0x34, 0x5b, 0x73, 0x0d, 0x5a, 0x42, + 0x9c, 0x3f, 0x04, 0x76, 0xd7, 0xb4, 0x78, 0x04, 0x3b, 0xea, 0xcd, 0x9c, 0x2d, 0x55, 0xff, 0xab, + 0x0a, 0x2d, 0x10, 0x7c, 0x0f, 0xb5, 0x4b, 0x11, 0xcd, 0x32, 0x03, 0xc7, 0x5b, 0x0c, 0xb4, 0xbd, + 0xde, 0x22, 0xe9, 0x8d, 0xae, 0x2a, 0x54, 0xb2, 0x0f, 0x6f, 0x40, 0x57, 0x08, 0x1a, 0x40, 0xbc, + 0x6c, 0x2c, 0xe2, 0xe1, 0x29, 0xec, 0x48, 0x01, 0x2f, 0x1e, 0xd5, 0xd6, 0x91, 0x0a, 0xe2, 0x99, + 0xae, 0x1e, 0xc2, 0xd9, 0xdb, 0xef, 0x27, 0x63, 0x9e, 0x4c, 0x16, 0x83, 0x54, 0xd2, 0x99, 0x2c, + 0xe7, 0x4c, 0x4c, 0x59, 0x30, 0x66, 0xa2, 0x33, 0x92, 0x37, 0xa6, 0x23, 0x7f, 0x2a, 0x71, 0xf6, + 0x8b, 0x19, 0xe8, 0x32, 0x3c, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x15, 0xbd, 0x99, 0x9e, + 0x04, 0x00, 0x00, } diff --git a/protos/peer/chaincode.pb.go b/protos/peer/chaincode.pb.go index f9a8dc7c4a9..76346555628 100644 --- a/protos/peer/chaincode.pb.go +++ b/protos/peer/chaincode.pb.go @@ -2,6 +2,69 @@ // source: peer/chaincode.proto // DO NOT EDIT! +/* +Package peer is a generated protocol buffer package. + +It is generated from these files: + peer/chaincode.proto + peer/chaincode_proposal.proto + peer/chaincode_transaction.proto + peer/chaincodeevent.proto + peer/events.proto + peer/fabric.proto + peer/fabric_message.proto + peer/fabric_proposal.proto + peer/fabric_proposal_response.proto + peer/fabric_service.proto + peer/fabric_transaction.proto + peer/server_admin.proto + +It has these top-level messages: + ChaincodeID + ChaincodeInput + ChaincodeSpec + ChaincodeDeploymentSpec + ChaincodeInvocationSpec + ChaincodeMessage + PutStateInfo + RangeQueryState + RangeQueryStateNext + RangeQueryStateClose + RangeQueryStateKeyValue + RangeQueryStateResponse + ChaincodeHeaderExtension + ChaincodeProposalPayload + ChaincodeAction + ChaincodeActionPayload + ChaincodeEndorsedAction + ChaincodeEvent + ChaincodeReg + Interest + Register + Rejection + Unregister + Event + PeerAddress + PeerID + PeerEndpoint + PeersMessage + PeersAddresses + BlockchainInfo + Message + SignedProposal + Proposal + ProposalResponse + Response + ProposalResponsePayload + Endorsement + SignedTransaction + InvalidTransaction + Transaction + TransactionAction + ServerStatus + LogLevelRequest + LogLevelResponse +*/ package peer import proto "github.com/golang/protobuf/proto" @@ -19,6 +82,12 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + // Confidentiality Levels type ConfidentialityLevel int32 @@ -39,7 +108,7 @@ var ConfidentialityLevel_value = map[string]int32{ func (x ConfidentialityLevel) String() string { return proto.EnumName(ConfidentialityLevel_name, int32(x)) } -func (ConfidentialityLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (ConfidentialityLevel) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type ChaincodeSpec_Type int32 @@ -69,7 +138,7 @@ var ChaincodeSpec_Type_value = map[string]int32{ func (x ChaincodeSpec_Type) String() string { return proto.EnumName(ChaincodeSpec_Type_name, int32(x)) } -func (ChaincodeSpec_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{2, 0} } +func (ChaincodeSpec_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} } type ChaincodeDeploymentSpec_ExecutionEnvironment int32 @@ -91,7 +160,7 @@ func (x ChaincodeDeploymentSpec_ExecutionEnvironment) String() string { return proto.EnumName(ChaincodeDeploymentSpec_ExecutionEnvironment_name, int32(x)) } func (ChaincodeDeploymentSpec_ExecutionEnvironment) EnumDescriptor() ([]byte, []int) { - return fileDescriptor2, []int{3, 0} + return fileDescriptor0, []int{3, 0} } type ChaincodeMessage_Type int32 @@ -158,7 +227,7 @@ var ChaincodeMessage_Type_value = map[string]int32{ func (x ChaincodeMessage_Type) String() string { return proto.EnumName(ChaincodeMessage_Type_name, int32(x)) } -func (ChaincodeMessage_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{5, 0} } +func (ChaincodeMessage_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 0} } // ChaincodeID contains the path as specified by the deploy transaction // that created it as well as the hashCode that is generated by the @@ -178,7 +247,7 @@ type ChaincodeID struct { func (m *ChaincodeID) Reset() { *m = ChaincodeID{} } func (m *ChaincodeID) String() string { return proto.CompactTextString(m) } func (*ChaincodeID) ProtoMessage() {} -func (*ChaincodeID) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (*ChaincodeID) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } // Carries the chaincode function and its arguments. // UnmarshalJSON in transaction.go converts the string-based REST/JSON input to @@ -190,7 +259,7 @@ type ChaincodeInput struct { func (m *ChaincodeInput) Reset() { *m = ChaincodeInput{} } func (m *ChaincodeInput) String() string { return proto.CompactTextString(m) } func (*ChaincodeInput) ProtoMessage() {} -func (*ChaincodeInput) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } +func (*ChaincodeInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } // Carries the chaincode specification. This is the actual metadata required for // defining a chaincode. @@ -207,7 +276,7 @@ type ChaincodeSpec struct { func (m *ChaincodeSpec) Reset() { *m = ChaincodeSpec{} } func (m *ChaincodeSpec) String() string { return proto.CompactTextString(m) } func (*ChaincodeSpec) ProtoMessage() {} -func (*ChaincodeSpec) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } +func (*ChaincodeSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *ChaincodeSpec) GetChaincodeID() *ChaincodeID { if m != nil { @@ -236,7 +305,7 @@ type ChaincodeDeploymentSpec struct { func (m *ChaincodeDeploymentSpec) Reset() { *m = ChaincodeDeploymentSpec{} } func (m *ChaincodeDeploymentSpec) String() string { return proto.CompactTextString(m) } func (*ChaincodeDeploymentSpec) ProtoMessage() {} -func (*ChaincodeDeploymentSpec) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} } +func (*ChaincodeDeploymentSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *ChaincodeDeploymentSpec) GetChaincodeSpec() *ChaincodeSpec { if m != nil { @@ -268,7 +337,7 @@ type ChaincodeInvocationSpec struct { func (m *ChaincodeInvocationSpec) Reset() { *m = ChaincodeInvocationSpec{} } func (m *ChaincodeInvocationSpec) String() string { return proto.CompactTextString(m) } func (*ChaincodeInvocationSpec) ProtoMessage() {} -func (*ChaincodeInvocationSpec) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} } +func (*ChaincodeInvocationSpec) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *ChaincodeInvocationSpec) GetChaincodeSpec() *ChaincodeSpec { if m != nil { @@ -291,7 +360,7 @@ type ChaincodeMessage struct { func (m *ChaincodeMessage) Reset() { *m = ChaincodeMessage{} } func (m *ChaincodeMessage) String() string { return proto.CompactTextString(m) } func (*ChaincodeMessage) ProtoMessage() {} -func (*ChaincodeMessage) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} } +func (*ChaincodeMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } func (m *ChaincodeMessage) GetTimestamp() *google_protobuf.Timestamp { if m != nil { @@ -315,7 +384,7 @@ type PutStateInfo struct { func (m *PutStateInfo) Reset() { *m = PutStateInfo{} } func (m *PutStateInfo) String() string { return proto.CompactTextString(m) } func (*PutStateInfo) ProtoMessage() {} -func (*PutStateInfo) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} } +func (*PutStateInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } type RangeQueryState struct { StartKey string `protobuf:"bytes,1,opt,name=startKey" json:"startKey,omitempty"` @@ -325,7 +394,7 @@ type RangeQueryState struct { func (m *RangeQueryState) Reset() { *m = RangeQueryState{} } func (m *RangeQueryState) String() string { return proto.CompactTextString(m) } func (*RangeQueryState) ProtoMessage() {} -func (*RangeQueryState) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} } +func (*RangeQueryState) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } type RangeQueryStateNext struct { ID string `protobuf:"bytes,1,opt,name=ID" json:"ID,omitempty"` @@ -334,7 +403,7 @@ type RangeQueryStateNext struct { func (m *RangeQueryStateNext) Reset() { *m = RangeQueryStateNext{} } func (m *RangeQueryStateNext) String() string { return proto.CompactTextString(m) } func (*RangeQueryStateNext) ProtoMessage() {} -func (*RangeQueryStateNext) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} } +func (*RangeQueryStateNext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } type RangeQueryStateClose struct { ID string `protobuf:"bytes,1,opt,name=ID" json:"ID,omitempty"` @@ -343,7 +412,7 @@ type RangeQueryStateClose struct { func (m *RangeQueryStateClose) Reset() { *m = RangeQueryStateClose{} } func (m *RangeQueryStateClose) String() string { return proto.CompactTextString(m) } func (*RangeQueryStateClose) ProtoMessage() {} -func (*RangeQueryStateClose) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} } +func (*RangeQueryStateClose) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } type RangeQueryStateKeyValue struct { Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` @@ -353,7 +422,7 @@ type RangeQueryStateKeyValue struct { func (m *RangeQueryStateKeyValue) Reset() { *m = RangeQueryStateKeyValue{} } func (m *RangeQueryStateKeyValue) String() string { return proto.CompactTextString(m) } func (*RangeQueryStateKeyValue) ProtoMessage() {} -func (*RangeQueryStateKeyValue) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} } +func (*RangeQueryStateKeyValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } type RangeQueryStateResponse struct { KeysAndValues []*RangeQueryStateKeyValue `protobuf:"bytes,1,rep,name=keysAndValues" json:"keysAndValues,omitempty"` @@ -364,7 +433,7 @@ type RangeQueryStateResponse struct { func (m *RangeQueryStateResponse) Reset() { *m = RangeQueryStateResponse{} } func (m *RangeQueryStateResponse) String() string { return proto.CompactTextString(m) } func (*RangeQueryStateResponse) ProtoMessage() {} -func (*RangeQueryStateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} } +func (*RangeQueryStateResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func (m *RangeQueryStateResponse) GetKeysAndValues() []*RangeQueryStateKeyValue { if m != nil { @@ -493,12 +562,12 @@ var _ChaincodeSupport_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: fileDescriptor2, + Metadata: fileDescriptor0, } -func init() { proto.RegisterFile("peer/chaincode.proto", fileDescriptor2) } +func init() { proto.RegisterFile("peer/chaincode.proto", fileDescriptor0) } -var fileDescriptor2 = []byte{ +var fileDescriptor0 = []byte{ // 1056 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x5d, 0x6f, 0xe2, 0x46, 0x17, 0x8e, 0x81, 0x04, 0x38, 0x7c, 0x64, 0x76, 0x96, 0x4d, 0x78, 0x79, 0xdb, 0x2e, 0xb2, 0xda, diff --git a/protos/peer/chaincode_transaction.pb.go b/protos/peer/chaincode_transaction.pb.go index 286eb44ab8f..d464d520c81 100644 --- a/protos/peer/chaincode_transaction.pb.go +++ b/protos/peer/chaincode_transaction.pb.go @@ -34,7 +34,7 @@ type ChaincodeActionPayload struct { func (m *ChaincodeActionPayload) Reset() { *m = ChaincodeActionPayload{} } func (m *ChaincodeActionPayload) String() string { return proto.CompactTextString(m) } func (*ChaincodeActionPayload) ProtoMessage() {} -func (*ChaincodeActionPayload) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } +func (*ChaincodeActionPayload) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } func (m *ChaincodeActionPayload) GetAction() *ChaincodeEndorsedAction { if m != nil { @@ -58,7 +58,7 @@ type ChaincodeEndorsedAction struct { func (m *ChaincodeEndorsedAction) Reset() { *m = ChaincodeEndorsedAction{} } func (m *ChaincodeEndorsedAction) String() string { return proto.CompactTextString(m) } func (*ChaincodeEndorsedAction) ProtoMessage() {} -func (*ChaincodeEndorsedAction) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} } +func (*ChaincodeEndorsedAction) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } func (m *ChaincodeEndorsedAction) GetEndorsements() []*Endorsement { if m != nil { @@ -72,9 +72,9 @@ func init() { proto.RegisterType((*ChaincodeEndorsedAction)(nil), "protos.ChaincodeEndorsedAction") } -func init() { proto.RegisterFile("peer/chaincode_transaction.proto", fileDescriptor3) } +func init() { proto.RegisterFile("peer/chaincode_transaction.proto", fileDescriptor2) } -var fileDescriptor3 = []byte{ +var fileDescriptor2 = []byte{ // 248 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4f, 0xc3, 0x30, 0x14, 0x84, 0xe5, 0x22, 0x75, 0x70, 0x3b, 0x19, 0x89, 0x46, 0x2c, 0x44, 0x65, 0x09, 0x42, 0x4a, diff --git a/protos/peer/chaincodeevent.pb.go b/protos/peer/chaincodeevent.pb.go index 982fbbba8d4..91eb13ad47d 100644 --- a/protos/peer/chaincodeevent.pb.go +++ b/protos/peer/chaincodeevent.pb.go @@ -2,69 +2,6 @@ // source: peer/chaincodeevent.proto // DO NOT EDIT! -/* -Package peer is a generated protocol buffer package. - -It is generated from these files: - peer/chaincodeevent.proto - peer/chaincode_proposal.proto - peer/chaincode.proto - peer/chaincode_transaction.proto - peer/events.proto - peer/fabric_message.proto - peer/fabric_proposal.proto - peer/fabric_proposal_response.proto - peer/fabric.proto - peer/fabric_service.proto - peer/fabric_transaction.proto - peer/server_admin.proto - -It has these top-level messages: - ChaincodeEvent - ChaincodeHeaderExtension - ChaincodeProposalPayload - ChaincodeAction - ChaincodeID - ChaincodeInput - ChaincodeSpec - ChaincodeDeploymentSpec - ChaincodeInvocationSpec - ChaincodeMessage - PutStateInfo - RangeQueryState - RangeQueryStateNext - RangeQueryStateClose - RangeQueryStateKeyValue - RangeQueryStateResponse - ChaincodeActionPayload - ChaincodeEndorsedAction - ChaincodeReg - Interest - Register - Rejection - Unregister - Event - Message - SignedProposal - Proposal - ProposalResponse - Response - ProposalResponsePayload - Endorsement - PeerAddress - PeerID - PeerEndpoint - PeersMessage - PeersAddresses - BlockchainInfo - SignedTransaction - InvalidTransaction - Transaction - TransactionAction - ServerStatus - LogLevelRequest - LogLevelResponse -*/ package peer import proto "github.com/golang/protobuf/proto" @@ -76,12 +13,6 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - // ChaincodeEvent is used for events and registrations that are specific to chaincode // string type - "chaincode" type ChaincodeEvent struct { @@ -94,15 +25,15 @@ type ChaincodeEvent struct { func (m *ChaincodeEvent) Reset() { *m = ChaincodeEvent{} } func (m *ChaincodeEvent) String() string { return proto.CompactTextString(m) } func (*ChaincodeEvent) ProtoMessage() {} -func (*ChaincodeEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (*ChaincodeEvent) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } func init() { proto.RegisterType((*ChaincodeEvent)(nil), "protos.ChaincodeEvent") } -func init() { proto.RegisterFile("peer/chaincodeevent.proto", fileDescriptor0) } +func init() { proto.RegisterFile("peer/chaincodeevent.proto", fileDescriptor3) } -var fileDescriptor0 = []byte{ +var fileDescriptor3 = []byte{ // 186 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x48, 0x4d, 0x2d, 0xd2, 0x4f, 0xce, 0x48, 0xcc, 0xcc, 0x4b, 0xce, 0x4f, 0x49, 0x4d, 0x2d, 0x4b, 0xcd, 0x2b, 0xd1, diff --git a/protos/peer/fabric.pb.go b/protos/peer/fabric.pb.go index 172266ab16b..1d94bf5bec1 100644 --- a/protos/peer/fabric.pb.go +++ b/protos/peer/fabric.pb.go @@ -35,7 +35,7 @@ var PeerEndpoint_Type_value = map[string]int32{ func (x PeerEndpoint_Type) String() string { return proto.EnumName(PeerEndpoint_Type_name, int32(x)) } -func (PeerEndpoint_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor8, []int{2, 0} } +func (PeerEndpoint_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{2, 0} } type PeerAddress struct { Host string `protobuf:"bytes,1,opt,name=host" json:"host,omitempty"` @@ -45,7 +45,7 @@ type PeerAddress struct { func (m *PeerAddress) Reset() { *m = PeerAddress{} } func (m *PeerAddress) String() string { return proto.CompactTextString(m) } func (*PeerAddress) ProtoMessage() {} -func (*PeerAddress) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} } +func (*PeerAddress) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} } type PeerID struct { Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` @@ -54,7 +54,7 @@ type PeerID struct { func (m *PeerID) Reset() { *m = PeerID{} } func (m *PeerID) String() string { return proto.CompactTextString(m) } func (*PeerID) ProtoMessage() {} -func (*PeerID) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{1} } +func (*PeerID) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} } type PeerEndpoint struct { ID *PeerID `protobuf:"bytes,1,opt,name=ID" json:"ID,omitempty"` @@ -66,7 +66,7 @@ type PeerEndpoint struct { func (m *PeerEndpoint) Reset() { *m = PeerEndpoint{} } func (m *PeerEndpoint) String() string { return proto.CompactTextString(m) } func (*PeerEndpoint) ProtoMessage() {} -func (*PeerEndpoint) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{2} } +func (*PeerEndpoint) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} } func (m *PeerEndpoint) GetID() *PeerID { if m != nil { @@ -82,7 +82,7 @@ type PeersMessage struct { func (m *PeersMessage) Reset() { *m = PeersMessage{} } func (m *PeersMessage) String() string { return proto.CompactTextString(m) } func (*PeersMessage) ProtoMessage() {} -func (*PeersMessage) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{3} } +func (*PeersMessage) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} } func (m *PeersMessage) GetPeers() []*PeerEndpoint { if m != nil { @@ -98,7 +98,7 @@ type PeersAddresses struct { func (m *PeersAddresses) Reset() { *m = PeersAddresses{} } func (m *PeersAddresses) String() string { return proto.CompactTextString(m) } func (*PeersAddresses) ProtoMessage() {} -func (*PeersAddresses) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{4} } +func (*PeersAddresses) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{4} } // Contains information about the blockchain ledger such as height, current // block hash, and previous block hash. @@ -111,7 +111,7 @@ type BlockchainInfo struct { func (m *BlockchainInfo) Reset() { *m = BlockchainInfo{} } func (m *BlockchainInfo) String() string { return proto.CompactTextString(m) } func (*BlockchainInfo) ProtoMessage() {} -func (*BlockchainInfo) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{5} } +func (*BlockchainInfo) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{5} } func init() { proto.RegisterType((*PeerAddress)(nil), "protos.PeerAddress") @@ -123,9 +123,9 @@ func init() { proto.RegisterEnum("protos.PeerEndpoint_Type", PeerEndpoint_Type_name, PeerEndpoint_Type_value) } -func init() { proto.RegisterFile("peer/fabric.proto", fileDescriptor8) } +func init() { proto.RegisterFile("peer/fabric.proto", fileDescriptor5) } -var fileDescriptor8 = []byte{ +var fileDescriptor5 = []byte{ // 398 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x52, 0x51, 0x6b, 0xd4, 0x40, 0x10, 0x76, 0x73, 0xb9, 0x93, 0xcc, 0x5d, 0xc3, 0xdd, 0x52, 0x24, 0x42, 0x91, 0x90, 0xa7, 0x58, diff --git a/protos/peer/fabric_message.pb.go b/protos/peer/fabric_message.pb.go index 62e502f44b1..f3c86755285 100644 --- a/protos/peer/fabric_message.pb.go +++ b/protos/peer/fabric_message.pb.go @@ -38,7 +38,7 @@ var Message_Type_value = map[string]int32{ func (x Message_Type) String() string { return proto.EnumName(Message_Type_name, int32(x)) } -func (Message_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 0} } +func (Message_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor6, []int{0, 0} } // A Message encapsulates a payload of the indicated type in this message. type Message struct { @@ -54,16 +54,16 @@ type Message struct { func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} -func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} } +func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} } func init() { proto.RegisterType((*Message)(nil), "protos.Message") proto.RegisterEnum("protos.Message_Type", Message_Type_name, Message_Type_value) } -func init() { proto.RegisterFile("peer/fabric_message.proto", fileDescriptor5) } +func init() { proto.RegisterFile("peer/fabric_message.proto", fileDescriptor6) } -var fileDescriptor5 = []byte{ +var fileDescriptor6 = []byte{ // 212 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x48, 0x4d, 0x2d, 0xd2, 0x4f, 0x4b, 0x4c, 0x2a, 0xca, 0x4c, 0x8e, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0xd5, diff --git a/protos/peer/fabric_proposal.pb.go b/protos/peer/fabric_proposal.pb.go index 92a70522bad..624015b7d97 100644 --- a/protos/peer/fabric_proposal.pb.go +++ b/protos/peer/fabric_proposal.pb.go @@ -49,7 +49,7 @@ type SignedProposal struct { func (m *SignedProposal) Reset() { *m = SignedProposal{} } func (m *SignedProposal) String() string { return proto.CompactTextString(m) } func (*SignedProposal) ProtoMessage() {} -func (*SignedProposal) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} } +func (*SignedProposal) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} } // A Proposal is sent to an endorser for endorsement. The proposal contains: // 1. A header which should be unmarshaled to a Header message. Note that @@ -85,16 +85,16 @@ type Proposal struct { func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} -func (*Proposal) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{1} } +func (*Proposal) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{1} } func init() { proto.RegisterType((*SignedProposal)(nil), "protos.SignedProposal") proto.RegisterType((*Proposal)(nil), "protos.Proposal") } -func init() { proto.RegisterFile("peer/fabric_proposal.proto", fileDescriptor6) } +func init() { proto.RegisterFile("peer/fabric_proposal.proto", fileDescriptor7) } -var fileDescriptor6 = []byte{ +var fileDescriptor7 = []byte{ // 196 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2a, 0x48, 0x4d, 0x2d, 0xd2, 0x4f, 0x4b, 0x4c, 0x2a, 0xca, 0x4c, 0x8e, 0x2f, 0x28, 0xca, 0x2f, 0xc8, 0x2f, 0x4e, 0xcc, diff --git a/protos/peer/fabric_proposal_response.pb.go b/protos/peer/fabric_proposal_response.pb.go index b8f014ca5e8..40c99a3ea0b 100644 --- a/protos/peer/fabric_proposal_response.pb.go +++ b/protos/peer/fabric_proposal_response.pb.go @@ -41,7 +41,7 @@ type ProposalResponse struct { func (m *ProposalResponse) Reset() { *m = ProposalResponse{} } func (m *ProposalResponse) String() string { return proto.CompactTextString(m) } func (*ProposalResponse) ProtoMessage() {} -func (*ProposalResponse) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{0} } +func (*ProposalResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{0} } func (m *ProposalResponse) GetTimestamp() *google_protobuf.Timestamp { if m != nil { @@ -78,7 +78,7 @@ type Response struct { func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} -func (*Response) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{1} } +func (*Response) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{1} } // ProposalResponsePayload is the payload of a proposal response. This message // is the "bridge" between the client's request and the endorser's action in @@ -113,7 +113,7 @@ type ProposalResponsePayload struct { func (m *ProposalResponsePayload) Reset() { *m = ProposalResponsePayload{} } func (m *ProposalResponsePayload) String() string { return proto.CompactTextString(m) } func (*ProposalResponsePayload) ProtoMessage() {} -func (*ProposalResponsePayload) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{2} } +func (*ProposalResponsePayload) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{2} } // An endorsement is a signature of an endorser over a proposal response. By // producing an endorsement message, an endorser implicitly "approves" that @@ -135,7 +135,7 @@ type Endorsement struct { func (m *Endorsement) Reset() { *m = Endorsement{} } func (m *Endorsement) String() string { return proto.CompactTextString(m) } func (*Endorsement) ProtoMessage() {} -func (*Endorsement) Descriptor() ([]byte, []int) { return fileDescriptor7, []int{3} } +func (*Endorsement) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{3} } func init() { proto.RegisterType((*ProposalResponse)(nil), "protos.ProposalResponse") @@ -144,9 +144,9 @@ func init() { proto.RegisterType((*Endorsement)(nil), "protos.Endorsement") } -func init() { proto.RegisterFile("peer/fabric_proposal_response.proto", fileDescriptor7) } +func init() { proto.RegisterFile("peer/fabric_proposal_response.proto", fileDescriptor8) } -var fileDescriptor7 = []byte{ +var fileDescriptor8 = []byte{ // 345 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x52, 0x4d, 0x6b, 0xe3, 0x30, 0x10, 0xc5, 0xd9, 0x4d, 0x36, 0x99, 0xe4, 0x10, 0xb4, 0xb0, 0x6b, 0x42, 0xa1, 0xc1, 0xbd, 0xa4,