diff --git a/bddtests/common/common_pb2.py b/bddtests/common/common_pb2.py index 0ee84e67953..a4a18e97aa0 100644 --- a/bddtests/common/common_pb2.py +++ b/bddtests/common/common_pb2.py @@ -21,7 +21,7 @@ name='common/common.proto', package='common', syntax='proto3', - serialized_pb=_b('\n\x13\x63ommon/common.proto\x12\x06\x63ommon\x1a\x1fgoogle/protobuf/timestamp.proto\"\x1b\n\nLastConfig\x12\r\n\x05index\x18\x01 \x01(\x04\"H\n\x08Metadata\x12\r\n\x05value\x18\x01 \x01(\x0c\x12-\n\nsignatures\x18\x02 \x03(\x0b\x32\x19.common.MetadataSignature\"@\n\x11MetadataSignature\x12\x18\n\x10signature_header\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\":\n\x06Header\x12\x16\n\x0e\x63hannel_header\x18\x01 \x01(\x0c\x12\x18\n\x10signature_header\x18\x02 \x01(\x0c\"\xa2\x01\n\rChannelHeader\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0f\n\x07version\x18\x02 \x01(\x05\x12-\n\ttimestamp\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nchannel_id\x18\x04 \x01(\t\x12\r\n\x05tx_id\x18\x05 \x01(\t\x12\r\n\x05\x65poch\x18\x06 \x01(\x04\x12\x11\n\textension\x18\x07 \x01(\x0c\"1\n\x0fSignatureHeader\x12\x0f\n\x07\x63reator\x18\x01 \x01(\x0c\x12\r\n\x05nonce\x18\x02 \x01(\x0c\"7\n\x07Payload\x12\x1e\n\x06header\x18\x01 \x01(\x0b\x32\x0e.common.Header\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\".\n\x08\x45nvelope\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"v\n\x05\x42lock\x12#\n\x06header\x18\x01 \x01(\x0b\x32\x13.common.BlockHeader\x12\x1f\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x11.common.BlockData\x12\'\n\x08metadata\x18\x03 \x01(\x0b\x32\x15.common.BlockMetadata\"G\n\x0b\x42lockHeader\x12\x0e\n\x06number\x18\x01 \x01(\x04\x12\x15\n\rprevious_hash\x18\x02 \x01(\x0c\x12\x11\n\tdata_hash\x18\x03 \x01(\x0c\"\x19\n\tBlockData\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x0c\"!\n\rBlockMetadata\x12\x10\n\x08metadata\x18\x01 \x03(\x0c*\xaa\x01\n\x06Status\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0c\n\x07SUCCESS\x10\xc8\x01\x12\x10\n\x0b\x42\x41\x44_REQUEST\x10\x90\x03\x12\x0e\n\tFORBIDDEN\x10\x93\x03\x12\x0e\n\tNOT_FOUND\x10\x94\x03\x12\x1d\n\x18REQUEST_ENTITY_TOO_LARGE\x10\x9d\x03\x12\x1a\n\x15INTERNAL_SERVER_ERROR\x10\xf4\x03\x12\x18\n\x13SERVICE_UNAVAILABLE\x10\xf7\x03*\x82\x01\n\nHeaderType\x12\x0b\n\x07MESSAGE\x10\x00\x12\n\n\x06\x43ONFIG\x10\x01\x12\x11\n\rCONFIG_UPDATE\x10\x02\x12\x18\n\x14\x45NDORSER_TRANSACTION\x10\x03\x12\x17\n\x13ORDERER_TRANSACTION\x10\x04\x12\x15\n\x11\x44\x45LIVER_SEEK_INFO\x10\x05*[\n\x12\x42lockMetadataIndex\x12\x0e\n\nSIGNATURES\x10\x00\x12\x0f\n\x0bLAST_CONFIG\x10\x01\x12\x17\n\x13TRANSACTIONS_FILTER\x10\x02\x12\x0b\n\x07ORDERER\x10\x03\x42-Z+github.com/hyperledger/fabric/protos/commonb\x06proto3') + serialized_pb=_b('\n\x13\x63ommon/common.proto\x12\x06\x63ommon\x1a\x1fgoogle/protobuf/timestamp.proto\"\x1b\n\nLastConfig\x12\r\n\x05index\x18\x01 \x01(\x04\"H\n\x08Metadata\x12\r\n\x05value\x18\x01 \x01(\x0c\x12-\n\nsignatures\x18\x02 \x03(\x0b\x32\x19.common.MetadataSignature\"@\n\x11MetadataSignature\x12\x18\n\x10signature_header\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\":\n\x06Header\x12\x16\n\x0e\x63hannel_header\x18\x01 \x01(\x0c\x12\x18\n\x10signature_header\x18\x02 \x01(\x0c\"\xa2\x01\n\rChannelHeader\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0f\n\x07version\x18\x02 \x01(\x05\x12-\n\ttimestamp\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x12\n\nchannel_id\x18\x04 \x01(\t\x12\r\n\x05tx_id\x18\x05 \x01(\t\x12\r\n\x05\x65poch\x18\x06 \x01(\x04\x12\x11\n\textension\x18\x07 \x01(\x0c\"1\n\x0fSignatureHeader\x12\x0f\n\x07\x63reator\x18\x01 \x01(\x0c\x12\r\n\x05nonce\x18\x02 \x01(\x0c\"7\n\x07Payload\x12\x1e\n\x06header\x18\x01 \x01(\x0b\x32\x0e.common.Header\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\".\n\x08\x45nvelope\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"v\n\x05\x42lock\x12#\n\x06header\x18\x01 \x01(\x0b\x32\x13.common.BlockHeader\x12\x1f\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x11.common.BlockData\x12\'\n\x08metadata\x18\x03 \x01(\x0b\x32\x15.common.BlockMetadata\"G\n\x0b\x42lockHeader\x12\x0e\n\x06number\x18\x01 \x01(\x04\x12\x15\n\rprevious_hash\x18\x02 \x01(\x0c\x12\x11\n\tdata_hash\x18\x03 \x01(\x0c\"\x19\n\tBlockData\x12\x0c\n\x04\x64\x61ta\x18\x01 \x03(\x0c\"!\n\rBlockMetadata\x12\x10\n\x08metadata\x18\x01 \x03(\x0c*\xaa\x01\n\x06Status\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0c\n\x07SUCCESS\x10\xc8\x01\x12\x10\n\x0b\x42\x41\x44_REQUEST\x10\x90\x03\x12\x0e\n\tFORBIDDEN\x10\x93\x03\x12\x0e\n\tNOT_FOUND\x10\x94\x03\x12\x1d\n\x18REQUEST_ENTITY_TOO_LARGE\x10\x9d\x03\x12\x1a\n\x15INTERNAL_SERVER_ERROR\x10\xf4\x03\x12\x18\n\x13SERVICE_UNAVAILABLE\x10\xf7\x03*\x82\x01\n\nHeaderType\x12\x0b\n\x07MESSAGE\x10\x00\x12\n\n\x06\x43ONFIG\x10\x01\x12\x11\n\rCONFIG_UPDATE\x10\x02\x12\x18\n\x14\x45NDORSER_TRANSACTION\x10\x03\x12\x17\n\x13ORDERER_TRANSACTION\x10\x04\x12\x15\n\x11\x44\x45LIVER_SEEK_INFO\x10\x05*[\n\x12\x42lockMetadataIndex\x12\x0e\n\nSIGNATURES\x10\x00\x12\x0f\n\x0bLAST_CONFIG\x10\x01\x12\x17\n\x13TRANSACTIONS_FILTER\x10\x02\x12\x0b\n\x07ORDERER\x10\x03\x42S\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/commonb\x06proto3') , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -755,7 +755,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z+github.com/hyperledger/fabric/protos/common')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/common')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/common/configtx_pb2.py b/bddtests/common/configtx_pb2.py index fb095302dc6..00be0dde677 100644 --- a/bddtests/common/configtx_pb2.py +++ b/bddtests/common/configtx_pb2.py @@ -21,7 +21,7 @@ name='common/configtx.proto', package='common', syntax='proto3', - serialized_pb=_b('\n\x15\x63ommon/configtx.proto\x12\x06\x63ommon\x1a\x13\x63ommon/common.proto\x1a\x15\x63ommon/policies.proto\"W\n\x0e\x43onfigEnvelope\x12\x1e\n\x06\x63onfig\x18\x01 \x01(\x0b\x32\x0e.common.Config\x12%\n\x0blast_update\x18\x02 \x01(\x0b\x32\x10.common.Envelope\"\x9d\x03\n\x11\x43onfigGroupSchema\x12\x35\n\x06groups\x18\x01 \x03(\x0b\x32%.common.ConfigGroupSchema.GroupsEntry\x12\x35\n\x06values\x18\x02 \x03(\x0b\x32%.common.ConfigGroupSchema.ValuesEntry\x12\x39\n\x08policies\x18\x03 \x03(\x0b\x32\'.common.ConfigGroupSchema.PoliciesEntry\x1aH\n\x0bGroupsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.common.ConfigGroupSchema:\x02\x38\x01\x1aH\n\x0bValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.common.ConfigValueSchema:\x02\x38\x01\x1aK\n\rPoliciesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.common.ConfigPolicySchema:\x02\x38\x01\"\x13\n\x11\x43onfigValueSchema\"\x14\n\x12\x43onfigPolicySchema\"F\n\x06\x43onfig\x12\x10\n\x08sequence\x18\x01 \x01(\x04\x12*\n\rchannel_group\x18\x02 \x01(\x0b\x32\x13.common.ConfigGroup\"Z\n\x14\x43onfigUpdateEnvelope\x12\x15\n\rconfig_update\x18\x01 \x01(\x0c\x12+\n\nsignatures\x18\x02 \x03(\x0b\x32\x17.common.ConfigSignature\"q\n\x0c\x43onfigUpdate\x12\x12\n\nchannel_id\x18\x01 \x01(\t\x12%\n\x08read_set\x18\x02 \x01(\x0b\x32\x13.common.ConfigGroup\x12&\n\twrite_set\x18\x03 \x01(\x0b\x32\x13.common.ConfigGroup\"\x98\x03\n\x0b\x43onfigGroup\x12\x0f\n\x07version\x18\x01 \x01(\x04\x12/\n\x06groups\x18\x02 \x03(\x0b\x32\x1f.common.ConfigGroup.GroupsEntry\x12/\n\x06values\x18\x03 \x03(\x0b\x32\x1f.common.ConfigGroup.ValuesEntry\x12\x33\n\x08policies\x18\x04 \x03(\x0b\x32!.common.ConfigGroup.PoliciesEntry\x12\x12\n\nmod_policy\x18\x05 \x01(\t\x1a\x42\n\x0bGroupsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.common.ConfigGroup:\x02\x38\x01\x1a\x42\n\x0bValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.common.ConfigValue:\x02\x38\x01\x1a\x45\n\rPoliciesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.common.ConfigPolicy:\x02\x38\x01\"A\n\x0b\x43onfigValue\x12\x0f\n\x07version\x18\x01 \x01(\x04\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x12\n\nmod_policy\x18\x03 \x01(\t\"S\n\x0c\x43onfigPolicy\x12\x0f\n\x07version\x18\x01 \x01(\x04\x12\x1e\n\x06policy\x18\x02 \x01(\x0b\x32\x0e.common.Policy\x12\x12\n\nmod_policy\x18\x03 \x01(\t\">\n\x0f\x43onfigSignature\x12\x18\n\x10signature_header\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\x42-Z+github.com/hyperledger/fabric/protos/commonb\x06proto3') + serialized_pb=_b('\n\x15\x63ommon/configtx.proto\x12\x06\x63ommon\x1a\x13\x63ommon/common.proto\x1a\x15\x63ommon/policies.proto\"W\n\x0e\x43onfigEnvelope\x12\x1e\n\x06\x63onfig\x18\x01 \x01(\x0b\x32\x0e.common.Config\x12%\n\x0blast_update\x18\x02 \x01(\x0b\x32\x10.common.Envelope\"\x9d\x03\n\x11\x43onfigGroupSchema\x12\x35\n\x06groups\x18\x01 \x03(\x0b\x32%.common.ConfigGroupSchema.GroupsEntry\x12\x35\n\x06values\x18\x02 \x03(\x0b\x32%.common.ConfigGroupSchema.ValuesEntry\x12\x39\n\x08policies\x18\x03 \x03(\x0b\x32\'.common.ConfigGroupSchema.PoliciesEntry\x1aH\n\x0bGroupsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.common.ConfigGroupSchema:\x02\x38\x01\x1aH\n\x0bValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.common.ConfigValueSchema:\x02\x38\x01\x1aK\n\rPoliciesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.common.ConfigPolicySchema:\x02\x38\x01\"\x13\n\x11\x43onfigValueSchema\"\x14\n\x12\x43onfigPolicySchema\"F\n\x06\x43onfig\x12\x10\n\x08sequence\x18\x01 \x01(\x04\x12*\n\rchannel_group\x18\x02 \x01(\x0b\x32\x13.common.ConfigGroup\"Z\n\x14\x43onfigUpdateEnvelope\x12\x15\n\rconfig_update\x18\x01 \x01(\x0c\x12+\n\nsignatures\x18\x02 \x03(\x0b\x32\x17.common.ConfigSignature\"q\n\x0c\x43onfigUpdate\x12\x12\n\nchannel_id\x18\x01 \x01(\t\x12%\n\x08read_set\x18\x02 \x01(\x0b\x32\x13.common.ConfigGroup\x12&\n\twrite_set\x18\x03 \x01(\x0b\x32\x13.common.ConfigGroup\"\x98\x03\n\x0b\x43onfigGroup\x12\x0f\n\x07version\x18\x01 \x01(\x04\x12/\n\x06groups\x18\x02 \x03(\x0b\x32\x1f.common.ConfigGroup.GroupsEntry\x12/\n\x06values\x18\x03 \x03(\x0b\x32\x1f.common.ConfigGroup.ValuesEntry\x12\x33\n\x08policies\x18\x04 \x03(\x0b\x32!.common.ConfigGroup.PoliciesEntry\x12\x12\n\nmod_policy\x18\x05 \x01(\t\x1a\x42\n\x0bGroupsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.common.ConfigGroup:\x02\x38\x01\x1a\x42\n\x0bValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.common.ConfigValue:\x02\x38\x01\x1a\x45\n\rPoliciesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.common.ConfigPolicy:\x02\x38\x01\"A\n\x0b\x43onfigValue\x12\x0f\n\x07version\x18\x01 \x01(\x04\x12\r\n\x05value\x18\x02 \x01(\x0c\x12\x12\n\nmod_policy\x18\x03 \x01(\t\"S\n\x0c\x43onfigPolicy\x12\x0f\n\x07version\x18\x01 \x01(\x04\x12\x1e\n\x06policy\x18\x02 \x01(\x0b\x32\x0e.common.Policy\x12\x12\n\nmod_policy\x18\x03 \x01(\t\">\n\x0f\x43onfigSignature\x12\x18\n\x10signature_header\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\x42S\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/commonb\x06proto3') , dependencies=[common_dot_common__pb2.DESCRIPTOR,common_dot_policies__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -853,7 +853,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z+github.com/hyperledger/fabric/protos/common')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/common')) _CONFIGGROUPSCHEMA_GROUPSENTRY.has_options = True _CONFIGGROUPSCHEMA_GROUPSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) _CONFIGGROUPSCHEMA_VALUESENTRY.has_options = True diff --git a/bddtests/common/configuration_pb2.py b/bddtests/common/configuration_pb2.py index e224a6882d4..86449ef79a3 100644 --- a/bddtests/common/configuration_pb2.py +++ b/bddtests/common/configuration_pb2.py @@ -19,7 +19,7 @@ name='common/configuration.proto', package='common', syntax='proto3', - serialized_pb=_b('\n\x1a\x63ommon/configuration.proto\x12\x06\x63ommon\" \n\x10HashingAlgorithm\x12\x0c\n\x04name\x18\x01 \x01(\t\"*\n\x19\x42lockDataHashingStructure\x12\r\n\x05width\x18\x01 \x01(\r\"%\n\x10OrdererAddresses\x12\x11\n\taddresses\x18\x01 \x03(\tB-Z+github.com/hyperledger/fabric/protos/commonb\x06proto3') + serialized_pb=_b('\n\x1a\x63ommon/configuration.proto\x12\x06\x63ommon\" \n\x10HashingAlgorithm\x12\x0c\n\x04name\x18\x01 \x01(\t\"*\n\x19\x42lockDataHashingStructure\x12\r\n\x05width\x18\x01 \x01(\r\"%\n\x10OrdererAddresses\x12\x11\n\taddresses\x18\x01 \x03(\tBS\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/commonb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -145,7 +145,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z+github.com/hyperledger/fabric/protos/common')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/common')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/common/ledger_pb2.py b/bddtests/common/ledger_pb2.py index 10ab16c1954..e9c45bebdec 100644 --- a/bddtests/common/ledger_pb2.py +++ b/bddtests/common/ledger_pb2.py @@ -19,7 +19,7 @@ name='common/ledger.proto', package='common', syntax='proto3', - serialized_pb=_b('\n\x13\x63ommon/ledger.proto\x12\x06\x63ommon\"U\n\x0e\x42lockchainInfo\x12\x0e\n\x06height\x18\x01 \x01(\x04\x12\x18\n\x10\x63urrentBlockHash\x18\x02 \x01(\x0c\x12\x19\n\x11previousBlockHash\x18\x03 \x01(\x0c\x42-Z+github.com/hyperledger/fabric/protos/commonb\x06proto3') + serialized_pb=_b('\n\x13\x63ommon/ledger.proto\x12\x06\x63ommon\"U\n\x0e\x42lockchainInfo\x12\x0e\n\x06height\x18\x01 \x01(\x04\x12\x18\n\x10\x63urrentBlockHash\x18\x02 \x01(\x0c\x12\x19\n\x11previousBlockHash\x18\x03 \x01(\x0c\x42S\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/commonb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -81,7 +81,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z+github.com/hyperledger/fabric/protos/common')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/common')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/common/policies_pb2.py b/bddtests/common/policies_pb2.py index f91f1c4ae01..10960a52d63 100644 --- a/bddtests/common/policies_pb2.py +++ b/bddtests/common/policies_pb2.py @@ -20,7 +20,7 @@ name='common/policies.proto', package='common', syntax='proto3', - serialized_pb=_b('\n\x15\x63ommon/policies.proto\x12\x06\x63ommon\x1a\x17msp/msp_principal.proto\"l\n\x06Policy\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0e\n\x06policy\x18\x02 \x01(\x0c\"D\n\nPolicyType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tSIGNATURE\x10\x01\x12\x07\n\x03MSP\x10\x02\x12\x11\n\rIMPLICIT_META\x10\x03\"}\n\x17SignaturePolicyEnvelope\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\'\n\x06policy\x18\x02 \x01(\x0b\x32\x17.common.SignaturePolicy\x12(\n\nidentities\x18\x03 \x03(\x0b\x32\x14.common.MSPPrincipal\"\xa2\x01\n\x0fSignaturePolicy\x12\x13\n\tsigned_by\x18\x01 \x01(\x05H\x00\x12\x32\n\x08n_out_of\x18\x02 \x01(\x0b\x32\x1e.common.SignaturePolicy.NOutOfH\x00\x1a>\n\x06NOutOf\x12\t\n\x01n\x18\x01 \x01(\x05\x12)\n\x08policies\x18\x02 \x03(\x0b\x32\x17.common.SignaturePolicyB\x06\n\x04Type\"\x7f\n\x12ImplicitMetaPolicy\x12\x12\n\nsub_policy\x18\x01 \x01(\t\x12-\n\x04rule\x18\x02 \x01(\x0e\x32\x1f.common.ImplicitMetaPolicy.Rule\"&\n\x04Rule\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03\x41LL\x10\x01\x12\x0c\n\x08MAJORITY\x10\x02\x42-Z+github.com/hyperledger/fabric/protos/commonb\x06proto3') + serialized_pb=_b('\n\x15\x63ommon/policies.proto\x12\x06\x63ommon\x1a\x17msp/msp_principal.proto\"l\n\x06Policy\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0e\n\x06policy\x18\x02 \x01(\x0c\"D\n\nPolicyType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tSIGNATURE\x10\x01\x12\x07\n\x03MSP\x10\x02\x12\x11\n\rIMPLICIT_META\x10\x03\"}\n\x17SignaturePolicyEnvelope\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\'\n\x06policy\x18\x02 \x01(\x0b\x32\x17.common.SignaturePolicy\x12(\n\nidentities\x18\x03 \x03(\x0b\x32\x14.common.MSPPrincipal\"\xa2\x01\n\x0fSignaturePolicy\x12\x13\n\tsigned_by\x18\x01 \x01(\x05H\x00\x12\x32\n\x08n_out_of\x18\x02 \x01(\x0b\x32\x1e.common.SignaturePolicy.NOutOfH\x00\x1a>\n\x06NOutOf\x12\t\n\x01n\x18\x01 \x01(\x05\x12)\n\x08policies\x18\x02 \x03(\x0b\x32\x17.common.SignaturePolicyB\x06\n\x04Type\"\x7f\n\x12ImplicitMetaPolicy\x12\x12\n\nsub_policy\x18\x01 \x01(\t\x12-\n\x04rule\x18\x02 \x01(\x0e\x32\x1f.common.ImplicitMetaPolicy.Rule\"&\n\x04Rule\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03\x41LL\x10\x01\x12\x0c\n\x08MAJORITY\x10\x02\x42S\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/commonb\x06proto3') , dependencies=[msp_dot_msp__principal__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -341,7 +341,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z+github.com/hyperledger/fabric/protos/common')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n$org.hyperledger.fabric.protos.commonZ+github.com/hyperledger/fabric/protos/common')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/gossip/message_pb2.py b/bddtests/gossip/message_pb2.py index 52e69f1a981..c8be94206b1 100644 --- a/bddtests/gossip/message_pb2.py +++ b/bddtests/gossip/message_pb2.py @@ -20,7 +20,7 @@ name='gossip/message.proto', package='gossip', syntax='proto3', - serialized_pb=_b('\n\x14gossip/message.proto\x12\x06gossip\"9\n\x13SignedGossipMessage\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"\xcb\x07\n\rGossipMessage\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x0f\n\x07\x63hannel\x18\x02 \x01(\x0c\x12&\n\x03tag\x18\x03 \x01(\x0e\x32\x19.gossip.GossipMessage.Tag\x12\x11\n\tsignature\x18\x04 \x01(\x0c\x12(\n\x08\x61liveMsg\x18\x05 \x01(\x0b\x32\x14.gossip.AliveMessageH\x00\x12+\n\x06memReq\x18\x06 \x01(\x0b\x32\x19.gossip.MembershipRequestH\x00\x12,\n\x06memRes\x18\x07 \x01(\x0b\x32\x1a.gossip.MembershipResponseH\x00\x12&\n\x07\x64\x61taMsg\x18\x08 \x01(\x0b\x32\x13.gossip.DataMessageH\x00\x12$\n\x05hello\x18\t \x01(\x0b\x32\x13.gossip.GossipHelloH\x00\x12%\n\x07\x64\x61taDig\x18\n \x01(\x0b\x32\x12.gossip.DataDigestH\x00\x12&\n\x07\x64\x61taReq\x18\x0b \x01(\x0b\x32\x13.gossip.DataRequestH\x00\x12(\n\ndataUpdate\x18\x0c \x01(\x0b\x32\x12.gossip.DataUpdateH\x00\x12\x1e\n\x05\x65mpty\x18\r \x01(\x0b\x32\r.gossip.EmptyH\x00\x12%\n\x04\x63onn\x18\x0e \x01(\x0b\x32\x15.gossip.ConnEstablishH\x00\x12&\n\tstateInfo\x18\x0f \x01(\x0b\x32\x11.gossip.StateInfoH\x00\x12\x32\n\rstateSnapshot\x18\x10 \x01(\x0b\x32\x19.gossip.StateInfoSnapshotH\x00\x12\x38\n\x10stateInfoPullReq\x18\x11 \x01(\x0b\x32\x1c.gossip.StateInfoPullRequestH\x00\x12\x32\n\x0cstateRequest\x18\x12 \x01(\x0b\x32\x1a.gossip.RemoteStateRequestH\x00\x12\x34\n\rstateResponse\x18\x13 \x01(\x0b\x32\x1b.gossip.RemoteStateResponseH\x00\x12\x32\n\rleadershipMsg\x18\x14 \x01(\x0b\x32\x19.gossip.LeadershipMessageH\x00\x12,\n\x0cpeerIdentity\x18\x15 \x01(\x0b\x32\x14.gossip.PeerIdentityH\x00\"_\n\x03Tag\x12\r\n\tUNDEFINED\x10\x00\x12\t\n\x05\x45MPTY\x10\x01\x12\x0c\n\x08ORG_ONLY\x10\x02\x12\r\n\tCHAN_ONLY\x10\x03\x12\x10\n\x0c\x43HAN_AND_ORG\x10\x04\x12\x0f\n\x0b\x43HAN_OR_ORG\x10\x05\x42\t\n\x07\x63ontent\"Q\n\tStateInfo\x12\x10\n\x08metadata\x18\x01 \x01(\x0c\x12#\n\ttimestamp\x18\x02 \x01(\x0b\x32\x10.gossip.PeerTime\x12\r\n\x05pkiID\x18\x03 \x01(\x0c\"<\n\x11StateInfoSnapshot\x12\'\n\x08\x65lements\x18\x01 \x03(\x0b\x32\x15.gossip.GossipMessage\"\x16\n\x14StateInfoPullRequest\":\n\rConnEstablish\x12\r\n\x05pkiID\x18\x01 \x01(\x0c\x12\x0c\n\x04\x63\x65rt\x18\x02 \x01(\x0c\x12\x0c\n\x04hash\x18\x03 \x01(\x0c\"=\n\x0cPeerIdentity\x12\r\n\x05pkiID\x18\x01 \x01(\x0c\x12\x0c\n\x04\x63\x65rt\x18\x02 \x01(\x0c\x12\x10\n\x08metadata\x18\x03 \x01(\x0c\"S\n\x0b\x44\x61taRequest\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x0f\n\x07\x64igests\x18\x02 \x03(\t\x12$\n\x07msgType\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"T\n\x0bGossipHello\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x10\n\x08metadata\x18\x02 \x01(\x0c\x12$\n\x07msgType\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"f\n\nDataUpdate\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12#\n\x04\x64\x61ta\x18\x02 \x03(\x0b\x32\x15.gossip.GossipMessage\x12$\n\x07msgType\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"R\n\nDataDigest\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x0f\n\x07\x64igests\x18\x02 \x03(\t\x12$\n\x07msgType\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"/\n\x0b\x44\x61taMessage\x12 \n\x07payload\x18\x01 \x01(\x0b\x32\x0f.gossip.Payload\"5\n\x07Payload\x12\x0e\n\x06seqNum\x18\x01 \x01(\x04\x12\x0c\n\x04hash\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"i\n\x0c\x41liveMessage\x12\"\n\nmembership\x18\x01 \x01(\x0b\x32\x0e.gossip.Member\x12#\n\ttimestamp\x18\x02 \x01(\x0b\x32\x10.gossip.PeerTime\x12\x10\n\x08identity\x18\x04 \x01(\x0c\"^\n\x11LeadershipMessage\x12\r\n\x05pkiID\x18\x01 \x01(\x0c\x12#\n\ttimestamp\x18\x02 \x01(\x0b\x32\x10.gossip.PeerTime\x12\x15\n\risDeclaration\x18\x03 \x01(\x08\".\n\x08PeerTime\x12\x12\n\ninc_number\x18\x01 \x01(\x04\x12\x0e\n\x06seqNum\x18\x02 \x01(\x04\"R\n\x11MembershipRequest\x12.\n\x0fselfInformation\x18\x01 \x01(\x0b\x32\x15.gossip.GossipMessage\x12\r\n\x05known\x18\x02 \x03(\x0c\"_\n\x12MembershipResponse\x12$\n\x05\x61live\x18\x01 \x03(\x0b\x32\x15.gossip.GossipMessage\x12#\n\x04\x64\x65\x61\x64\x18\x02 \x03(\x0b\x32\x15.gossip.GossipMessage\"m\n\x06Member\x12\x10\n\x08\x65ndpoint\x18\x01 \x01(\t\x12\x10\n\x08metadata\x18\x02 \x01(\x0c\x12\r\n\x05pkiID\x18\x03 \x01(\x0c\x12\x30\n\x10internalEndpoint\x18\x04 \x01(\x0b\x32\x16.gossip.SignedEndpoint\"5\n\x0eSignedEndpoint\x12\x10\n\x08\x65ndpoint\x18\x01 \x01(\t\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"\x07\n\x05\x45mpty\"%\n\x12RemoteStateRequest\x12\x0f\n\x07seqNums\x18\x01 \x03(\x04\"8\n\x13RemoteStateResponse\x12!\n\x08payloads\x18\x01 \x03(\x0b\x32\x0f.gossip.Payload*?\n\x0bPullMsgType\x12\r\n\tUndefined\x10\x00\x12\x10\n\x0c\x42lockMessage\x10\x01\x12\x0f\n\x0bIdentityMsg\x10\x02\x32t\n\x06Gossip\x12\x42\n\x0cGossipStream\x12\x15.gossip.GossipMessage\x1a\x15.gossip.GossipMessage\"\x00(\x01\x30\x01\x12&\n\x04Ping\x12\r.gossip.Empty\x1a\r.gossip.Empty\"\x00\x42-Z+github.com/hyperledger/fabric/protos/gossipb\x06proto3') + serialized_pb=_b('\n\x14gossip/message.proto\x12\x06gossip\"^\n\x08\x45nvelope\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\x12.\n\x0esecretEnvelope\x18\x03 \x01(\x0b\x32\x16.gossip.SecretEnvelope\"4\n\x0eSecretEnvelope\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"/\n\x06Secret\x12\x1a\n\x10internalEndpoint\x18\x01 \x01(\tH\x00\x42\t\n\x07\x63ontent\"\xc8\x07\n\rGossipMessage\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x0f\n\x07\x63hannel\x18\x02 \x01(\x0c\x12&\n\x03tag\x18\x03 \x01(\x0e\x32\x19.gossip.GossipMessage.Tag\x12)\n\talive_msg\x18\x05 \x01(\x0b\x32\x14.gossip.AliveMessageH\x00\x12,\n\x07mem_req\x18\x06 \x01(\x0b\x32\x19.gossip.MembershipRequestH\x00\x12-\n\x07mem_res\x18\x07 \x01(\x0b\x32\x1a.gossip.MembershipResponseH\x00\x12\'\n\x08\x64\x61ta_msg\x18\x08 \x01(\x0b\x32\x13.gossip.DataMessageH\x00\x12$\n\x05hello\x18\t \x01(\x0b\x32\x13.gossip.GossipHelloH\x00\x12&\n\x08\x64\x61ta_dig\x18\n \x01(\x0b\x32\x12.gossip.DataDigestH\x00\x12\'\n\x08\x64\x61ta_req\x18\x0b \x01(\x0b\x32\x13.gossip.DataRequestH\x00\x12)\n\x0b\x64\x61ta_update\x18\x0c \x01(\x0b\x32\x12.gossip.DataUpdateH\x00\x12\x1e\n\x05\x65mpty\x18\r \x01(\x0b\x32\r.gossip.EmptyH\x00\x12%\n\x04\x63onn\x18\x0e \x01(\x0b\x32\x15.gossip.ConnEstablishH\x00\x12\'\n\nstate_info\x18\x0f \x01(\x0b\x32\x11.gossip.StateInfoH\x00\x12\x33\n\x0estate_snapshot\x18\x10 \x01(\x0b\x32\x19.gossip.StateInfoSnapshotH\x00\x12;\n\x13state_info_pull_req\x18\x11 \x01(\x0b\x32\x1c.gossip.StateInfoPullRequestH\x00\x12\x33\n\rstate_request\x18\x12 \x01(\x0b\x32\x1a.gossip.RemoteStateRequestH\x00\x12\x35\n\x0estate_response\x18\x13 \x01(\x0b\x32\x1b.gossip.RemoteStateResponseH\x00\x12\x33\n\x0eleadership_msg\x18\x14 \x01(\x0b\x32\x19.gossip.LeadershipMessageH\x00\x12-\n\rpeer_identity\x18\x15 \x01(\x0b\x32\x14.gossip.PeerIdentityH\x00\"_\n\x03Tag\x12\r\n\tUNDEFINED\x10\x00\x12\t\n\x05\x45MPTY\x10\x01\x12\x0c\n\x08ORG_ONLY\x10\x02\x12\r\n\tCHAN_ONLY\x10\x03\x12\x10\n\x0c\x43HAN_AND_ORG\x10\x04\x12\x0f\n\x0b\x43HAN_OR_ORG\x10\x05\x42\t\n\x07\x63ontent\"R\n\tStateInfo\x12\x10\n\x08metadata\x18\x01 \x01(\x0c\x12#\n\ttimestamp\x18\x02 \x01(\x0b\x32\x10.gossip.PeerTime\x12\x0e\n\x06pki_id\x18\x03 \x01(\x0c\"7\n\x11StateInfoSnapshot\x12\"\n\x08\x65lements\x18\x01 \x03(\x0b\x32\x10.gossip.Envelope\"\x16\n\x14StateInfoPullRequest\";\n\rConnEstablish\x12\x0e\n\x06pki_id\x18\x01 \x01(\x0c\x12\x0c\n\x04\x63\x65rt\x18\x02 \x01(\x0c\x12\x0c\n\x04hash\x18\x03 \x01(\x0c\">\n\x0cPeerIdentity\x12\x0e\n\x06pki_id\x18\x01 \x01(\x0c\x12\x0c\n\x04\x63\x65rt\x18\x02 \x01(\x0c\x12\x10\n\x08metadata\x18\x03 \x01(\x0c\"T\n\x0b\x44\x61taRequest\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x0f\n\x07\x64igests\x18\x02 \x03(\t\x12%\n\x08msg_type\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"U\n\x0bGossipHello\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x10\n\x08metadata\x18\x02 \x01(\x0c\x12%\n\x08msg_type\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"b\n\nDataUpdate\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x1e\n\x04\x64\x61ta\x18\x02 \x03(\x0b\x32\x10.gossip.Envelope\x12%\n\x08msg_type\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"S\n\nDataDigest\x12\r\n\x05nonce\x18\x01 \x01(\x04\x12\x0f\n\x07\x64igests\x18\x02 \x03(\t\x12%\n\x08msg_type\x18\x03 \x01(\x0e\x32\x13.gossip.PullMsgType\"/\n\x0b\x44\x61taMessage\x12 \n\x07payload\x18\x01 \x01(\x0b\x32\x0f.gossip.Payload\"6\n\x07Payload\x12\x0f\n\x07seq_num\x18\x01 \x01(\x04\x12\x0c\n\x04hash\x18\x02 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"i\n\x0c\x41liveMessage\x12\"\n\nmembership\x18\x01 \x01(\x0b\x32\x0e.gossip.Member\x12#\n\ttimestamp\x18\x02 \x01(\x0b\x32\x10.gossip.PeerTime\x12\x10\n\x08identity\x18\x04 \x01(\x0c\"`\n\x11LeadershipMessage\x12\x0e\n\x06pki_id\x18\x01 \x01(\x0c\x12#\n\ttimestamp\x18\x02 \x01(\x0b\x32\x10.gossip.PeerTime\x12\x16\n\x0eis_declaration\x18\x03 \x01(\x08\"/\n\x08PeerTime\x12\x12\n\ninc_number\x18\x01 \x01(\x04\x12\x0f\n\x07seq_num\x18\x02 \x01(\x04\"N\n\x11MembershipRequest\x12*\n\x10self_information\x18\x01 \x01(\x0b\x32\x10.gossip.Envelope\x12\r\n\x05known\x18\x02 \x03(\x0c\"U\n\x12MembershipResponse\x12\x1f\n\x05\x61live\x18\x01 \x03(\x0b\x32\x10.gossip.Envelope\x12\x1e\n\x04\x64\x65\x61\x64\x18\x02 \x03(\x0b\x32\x10.gossip.Envelope\"<\n\x06Member\x12\x10\n\x08\x65ndpoint\x18\x01 \x01(\t\x12\x10\n\x08metadata\x18\x02 \x01(\x0c\x12\x0e\n\x06pki_id\x18\x03 \x01(\x0c\"\x07\n\x05\x45mpty\"&\n\x12RemoteStateRequest\x12\x10\n\x08seq_nums\x18\x01 \x03(\x04\"8\n\x13RemoteStateResponse\x12!\n\x08payloads\x18\x01 \x03(\x0b\x32\x0f.gossip.Payload*=\n\x0bPullMsgType\x12\r\n\tUNDEFINED\x10\x00\x12\r\n\tBLOCK_MSG\x10\x01\x12\x10\n\x0cIDENTITY_MSG\x10\x02\x32j\n\x06Gossip\x12\x38\n\x0cGossipStream\x12\x10.gossip.Envelope\x1a\x10.gossip.Envelope\"\x00(\x01\x30\x01\x12&\n\x04Ping\x12\r.gossip.Empty\x1a\r.gossip.Empty\"\x00\x42-Z+github.com/hyperledger/fabric/protos/gossipb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -31,29 +31,29 @@ file=DESCRIPTOR, values=[ _descriptor.EnumValueDescriptor( - name='Undefined', index=0, number=0, + name='UNDEFINED', index=0, number=0, options=None, type=None), _descriptor.EnumValueDescriptor( - name='BlockMessage', index=1, number=1, + name='BLOCK_MSG', index=1, number=1, options=None, type=None), _descriptor.EnumValueDescriptor( - name='IdentityMsg', index=2, number=2, + name='IDENTITY_MSG', index=2, number=2, options=None, type=None), ], containing_type=None, options=None, - serialized_start=2524, - serialized_end=2587, + serialized_start=2545, + serialized_end=2606, ) _sym_db.RegisterEnumDescriptor(_PULLMSGTYPE) PullMsgType = enum_type_wrapper.EnumTypeWrapper(_PULLMSGTYPE) -Undefined = 0 -BlockMessage = 1 -IdentityMsg = 2 +UNDEFINED = 0 +BLOCK_MSG = 1 +IDENTITY_MSG = 2 _GOSSIPMESSAGE_TAG = _descriptor.EnumDescriptor( @@ -89,33 +89,40 @@ ], containing_type=None, options=None, - serialized_start=957, - serialized_end=1052, + serialized_start=1094, + serialized_end=1189, ) _sym_db.RegisterEnumDescriptor(_GOSSIPMESSAGE_TAG) -_SIGNEDGOSSIPMESSAGE = _descriptor.Descriptor( - name='SignedGossipMessage', - full_name='gossip.SignedGossipMessage', +_ENVELOPE = _descriptor.Descriptor( + name='Envelope', + full_name='gossip.Envelope', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='payload', full_name='gossip.SignedGossipMessage.payload', index=0, + name='payload', full_name='gossip.Envelope.payload', index=0, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='signature', full_name='gossip.SignedGossipMessage.signature', index=1, + name='signature', full_name='gossip.Envelope.signature', index=1, number=2, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='secretEnvelope', full_name='gossip.Envelope.secretEnvelope', index=2, + number=3, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -129,7 +136,79 @@ oneofs=[ ], serialized_start=32, - serialized_end=89, + serialized_end=126, +) + + +_SECRETENVELOPE = _descriptor.Descriptor( + name='SecretEnvelope', + full_name='gossip.SecretEnvelope', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='payload', full_name='gossip.SecretEnvelope.payload', index=0, + number=1, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='signature', full_name='gossip.SecretEnvelope.signature', index=1, + number=2, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=128, + serialized_end=180, +) + + +_SECRET = _descriptor.Descriptor( + name='Secret', + full_name='gossip.Secret', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='internalEndpoint', full_name='gossip.Secret.internalEndpoint', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + _descriptor.OneofDescriptor( + name='content', full_name='gossip.Secret.content', + index=0, containing_type=None, fields=[]), + ], + serialized_start=182, + serialized_end=229, ) @@ -162,126 +241,119 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='signature', full_name='gossip.GossipMessage.signature', index=3, - number=4, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='aliveMsg', full_name='gossip.GossipMessage.aliveMsg', index=4, + name='alive_msg', full_name='gossip.GossipMessage.alive_msg', index=3, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='memReq', full_name='gossip.GossipMessage.memReq', index=5, + name='mem_req', full_name='gossip.GossipMessage.mem_req', index=4, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='memRes', full_name='gossip.GossipMessage.memRes', index=6, + name='mem_res', full_name='gossip.GossipMessage.mem_res', index=5, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='dataMsg', full_name='gossip.GossipMessage.dataMsg', index=7, + name='data_msg', full_name='gossip.GossipMessage.data_msg', index=6, number=8, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='hello', full_name='gossip.GossipMessage.hello', index=8, + name='hello', full_name='gossip.GossipMessage.hello', index=7, number=9, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='dataDig', full_name='gossip.GossipMessage.dataDig', index=9, + name='data_dig', full_name='gossip.GossipMessage.data_dig', index=8, number=10, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='dataReq', full_name='gossip.GossipMessage.dataReq', index=10, + name='data_req', full_name='gossip.GossipMessage.data_req', index=9, number=11, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='dataUpdate', full_name='gossip.GossipMessage.dataUpdate', index=11, + name='data_update', full_name='gossip.GossipMessage.data_update', index=10, number=12, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='empty', full_name='gossip.GossipMessage.empty', index=12, + name='empty', full_name='gossip.GossipMessage.empty', index=11, number=13, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='conn', full_name='gossip.GossipMessage.conn', index=13, + name='conn', full_name='gossip.GossipMessage.conn', index=12, number=14, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='stateInfo', full_name='gossip.GossipMessage.stateInfo', index=14, + name='state_info', full_name='gossip.GossipMessage.state_info', index=13, number=15, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='stateSnapshot', full_name='gossip.GossipMessage.stateSnapshot', index=15, + name='state_snapshot', full_name='gossip.GossipMessage.state_snapshot', index=14, number=16, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='stateInfoPullReq', full_name='gossip.GossipMessage.stateInfoPullReq', index=16, + name='state_info_pull_req', full_name='gossip.GossipMessage.state_info_pull_req', index=15, number=17, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='stateRequest', full_name='gossip.GossipMessage.stateRequest', index=17, + name='state_request', full_name='gossip.GossipMessage.state_request', index=16, number=18, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='stateResponse', full_name='gossip.GossipMessage.stateResponse', index=18, + name='state_response', full_name='gossip.GossipMessage.state_response', index=17, number=19, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='leadershipMsg', full_name='gossip.GossipMessage.leadershipMsg', index=19, + name='leadership_msg', full_name='gossip.GossipMessage.leadership_msg', index=18, number=20, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='peerIdentity', full_name='gossip.GossipMessage.peerIdentity', index=20, + name='peer_identity', full_name='gossip.GossipMessage.peer_identity', index=19, number=21, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -303,8 +375,8 @@ name='content', full_name='gossip.GossipMessage.content', index=0, containing_type=None, fields=[]), ], - serialized_start=92, - serialized_end=1063, + serialized_start=232, + serialized_end=1200, ) @@ -330,7 +402,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='pkiID', full_name='gossip.StateInfo.pkiID', index=2, + name='pki_id', full_name='gossip.StateInfo.pki_id', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -348,8 +420,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1065, - serialized_end=1146, + serialized_start=1202, + serialized_end=1284, ) @@ -379,8 +451,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1148, - serialized_end=1208, + serialized_start=1286, + serialized_end=1341, ) @@ -403,8 +475,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1210, - serialized_end=1232, + serialized_start=1343, + serialized_end=1365, ) @@ -416,7 +488,7 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='pkiID', full_name='gossip.ConnEstablish.pkiID', index=0, + name='pki_id', full_name='gossip.ConnEstablish.pki_id', index=0, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -448,8 +520,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1234, - serialized_end=1292, + serialized_start=1367, + serialized_end=1426, ) @@ -461,7 +533,7 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='pkiID', full_name='gossip.PeerIdentity.pkiID', index=0, + name='pki_id', full_name='gossip.PeerIdentity.pki_id', index=0, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -493,8 +565,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1294, - serialized_end=1355, + serialized_start=1428, + serialized_end=1490, ) @@ -520,7 +592,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='msgType', full_name='gossip.DataRequest.msgType', index=2, + name='msg_type', full_name='gossip.DataRequest.msg_type', index=2, number=3, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -538,8 +610,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1357, - serialized_end=1440, + serialized_start=1492, + serialized_end=1576, ) @@ -565,7 +637,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='msgType', full_name='gossip.GossipHello.msgType', index=2, + name='msg_type', full_name='gossip.GossipHello.msg_type', index=2, number=3, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -583,8 +655,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1442, - serialized_end=1526, + serialized_start=1578, + serialized_end=1663, ) @@ -610,7 +682,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='msgType', full_name='gossip.DataUpdate.msgType', index=2, + name='msg_type', full_name='gossip.DataUpdate.msg_type', index=2, number=3, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -628,8 +700,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1528, - serialized_end=1630, + serialized_start=1665, + serialized_end=1763, ) @@ -655,7 +727,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='msgType', full_name='gossip.DataDigest.msgType', index=2, + name='msg_type', full_name='gossip.DataDigest.msg_type', index=2, number=3, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -673,8 +745,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1632, - serialized_end=1714, + serialized_start=1765, + serialized_end=1848, ) @@ -704,8 +776,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1716, - serialized_end=1763, + serialized_start=1850, + serialized_end=1897, ) @@ -717,7 +789,7 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='seqNum', full_name='gossip.Payload.seqNum', index=0, + name='seq_num', full_name='gossip.Payload.seq_num', index=0, number=1, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -749,8 +821,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1765, - serialized_end=1818, + serialized_start=1899, + serialized_end=1953, ) @@ -794,8 +866,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1820, - serialized_end=1925, + serialized_start=1955, + serialized_end=2060, ) @@ -807,7 +879,7 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='pkiID', full_name='gossip.LeadershipMessage.pkiID', index=0, + name='pki_id', full_name='gossip.LeadershipMessage.pki_id', index=0, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -821,7 +893,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='isDeclaration', full_name='gossip.LeadershipMessage.isDeclaration', index=2, + name='is_declaration', full_name='gossip.LeadershipMessage.is_declaration', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, @@ -839,8 +911,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1927, - serialized_end=2021, + serialized_start=2062, + serialized_end=2158, ) @@ -859,7 +931,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='seqNum', full_name='gossip.PeerTime.seqNum', index=1, + name='seq_num', full_name='gossip.PeerTime.seq_num', index=1, number=2, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -877,8 +949,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2023, - serialized_end=2069, + serialized_start=2160, + serialized_end=2207, ) @@ -890,7 +962,7 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='selfInformation', full_name='gossip.MembershipRequest.selfInformation', index=0, + name='self_information', full_name='gossip.MembershipRequest.self_information', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -915,8 +987,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2071, - serialized_end=2153, + serialized_start=2209, + serialized_end=2287, ) @@ -953,8 +1025,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2155, - serialized_end=2250, + serialized_start=2289, + serialized_end=2374, ) @@ -980,19 +1052,12 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='pkiID', full_name='gossip.Member.pkiID', index=2, + name='pki_id', full_name='gossip.Member.pki_id', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - _descriptor.FieldDescriptor( - name='internalEndpoint', full_name='gossip.Member.internalEndpoint', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), ], extensions=[ ], @@ -1005,46 +1070,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2252, - serialized_end=2361, -) - - -_SIGNEDENDPOINT = _descriptor.Descriptor( - name='SignedEndpoint', - full_name='gossip.SignedEndpoint', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='endpoint', full_name='gossip.SignedEndpoint.endpoint', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='signature', full_name='gossip.SignedEndpoint.signature', index=1, - number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2363, - serialized_end=2416, + serialized_start=2376, + serialized_end=2436, ) @@ -1067,8 +1094,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2418, - serialized_end=2425, + serialized_start=2438, + serialized_end=2445, ) @@ -1080,7 +1107,7 @@ containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='seqNums', full_name='gossip.RemoteStateRequest.seqNums', index=0, + name='seq_nums', full_name='gossip.RemoteStateRequest.seq_nums', index=0, number=1, type=4, cpp_type=4, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -1098,8 +1125,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2427, - serialized_end=2464, + serialized_start=2447, + serialized_end=2485, ) @@ -1129,53 +1156,57 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2466, - serialized_end=2522, + serialized_start=2487, + serialized_end=2543, ) +_ENVELOPE.fields_by_name['secretEnvelope'].message_type = _SECRETENVELOPE +_SECRET.oneofs_by_name['content'].fields.append( + _SECRET.fields_by_name['internalEndpoint']) +_SECRET.fields_by_name['internalEndpoint'].containing_oneof = _SECRET.oneofs_by_name['content'] _GOSSIPMESSAGE.fields_by_name['tag'].enum_type = _GOSSIPMESSAGE_TAG -_GOSSIPMESSAGE.fields_by_name['aliveMsg'].message_type = _ALIVEMESSAGE -_GOSSIPMESSAGE.fields_by_name['memReq'].message_type = _MEMBERSHIPREQUEST -_GOSSIPMESSAGE.fields_by_name['memRes'].message_type = _MEMBERSHIPRESPONSE -_GOSSIPMESSAGE.fields_by_name['dataMsg'].message_type = _DATAMESSAGE +_GOSSIPMESSAGE.fields_by_name['alive_msg'].message_type = _ALIVEMESSAGE +_GOSSIPMESSAGE.fields_by_name['mem_req'].message_type = _MEMBERSHIPREQUEST +_GOSSIPMESSAGE.fields_by_name['mem_res'].message_type = _MEMBERSHIPRESPONSE +_GOSSIPMESSAGE.fields_by_name['data_msg'].message_type = _DATAMESSAGE _GOSSIPMESSAGE.fields_by_name['hello'].message_type = _GOSSIPHELLO -_GOSSIPMESSAGE.fields_by_name['dataDig'].message_type = _DATADIGEST -_GOSSIPMESSAGE.fields_by_name['dataReq'].message_type = _DATAREQUEST -_GOSSIPMESSAGE.fields_by_name['dataUpdate'].message_type = _DATAUPDATE +_GOSSIPMESSAGE.fields_by_name['data_dig'].message_type = _DATADIGEST +_GOSSIPMESSAGE.fields_by_name['data_req'].message_type = _DATAREQUEST +_GOSSIPMESSAGE.fields_by_name['data_update'].message_type = _DATAUPDATE _GOSSIPMESSAGE.fields_by_name['empty'].message_type = _EMPTY _GOSSIPMESSAGE.fields_by_name['conn'].message_type = _CONNESTABLISH -_GOSSIPMESSAGE.fields_by_name['stateInfo'].message_type = _STATEINFO -_GOSSIPMESSAGE.fields_by_name['stateSnapshot'].message_type = _STATEINFOSNAPSHOT -_GOSSIPMESSAGE.fields_by_name['stateInfoPullReq'].message_type = _STATEINFOPULLREQUEST -_GOSSIPMESSAGE.fields_by_name['stateRequest'].message_type = _REMOTESTATEREQUEST -_GOSSIPMESSAGE.fields_by_name['stateResponse'].message_type = _REMOTESTATERESPONSE -_GOSSIPMESSAGE.fields_by_name['leadershipMsg'].message_type = _LEADERSHIPMESSAGE -_GOSSIPMESSAGE.fields_by_name['peerIdentity'].message_type = _PEERIDENTITY +_GOSSIPMESSAGE.fields_by_name['state_info'].message_type = _STATEINFO +_GOSSIPMESSAGE.fields_by_name['state_snapshot'].message_type = _STATEINFOSNAPSHOT +_GOSSIPMESSAGE.fields_by_name['state_info_pull_req'].message_type = _STATEINFOPULLREQUEST +_GOSSIPMESSAGE.fields_by_name['state_request'].message_type = _REMOTESTATEREQUEST +_GOSSIPMESSAGE.fields_by_name['state_response'].message_type = _REMOTESTATERESPONSE +_GOSSIPMESSAGE.fields_by_name['leadership_msg'].message_type = _LEADERSHIPMESSAGE +_GOSSIPMESSAGE.fields_by_name['peer_identity'].message_type = _PEERIDENTITY _GOSSIPMESSAGE_TAG.containing_type = _GOSSIPMESSAGE _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['aliveMsg']) -_GOSSIPMESSAGE.fields_by_name['aliveMsg'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['alive_msg']) +_GOSSIPMESSAGE.fields_by_name['alive_msg'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['memReq']) -_GOSSIPMESSAGE.fields_by_name['memReq'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['mem_req']) +_GOSSIPMESSAGE.fields_by_name['mem_req'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['memRes']) -_GOSSIPMESSAGE.fields_by_name['memRes'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['mem_res']) +_GOSSIPMESSAGE.fields_by_name['mem_res'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['dataMsg']) -_GOSSIPMESSAGE.fields_by_name['dataMsg'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['data_msg']) +_GOSSIPMESSAGE.fields_by_name['data_msg'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( _GOSSIPMESSAGE.fields_by_name['hello']) _GOSSIPMESSAGE.fields_by_name['hello'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['dataDig']) -_GOSSIPMESSAGE.fields_by_name['dataDig'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['data_dig']) +_GOSSIPMESSAGE.fields_by_name['data_dig'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['dataReq']) -_GOSSIPMESSAGE.fields_by_name['dataReq'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['data_req']) +_GOSSIPMESSAGE.fields_by_name['data_req'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['dataUpdate']) -_GOSSIPMESSAGE.fields_by_name['dataUpdate'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['data_update']) +_GOSSIPMESSAGE.fields_by_name['data_update'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( _GOSSIPMESSAGE.fields_by_name['empty']) _GOSSIPMESSAGE.fields_by_name['empty'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] @@ -1183,43 +1214,44 @@ _GOSSIPMESSAGE.fields_by_name['conn']) _GOSSIPMESSAGE.fields_by_name['conn'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['stateInfo']) -_GOSSIPMESSAGE.fields_by_name['stateInfo'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['state_info']) +_GOSSIPMESSAGE.fields_by_name['state_info'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['stateSnapshot']) -_GOSSIPMESSAGE.fields_by_name['stateSnapshot'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['state_snapshot']) +_GOSSIPMESSAGE.fields_by_name['state_snapshot'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['stateInfoPullReq']) -_GOSSIPMESSAGE.fields_by_name['stateInfoPullReq'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['state_info_pull_req']) +_GOSSIPMESSAGE.fields_by_name['state_info_pull_req'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['stateRequest']) -_GOSSIPMESSAGE.fields_by_name['stateRequest'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['state_request']) +_GOSSIPMESSAGE.fields_by_name['state_request'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['stateResponse']) -_GOSSIPMESSAGE.fields_by_name['stateResponse'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['state_response']) +_GOSSIPMESSAGE.fields_by_name['state_response'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['leadershipMsg']) -_GOSSIPMESSAGE.fields_by_name['leadershipMsg'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['leadership_msg']) +_GOSSIPMESSAGE.fields_by_name['leadership_msg'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _GOSSIPMESSAGE.oneofs_by_name['content'].fields.append( - _GOSSIPMESSAGE.fields_by_name['peerIdentity']) -_GOSSIPMESSAGE.fields_by_name['peerIdentity'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] + _GOSSIPMESSAGE.fields_by_name['peer_identity']) +_GOSSIPMESSAGE.fields_by_name['peer_identity'].containing_oneof = _GOSSIPMESSAGE.oneofs_by_name['content'] _STATEINFO.fields_by_name['timestamp'].message_type = _PEERTIME -_STATEINFOSNAPSHOT.fields_by_name['elements'].message_type = _GOSSIPMESSAGE -_DATAREQUEST.fields_by_name['msgType'].enum_type = _PULLMSGTYPE -_GOSSIPHELLO.fields_by_name['msgType'].enum_type = _PULLMSGTYPE -_DATAUPDATE.fields_by_name['data'].message_type = _GOSSIPMESSAGE -_DATAUPDATE.fields_by_name['msgType'].enum_type = _PULLMSGTYPE -_DATADIGEST.fields_by_name['msgType'].enum_type = _PULLMSGTYPE +_STATEINFOSNAPSHOT.fields_by_name['elements'].message_type = _ENVELOPE +_DATAREQUEST.fields_by_name['msg_type'].enum_type = _PULLMSGTYPE +_GOSSIPHELLO.fields_by_name['msg_type'].enum_type = _PULLMSGTYPE +_DATAUPDATE.fields_by_name['data'].message_type = _ENVELOPE +_DATAUPDATE.fields_by_name['msg_type'].enum_type = _PULLMSGTYPE +_DATADIGEST.fields_by_name['msg_type'].enum_type = _PULLMSGTYPE _DATAMESSAGE.fields_by_name['payload'].message_type = _PAYLOAD _ALIVEMESSAGE.fields_by_name['membership'].message_type = _MEMBER _ALIVEMESSAGE.fields_by_name['timestamp'].message_type = _PEERTIME _LEADERSHIPMESSAGE.fields_by_name['timestamp'].message_type = _PEERTIME -_MEMBERSHIPREQUEST.fields_by_name['selfInformation'].message_type = _GOSSIPMESSAGE -_MEMBERSHIPRESPONSE.fields_by_name['alive'].message_type = _GOSSIPMESSAGE -_MEMBERSHIPRESPONSE.fields_by_name['dead'].message_type = _GOSSIPMESSAGE -_MEMBER.fields_by_name['internalEndpoint'].message_type = _SIGNEDENDPOINT +_MEMBERSHIPREQUEST.fields_by_name['self_information'].message_type = _ENVELOPE +_MEMBERSHIPRESPONSE.fields_by_name['alive'].message_type = _ENVELOPE +_MEMBERSHIPRESPONSE.fields_by_name['dead'].message_type = _ENVELOPE _REMOTESTATERESPONSE.fields_by_name['payloads'].message_type = _PAYLOAD -DESCRIPTOR.message_types_by_name['SignedGossipMessage'] = _SIGNEDGOSSIPMESSAGE +DESCRIPTOR.message_types_by_name['Envelope'] = _ENVELOPE +DESCRIPTOR.message_types_by_name['SecretEnvelope'] = _SECRETENVELOPE +DESCRIPTOR.message_types_by_name['Secret'] = _SECRET DESCRIPTOR.message_types_by_name['GossipMessage'] = _GOSSIPMESSAGE DESCRIPTOR.message_types_by_name['StateInfo'] = _STATEINFO DESCRIPTOR.message_types_by_name['StateInfoSnapshot'] = _STATEINFOSNAPSHOT @@ -1238,18 +1270,31 @@ DESCRIPTOR.message_types_by_name['MembershipRequest'] = _MEMBERSHIPREQUEST DESCRIPTOR.message_types_by_name['MembershipResponse'] = _MEMBERSHIPRESPONSE DESCRIPTOR.message_types_by_name['Member'] = _MEMBER -DESCRIPTOR.message_types_by_name['SignedEndpoint'] = _SIGNEDENDPOINT DESCRIPTOR.message_types_by_name['Empty'] = _EMPTY DESCRIPTOR.message_types_by_name['RemoteStateRequest'] = _REMOTESTATEREQUEST DESCRIPTOR.message_types_by_name['RemoteStateResponse'] = _REMOTESTATERESPONSE DESCRIPTOR.enum_types_by_name['PullMsgType'] = _PULLMSGTYPE -SignedGossipMessage = _reflection.GeneratedProtocolMessageType('SignedGossipMessage', (_message.Message,), dict( - DESCRIPTOR = _SIGNEDGOSSIPMESSAGE, +Envelope = _reflection.GeneratedProtocolMessageType('Envelope', (_message.Message,), dict( + DESCRIPTOR = _ENVELOPE, + __module__ = 'gossip.message_pb2' + # @@protoc_insertion_point(class_scope:gossip.Envelope) + )) +_sym_db.RegisterMessage(Envelope) + +SecretEnvelope = _reflection.GeneratedProtocolMessageType('SecretEnvelope', (_message.Message,), dict( + DESCRIPTOR = _SECRETENVELOPE, + __module__ = 'gossip.message_pb2' + # @@protoc_insertion_point(class_scope:gossip.SecretEnvelope) + )) +_sym_db.RegisterMessage(SecretEnvelope) + +Secret = _reflection.GeneratedProtocolMessageType('Secret', (_message.Message,), dict( + DESCRIPTOR = _SECRET, __module__ = 'gossip.message_pb2' - # @@protoc_insertion_point(class_scope:gossip.SignedGossipMessage) + # @@protoc_insertion_point(class_scope:gossip.Secret) )) -_sym_db.RegisterMessage(SignedGossipMessage) +_sym_db.RegisterMessage(Secret) GossipMessage = _reflection.GeneratedProtocolMessageType('GossipMessage', (_message.Message,), dict( DESCRIPTOR = _GOSSIPMESSAGE, @@ -1377,13 +1422,6 @@ )) _sym_db.RegisterMessage(Member) -SignedEndpoint = _reflection.GeneratedProtocolMessageType('SignedEndpoint', (_message.Message,), dict( - DESCRIPTOR = _SIGNEDENDPOINT, - __module__ = 'gossip.message_pb2' - # @@protoc_insertion_point(class_scope:gossip.SignedEndpoint) - )) -_sym_db.RegisterMessage(SignedEndpoint) - Empty = _reflection.GeneratedProtocolMessageType('Empty', (_message.Message,), dict( DESCRIPTOR = _EMPTY, __module__ = 'gossip.message_pb2' @@ -1430,8 +1468,8 @@ def __init__(self, channel): """ self.GossipStream = channel.stream_stream( '/gossip.Gossip/GossipStream', - request_serializer=GossipMessage.SerializeToString, - response_deserializer=GossipMessage.FromString, + request_serializer=Envelope.SerializeToString, + response_deserializer=Envelope.FromString, ) self.Ping = channel.unary_unary( '/gossip.Gossip/Ping', @@ -1463,8 +1501,8 @@ def add_GossipServicer_to_server(servicer, server): rpc_method_handlers = { 'GossipStream': grpc.stream_stream_rpc_method_handler( servicer.GossipStream, - request_deserializer=GossipMessage.FromString, - response_serializer=GossipMessage.SerializeToString, + request_deserializer=Envelope.FromString, + response_serializer=Envelope.SerializeToString, ), 'Ping': grpc.unary_unary_rpc_method_handler( servicer.Ping, @@ -1521,11 +1559,11 @@ def beta_create_Gossip_server(servicer, pool=None, pool_size=None, default_timeo file not marked beta) for all further purposes. This function was generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0""" request_deserializers = { - ('gossip.Gossip', 'GossipStream'): GossipMessage.FromString, + ('gossip.Gossip', 'GossipStream'): Envelope.FromString, ('gossip.Gossip', 'Ping'): Empty.FromString, } response_serializers = { - ('gossip.Gossip', 'GossipStream'): GossipMessage.SerializeToString, + ('gossip.Gossip', 'GossipStream'): Envelope.SerializeToString, ('gossip.Gossip', 'Ping'): Empty.SerializeToString, } method_implementations = { @@ -1543,11 +1581,11 @@ def beta_create_Gossip_stub(channel, host=None, metadata_transformer=None, pool= file not marked beta) for all further purposes. This function was generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0""" request_serializers = { - ('gossip.Gossip', 'GossipStream'): GossipMessage.SerializeToString, + ('gossip.Gossip', 'GossipStream'): Envelope.SerializeToString, ('gossip.Gossip', 'Ping'): Empty.SerializeToString, } response_deserializers = { - ('gossip.Gossip', 'GossipStream'): GossipMessage.FromString, + ('gossip.Gossip', 'GossipStream'): Envelope.FromString, ('gossip.Gossip', 'Ping'): Empty.FromString, } cardinalities = { diff --git a/bddtests/gossip/message_pb2_grpc.py b/bddtests/gossip/message_pb2_grpc.py index 782e3a55432..a758fc65f98 100644 --- a/bddtests/gossip/message_pb2_grpc.py +++ b/bddtests/gossip/message_pb2_grpc.py @@ -1,11 +1,9 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities import gossip.message_pb2 as gossip_dot_message__pb2 -import gossip.message_pb2 as gossip_dot_message__pb2 -import gossip.message_pb2 as gossip_dot_message__pb2 -import gossip.message_pb2 as gossip_dot_message__pb2 class GossipStub(object): @@ -20,8 +18,8 @@ def __init__(self, channel): """ self.GossipStream = channel.stream_stream( '/gossip.Gossip/GossipStream', - request_serializer=gossip_dot_message__pb2.GossipMessage.SerializeToString, - response_deserializer=gossip_dot_message__pb2.GossipMessage.FromString, + request_serializer=gossip_dot_message__pb2.Envelope.SerializeToString, + response_deserializer=gossip_dot_message__pb2.Envelope.FromString, ) self.Ping = channel.unary_unary( '/gossip.Gossip/Ping', @@ -53,8 +51,8 @@ def add_GossipServicer_to_server(servicer, server): rpc_method_handlers = { 'GossipStream': grpc.stream_stream_rpc_method_handler( servicer.GossipStream, - request_deserializer=gossip_dot_message__pb2.GossipMessage.FromString, - response_serializer=gossip_dot_message__pb2.GossipMessage.SerializeToString, + request_deserializer=gossip_dot_message__pb2.Envelope.FromString, + response_serializer=gossip_dot_message__pb2.Envelope.SerializeToString, ), 'Ping': grpc.unary_unary_rpc_method_handler( servicer.Ping, diff --git a/bddtests/msp/identities_pb2.py b/bddtests/msp/identities_pb2.py index 76240ad2df9..434acb53e67 100644 --- a/bddtests/msp/identities_pb2.py +++ b/bddtests/msp/identities_pb2.py @@ -19,7 +19,7 @@ name='msp/identities.proto', package='msp', syntax='proto3', - serialized_pb=_b('\n\x14msp/identities.proto\x12\x03msp\"5\n\x12SerializedIdentity\x12\r\n\x05mspid\x18\x01 \x01(\t\x12\x10\n\x08id_bytes\x18\x02 \x01(\x0c\x42*Z(github.com/hyperledger/fabric/protos/mspb\x06proto3') + serialized_pb=_b('\n\x14msp/identities.proto\x12\x03msp\"5\n\x12SerializedIdentity\x12\r\n\x05mspid\x18\x01 \x01(\t\x12\x10\n\x08id_bytes\x18\x02 \x01(\x0c\x42M\n!org.hyperledger.fabric.protos.mspZ(github.com/hyperledger/fabric/protos/mspb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -74,7 +74,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z(github.com/hyperledger/fabric/protos/msp')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!org.hyperledger.fabric.protos.mspZ(github.com/hyperledger/fabric/protos/msp')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/msp/mspconfig_pb2.py b/bddtests/msp/msp_config_pb2.py similarity index 85% rename from bddtests/msp/mspconfig_pb2.py rename to bddtests/msp/msp_config_pb2.py index 6fd125d9708..c09ab07679c 100644 --- a/bddtests/msp/mspconfig_pb2.py +++ b/bddtests/msp/msp_config_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: msp/mspconfig.proto +# source: msp/msp_config.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -16,10 +16,10 @@ DESCRIPTOR = _descriptor.FileDescriptor( - name='msp/mspconfig.proto', + name='msp/msp_config.proto', package='msp', syntax='proto3', - serialized_pb=_b('\n\x13msp/mspconfig.proto\x12\x03msp\")\n\tMSPConfig\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0e\n\x06\x63onfig\x18\x02 \x01(\x0c\"\xee\x01\n\x0f\x46\x61\x62ricMSPConfig\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x12\n\nroot_certs\x18\x02 \x03(\x0c\x12\x1a\n\x12intermediate_certs\x18\x03 \x03(\x0c\x12\x0e\n\x06\x61\x64mins\x18\x04 \x03(\x0c\x12\x17\n\x0frevocation_list\x18\x05 \x03(\x0c\x12\x32\n\x10signing_identity\x18\x06 \x01(\x0b\x32\x18.msp.SigningIdentityInfo\x12@\n\x1forganizational_unit_identifiers\x18\x07 \x03(\x0b\x32\x17.msp.FabricOUIdentifier\"R\n\x13SigningIdentityInfo\x12\x15\n\rpublic_signer\x18\x01 \x01(\x0c\x12$\n\x0eprivate_signer\x18\x02 \x01(\x0b\x32\x0c.msp.KeyInfo\"7\n\x07KeyInfo\x12\x16\n\x0ekey_identifier\x18\x01 \x01(\t\x12\x14\n\x0ckey_material\x18\x02 \x01(\x0c\"[\n\x12\x46\x61\x62ricOUIdentifier\x12\x1d\n\x15\x63\x65rtifiers_identifier\x18\x01 \x01(\x0c\x12&\n\x1eorganizational_unit_identifier\x18\x02 \x01(\tB*Z(github.com/hyperledger/fabric/protos/mspb\x06proto3') + serialized_pb=_b('\n\x14msp/msp_config.proto\x12\x03msp\")\n\tMSPConfig\x12\x0c\n\x04type\x18\x01 \x01(\x05\x12\x0e\n\x06\x63onfig\x18\x02 \x01(\x0c\"\xee\x01\n\x0f\x46\x61\x62ricMSPConfig\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x12\n\nroot_certs\x18\x02 \x03(\x0c\x12\x1a\n\x12intermediate_certs\x18\x03 \x03(\x0c\x12\x0e\n\x06\x61\x64mins\x18\x04 \x03(\x0c\x12\x17\n\x0frevocation_list\x18\x05 \x03(\x0c\x12\x32\n\x10signing_identity\x18\x06 \x01(\x0b\x32\x18.msp.SigningIdentityInfo\x12@\n\x1forganizational_unit_identifiers\x18\x07 \x03(\x0b\x32\x17.msp.FabricOUIdentifier\"R\n\x13SigningIdentityInfo\x12\x15\n\rpublic_signer\x18\x01 \x01(\x0c\x12$\n\x0eprivate_signer\x18\x02 \x01(\x0b\x32\x0c.msp.KeyInfo\"7\n\x07KeyInfo\x12\x16\n\x0ekey_identifier\x18\x01 \x01(\t\x12\x14\n\x0ckey_material\x18\x02 \x01(\x0c\"[\n\x12\x46\x61\x62ricOUIdentifier\x12\x1d\n\x15\x63\x65rtifiers_identifier\x18\x01 \x01(\x0c\x12&\n\x1eorganizational_unit_identifier\x18\x02 \x01(\tB_\n!org.hyperledger.fabric.protos.mspB\x10MspConfigPackageZ(github.com/hyperledger/fabric/protos/mspb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -59,8 +59,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=28, - serialized_end=69, + serialized_start=29, + serialized_end=70, ) @@ -132,8 +132,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=72, - serialized_end=310, + serialized_start=73, + serialized_end=311, ) @@ -170,8 +170,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=312, - serialized_end=394, + serialized_start=313, + serialized_end=395, ) @@ -208,8 +208,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=396, - serialized_end=451, + serialized_start=397, + serialized_end=452, ) @@ -246,8 +246,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=453, - serialized_end=544, + serialized_start=454, + serialized_end=545, ) _FABRICMSPCONFIG.fields_by_name['signing_identity'].message_type = _SIGNINGIDENTITYINFO @@ -261,42 +261,42 @@ MSPConfig = _reflection.GeneratedProtocolMessageType('MSPConfig', (_message.Message,), dict( DESCRIPTOR = _MSPCONFIG, - __module__ = 'msp.mspconfig_pb2' + __module__ = 'msp.msp_config_pb2' # @@protoc_insertion_point(class_scope:msp.MSPConfig) )) _sym_db.RegisterMessage(MSPConfig) FabricMSPConfig = _reflection.GeneratedProtocolMessageType('FabricMSPConfig', (_message.Message,), dict( DESCRIPTOR = _FABRICMSPCONFIG, - __module__ = 'msp.mspconfig_pb2' + __module__ = 'msp.msp_config_pb2' # @@protoc_insertion_point(class_scope:msp.FabricMSPConfig) )) _sym_db.RegisterMessage(FabricMSPConfig) SigningIdentityInfo = _reflection.GeneratedProtocolMessageType('SigningIdentityInfo', (_message.Message,), dict( DESCRIPTOR = _SIGNINGIDENTITYINFO, - __module__ = 'msp.mspconfig_pb2' + __module__ = 'msp.msp_config_pb2' # @@protoc_insertion_point(class_scope:msp.SigningIdentityInfo) )) _sym_db.RegisterMessage(SigningIdentityInfo) KeyInfo = _reflection.GeneratedProtocolMessageType('KeyInfo', (_message.Message,), dict( DESCRIPTOR = _KEYINFO, - __module__ = 'msp.mspconfig_pb2' + __module__ = 'msp.msp_config_pb2' # @@protoc_insertion_point(class_scope:msp.KeyInfo) )) _sym_db.RegisterMessage(KeyInfo) FabricOUIdentifier = _reflection.GeneratedProtocolMessageType('FabricOUIdentifier', (_message.Message,), dict( DESCRIPTOR = _FABRICOUIDENTIFIER, - __module__ = 'msp.mspconfig_pb2' + __module__ = 'msp.msp_config_pb2' # @@protoc_insertion_point(class_scope:msp.FabricOUIdentifier) )) _sym_db.RegisterMessage(FabricOUIdentifier) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z(github.com/hyperledger/fabric/protos/msp')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n!org.hyperledger.fabric.protos.mspB\020MspConfigPackageZ(github.com/hyperledger/fabric/protos/msp')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/msp/mspconfig_pb2_grpc.py b/bddtests/msp/msp_config_pb2_grpc.py similarity index 100% rename from bddtests/msp/mspconfig_pb2_grpc.py rename to bddtests/msp/msp_config_pb2_grpc.py diff --git a/bddtests/msp/msp_principal_pb2.py b/bddtests/msp/msp_principal_pb2.py index 6d6ac34a446..96a06ce3646 100644 --- a/bddtests/msp/msp_principal_pb2.py +++ b/bddtests/msp/msp_principal_pb2.py @@ -19,7 +19,7 @@ name='msp/msp_principal.proto', package='common', syntax='proto3', - serialized_pb=_b('\n\x17msp/msp_principal.proto\x12\x06\x63ommon\"\xa9\x01\n\x0cMSPPrincipal\x12\x45\n\x18principal_classification\x18\x01 \x01(\x0e\x32#.common.MSPPrincipal.Classification\x12\x11\n\tprincipal\x18\x02 \x01(\x0c\"?\n\x0e\x43lassification\x12\x08\n\x04ROLE\x10\x00\x12\x15\n\x11ORGANIZATION_UNIT\x10\x01\x12\x0c\n\x08IDENTITY\x10\x02\"q\n\x10OrganizationUnit\x12\x16\n\x0emsp_identifier\x18\x01 \x01(\t\x12&\n\x1eorganizational_unit_identifier\x18\x02 \x01(\t\x12\x1d\n\x15\x63\x65rtifiers_identifier\x18\x03 \x01(\x0c\"r\n\x07MSPRole\x12\x16\n\x0emsp_identifier\x18\x01 \x01(\t\x12)\n\x04role\x18\x02 \x01(\x0e\x32\x1b.common.MSPRole.MSPRoleType\"$\n\x0bMSPRoleType\x12\n\n\x06MEMBER\x10\x00\x12\t\n\x05\x41\x44MIN\x10\x01\x42*Z(github.com/hyperledger/fabric/protos/mspb\x06proto3') + serialized_pb=_b('\n\x17msp/msp_principal.proto\x12\x06\x63ommon\"\xa9\x01\n\x0cMSPPrincipal\x12\x45\n\x18principal_classification\x18\x01 \x01(\x0e\x32#.common.MSPPrincipal.Classification\x12\x11\n\tprincipal\x18\x02 \x01(\x0c\"?\n\x0e\x43lassification\x12\x08\n\x04ROLE\x10\x00\x12\x15\n\x11ORGANIZATION_UNIT\x10\x01\x12\x0c\n\x08IDENTITY\x10\x02\"q\n\x10OrganizationUnit\x12\x16\n\x0emsp_identifier\x18\x01 \x01(\t\x12&\n\x1eorganizational_unit_identifier\x18\x02 \x01(\t\x12\x1d\n\x15\x63\x65rtifiers_identifier\x18\x03 \x01(\x0c\"r\n\x07MSPRole\x12\x16\n\x0emsp_identifier\x18\x01 \x01(\t\x12)\n\x04role\x18\x02 \x01(\x0e\x32\x1b.common.MSPRole.MSPRoleType\"$\n\x0bMSPRoleType\x12\n\n\x06MEMBER\x10\x00\x12\t\n\x05\x41\x44MIN\x10\x01\x42P\n$org.hyperledger.fabric.protos.commonZ(github.com/hyperledger/fabric/protos/mspb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -227,7 +227,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z(github.com/hyperledger/fabric/protos/msp')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n$org.hyperledger.fabric.protos.commonZ(github.com/hyperledger/fabric/protos/msp')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/orderer/ab_pb2.py b/bddtests/orderer/ab_pb2.py index 700a50dc5cb..57c63fcf53d 100644 --- a/bddtests/orderer/ab_pb2.py +++ b/bddtests/orderer/ab_pb2.py @@ -20,7 +20,7 @@ name='orderer/ab.proto', package='orderer', syntax='proto3', - serialized_pb=_b('\n\x10orderer/ab.proto\x12\x07orderer\x1a\x13\x63ommon/common.proto\"3\n\x11\x42roadcastResponse\x12\x1e\n\x06status\x18\x01 \x01(\x0e\x32\x0e.common.Status\"\x0c\n\nSeekNewest\"\x0c\n\nSeekOldest\"\x1f\n\rSeekSpecified\x12\x0e\n\x06number\x18\x01 \x01(\x04\"\x91\x01\n\x0cSeekPosition\x12%\n\x06newest\x18\x01 \x01(\x0b\x32\x13.orderer.SeekNewestH\x00\x12%\n\x06oldest\x18\x02 \x01(\x0b\x32\x13.orderer.SeekOldestH\x00\x12+\n\tspecified\x18\x03 \x01(\x0b\x32\x16.orderer.SeekSpecifiedH\x00\x42\x06\n\x04Type\"\xc5\x01\n\x08SeekInfo\x12$\n\x05start\x18\x01 \x01(\x0b\x32\x15.orderer.SeekPosition\x12#\n\x04stop\x18\x02 \x01(\x0b\x32\x15.orderer.SeekPosition\x12\x30\n\x08\x62\x65havior\x18\x03 \x01(\x0e\x32\x1e.orderer.SeekInfo.SeekBehavior\"<\n\x0cSeekBehavior\x12\x15\n\x11\x42LOCK_UNTIL_READY\x10\x00\x12\x15\n\x11\x46\x41IL_IF_NOT_READY\x10\x01\"[\n\x0f\x44\x65liverResponse\x12 \n\x06status\x18\x01 \x01(\x0e\x32\x0e.common.StatusH\x00\x12\x1e\n\x05\x62lock\x18\x02 \x01(\x0b\x32\r.common.BlockH\x00\x42\x06\n\x04Type2\x8f\x01\n\x0f\x41tomicBroadcast\x12?\n\tBroadcast\x12\x10.common.Envelope\x1a\x1a.orderer.BroadcastResponse\"\x00(\x01\x30\x01\x12;\n\x07\x44\x65liver\x12\x10.common.Envelope\x1a\x18.orderer.DeliverResponse\"\x00(\x01\x30\x01\x42.Z,github.com/hyperledger/fabric/protos/ordererb\x06proto3') + serialized_pb=_b('\n\x10orderer/ab.proto\x12\x07orderer\x1a\x13\x63ommon/common.proto\"3\n\x11\x42roadcastResponse\x12\x1e\n\x06status\x18\x01 \x01(\x0e\x32\x0e.common.Status\"\x0c\n\nSeekNewest\"\x0c\n\nSeekOldest\"\x1f\n\rSeekSpecified\x12\x0e\n\x06number\x18\x01 \x01(\x04\"\x91\x01\n\x0cSeekPosition\x12%\n\x06newest\x18\x01 \x01(\x0b\x32\x13.orderer.SeekNewestH\x00\x12%\n\x06oldest\x18\x02 \x01(\x0b\x32\x13.orderer.SeekOldestH\x00\x12+\n\tspecified\x18\x03 \x01(\x0b\x32\x16.orderer.SeekSpecifiedH\x00\x42\x06\n\x04Type\"\xc5\x01\n\x08SeekInfo\x12$\n\x05start\x18\x01 \x01(\x0b\x32\x15.orderer.SeekPosition\x12#\n\x04stop\x18\x02 \x01(\x0b\x32\x15.orderer.SeekPosition\x12\x30\n\x08\x62\x65havior\x18\x03 \x01(\x0e\x32\x1e.orderer.SeekInfo.SeekBehavior\"<\n\x0cSeekBehavior\x12\x15\n\x11\x42LOCK_UNTIL_READY\x10\x00\x12\x15\n\x11\x46\x41IL_IF_NOT_READY\x10\x01\"[\n\x0f\x44\x65liverResponse\x12 \n\x06status\x18\x01 \x01(\x0e\x32\x0e.common.StatusH\x00\x12\x1e\n\x05\x62lock\x18\x02 \x01(\x0b\x32\r.common.BlockH\x00\x42\x06\n\x04Type2\x8f\x01\n\x0f\x41tomicBroadcast\x12?\n\tBroadcast\x12\x10.common.Envelope\x1a\x1a.orderer.BroadcastResponse\"\x00(\x01\x30\x01\x12;\n\x07\x44\x65liver\x12\x10.common.Envelope\x1a\x18.orderer.DeliverResponse\"\x00(\x01\x30\x01\x42U\n%org.hyperledger.fabric.protos.ordererZ,github.com/hyperledger/fabric/protos/ordererb\x06proto3') , dependencies=[common_dot_common__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -378,7 +378,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z,github.com/hyperledger/fabric/protos/orderer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n%org.hyperledger.fabric.protos.ordererZ,github.com/hyperledger/fabric/protos/orderer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/orderer/configuration_pb2.py b/bddtests/orderer/configuration_pb2.py index e1505c8f5c8..d65cbeaec7c 100644 --- a/bddtests/orderer/configuration_pb2.py +++ b/bddtests/orderer/configuration_pb2.py @@ -19,7 +19,7 @@ name='orderer/configuration.proto', package='orderer', syntax='proto3', - serialized_pb=_b('\n\x1borderer/configuration.proto\x12\x07orderer\"\x1d\n\rConsensusType\x12\x0c\n\x04type\x18\x01 \x01(\t\"Y\n\tBatchSize\x12\x17\n\x0fmaxMessageCount\x18\x01 \x01(\r\x12\x18\n\x10\x61\x62soluteMaxBytes\x18\x02 \x01(\r\x12\x19\n\x11preferredMaxBytes\x18\x03 \x01(\r\"\x1f\n\x0c\x42\x61tchTimeout\x12\x0f\n\x07timeout\x18\x01 \x01(\t\" \n\x0e\x43reationPolicy\x12\x0e\n\x06policy\x18\x01 \x01(\t\")\n\x18\x43hainCreationPolicyNames\x12\r\n\x05names\x18\x01 \x03(\t\"\x1f\n\x0cKafkaBrokers\x12\x0f\n\x07\x62rokers\x18\x01 \x03(\tB.Z,github.com/hyperledger/fabric/protos/ordererb\x06proto3') + serialized_pb=_b('\n\x1borderer/configuration.proto\x12\x07orderer\"\x1d\n\rConsensusType\x12\x0c\n\x04type\x18\x01 \x01(\t\"Y\n\tBatchSize\x12\x17\n\x0fmaxMessageCount\x18\x01 \x01(\r\x12\x18\n\x10\x61\x62soluteMaxBytes\x18\x02 \x01(\r\x12\x19\n\x11preferredMaxBytes\x18\x03 \x01(\r\"\x1f\n\x0c\x42\x61tchTimeout\x12\x0f\n\x07timeout\x18\x01 \x01(\t\" \n\x0e\x43reationPolicy\x12\x0e\n\x06policy\x18\x01 \x01(\t\")\n\x18\x43hainCreationPolicyNames\x12\r\n\x05names\x18\x01 \x03(\t\"\x1f\n\x0cKafkaBrokers\x12\x0f\n\x07\x62rokers\x18\x01 \x03(\t\"(\n\x13\x43hannelRestrictions\x12\x11\n\tmax_count\x18\x01 \x01(\x04\x42U\n%org.hyperledger.fabric.protos.ordererZ,github.com/hyperledger/fabric/protos/ordererb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -225,12 +225,44 @@ serialized_end=303, ) + +_CHANNELRESTRICTIONS = _descriptor.Descriptor( + name='ChannelRestrictions', + full_name='orderer.ChannelRestrictions', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='max_count', full_name='orderer.ChannelRestrictions.max_count', index=0, + number=1, type=4, cpp_type=4, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=305, + serialized_end=345, +) + DESCRIPTOR.message_types_by_name['ConsensusType'] = _CONSENSUSTYPE DESCRIPTOR.message_types_by_name['BatchSize'] = _BATCHSIZE DESCRIPTOR.message_types_by_name['BatchTimeout'] = _BATCHTIMEOUT DESCRIPTOR.message_types_by_name['CreationPolicy'] = _CREATIONPOLICY DESCRIPTOR.message_types_by_name['ChainCreationPolicyNames'] = _CHAINCREATIONPOLICYNAMES DESCRIPTOR.message_types_by_name['KafkaBrokers'] = _KAFKABROKERS +DESCRIPTOR.message_types_by_name['ChannelRestrictions'] = _CHANNELRESTRICTIONS ConsensusType = _reflection.GeneratedProtocolMessageType('ConsensusType', (_message.Message,), dict( DESCRIPTOR = _CONSENSUSTYPE, @@ -274,9 +306,16 @@ )) _sym_db.RegisterMessage(KafkaBrokers) +ChannelRestrictions = _reflection.GeneratedProtocolMessageType('ChannelRestrictions', (_message.Message,), dict( + DESCRIPTOR = _CHANNELRESTRICTIONS, + __module__ = 'orderer.configuration_pb2' + # @@protoc_insertion_point(class_scope:orderer.ChannelRestrictions) + )) +_sym_db.RegisterMessage(ChannelRestrictions) + DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z,github.com/hyperledger/fabric/protos/orderer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n%org.hyperledger.fabric.protos.ordererZ,github.com/hyperledger/fabric/protos/orderer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/orderer/kafka_pb2.py b/bddtests/orderer/kafka_pb2.py index d81ec67f354..ad1895a6560 100644 --- a/bddtests/orderer/kafka_pb2.py +++ b/bddtests/orderer/kafka_pb2.py @@ -19,7 +19,7 @@ name='orderer/kafka.proto', package='orderer', syntax='proto3', - serialized_pb=_b('\n\x13orderer/kafka.proto\x12\x07orderer\"\xaf\x01\n\x0cKafkaMessage\x12/\n\x07regular\x18\x01 \x01(\x0b\x32\x1c.orderer.KafkaMessageRegularH\x00\x12\x35\n\x0btime_to_cut\x18\x02 \x01(\x0b\x32\x1e.orderer.KafkaMessageTimeToCutH\x00\x12/\n\x07\x63onnect\x18\x03 \x01(\x0b\x32\x1c.orderer.KafkaMessageConnectH\x00\x42\x06\n\x04Type\"&\n\x13KafkaMessageRegular\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\"-\n\x15KafkaMessageTimeToCut\x12\x14\n\x0c\x62lock_number\x18\x01 \x01(\x04\"&\n\x13KafkaMessageConnect\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\".\n\rKafkaMetadata\x12\x1d\n\x15last_offset_persisted\x18\x01 \x01(\x03\x42.Z,github.com/hyperledger/fabric/protos/ordererb\x06proto3') + serialized_pb=_b('\n\x13orderer/kafka.proto\x12\x07orderer\"\xaf\x01\n\x0cKafkaMessage\x12/\n\x07regular\x18\x01 \x01(\x0b\x32\x1c.orderer.KafkaMessageRegularH\x00\x12\x35\n\x0btime_to_cut\x18\x02 \x01(\x0b\x32\x1e.orderer.KafkaMessageTimeToCutH\x00\x12/\n\x07\x63onnect\x18\x03 \x01(\x0b\x32\x1c.orderer.KafkaMessageConnectH\x00\x42\x06\n\x04Type\"&\n\x13KafkaMessageRegular\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\"-\n\x15KafkaMessageTimeToCut\x12\x14\n\x0c\x62lock_number\x18\x01 \x01(\x04\"&\n\x13KafkaMessageConnect\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\".\n\rKafkaMetadata\x12\x1d\n\x15last_offset_persisted\x18\x01 \x01(\x03\x42U\n%org.hyperledger.fabric.protos.ordererZ,github.com/hyperledger/fabric/protos/ordererb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -252,7 +252,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z,github.com/hyperledger/fabric/protos/orderer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n%org.hyperledger.fabric.protos.ordererZ,github.com/hyperledger/fabric/protos/orderer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/admin_pb2.py b/bddtests/peer/admin_pb2.py index 7a0f470f2ad..597c6be83d3 100644 --- a/bddtests/peer/admin_pb2.py +++ b/bddtests/peer/admin_pb2.py @@ -20,7 +20,7 @@ name='peer/admin.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x10peer/admin.proto\x12\x06protos\x1a\x1bgoogle/protobuf/empty.proto\"\x9a\x01\n\x0cServerStatus\x12/\n\x06status\x18\x01 \x01(\x0e\x32\x1f.protos.ServerStatus.StatusCode\"Y\n\nStatusCode\x12\r\n\tUNDEFINED\x10\x00\x12\x0b\n\x07STARTED\x10\x01\x12\x0b\n\x07STOPPED\x10\x02\x12\n\n\x06PAUSED\x10\x03\x12\t\n\x05\x45RROR\x10\x04\x12\x0b\n\x07UNKNOWN\x10\x05\"8\n\x0fLogLevelRequest\x12\x12\n\nlog_module\x18\x01 \x01(\t\x12\x11\n\tlog_level\x18\x02 \x01(\t\"9\n\x10LogLevelResponse\x12\x12\n\nlog_module\x18\x01 \x01(\t\x12\x11\n\tlog_level\x18\x02 \x01(\t2\xd5\x02\n\x05\x41\x64min\x12;\n\tGetStatus\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12=\n\x0bStartServer\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12<\n\nStopServer\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12H\n\x11GetModuleLogLevel\x12\x17.protos.LogLevelRequest\x1a\x18.protos.LogLevelResponse\"\x00\x12H\n\x11SetModuleLogLevel\x12\x17.protos.LogLevelRequest\x1a\x18.protos.LogLevelResponse\"\x00\x42+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x10peer/admin.proto\x12\x06protos\x1a\x1bgoogle/protobuf/empty.proto\"\x9a\x01\n\x0cServerStatus\x12/\n\x06status\x18\x01 \x01(\x0e\x32\x1f.protos.ServerStatus.StatusCode\"Y\n\nStatusCode\x12\r\n\tUNDEFINED\x10\x00\x12\x0b\n\x07STARTED\x10\x01\x12\x0b\n\x07STOPPED\x10\x02\x12\n\n\x06PAUSED\x10\x03\x12\t\n\x05\x45RROR\x10\x04\x12\x0b\n\x07UNKNOWN\x10\x05\"8\n\x0fLogLevelRequest\x12\x12\n\nlog_module\x18\x01 \x01(\t\x12\x11\n\tlog_level\x18\x02 \x01(\t\"9\n\x10LogLevelResponse\x12\x12\n\nlog_module\x18\x01 \x01(\t\x12\x11\n\tlog_level\x18\x02 \x01(\t2\xd5\x02\n\x05\x41\x64min\x12;\n\tGetStatus\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12=\n\x0bStartServer\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12<\n\nStopServer\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12H\n\x11GetModuleLogLevel\x12\x17.protos.LogLevelRequest\x1a\x18.protos.LogLevelResponse\"\x00\x12H\n\x11SetModuleLogLevel\x12\x17.protos.LogLevelRequest\x1a\x18.protos.LogLevelResponse\"\x00\x42]\n\"org.hyperledger.fabric.protos.peerB\x0c\x41\x64minPackageZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , dependencies=[google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -202,7 +202,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerB\014AdminPackageZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/admin_pb2_grpc.py b/bddtests/peer/admin_pb2_grpc.py index 4297abbfd4a..0114d9a48bf 100644 --- a/bddtests/peer/admin_pb2_grpc.py +++ b/bddtests/peer/admin_pb2_grpc.py @@ -1,17 +1,10 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities import google.protobuf.empty_pb2 as google_dot_protobuf_dot_empty__pb2 import peer.admin_pb2 as peer_dot_admin__pb2 -import google.protobuf.empty_pb2 as google_dot_protobuf_dot_empty__pb2 -import peer.admin_pb2 as peer_dot_admin__pb2 -import google.protobuf.empty_pb2 as google_dot_protobuf_dot_empty__pb2 -import peer.admin_pb2 as peer_dot_admin__pb2 -import peer.admin_pb2 as peer_dot_admin__pb2 -import peer.admin_pb2 as peer_dot_admin__pb2 -import peer.admin_pb2 as peer_dot_admin__pb2 -import peer.admin_pb2 as peer_dot_admin__pb2 class AdminStub(object): diff --git a/bddtests/peer/chaincodeevent_pb2.py b/bddtests/peer/chaincode_event_pb2.py similarity index 82% rename from bddtests/peer/chaincodeevent_pb2.py rename to bddtests/peer/chaincode_event_pb2.py index 5832b26bae0..7a09d82ea59 100644 --- a/bddtests/peer/chaincodeevent_pb2.py +++ b/bddtests/peer/chaincode_event_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: peer/chaincodeevent.proto +# source: peer/chaincode_event.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -16,10 +16,10 @@ DESCRIPTOR = _descriptor.FileDescriptor( - name='peer/chaincodeevent.proto', + name='peer/chaincode_event.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x19peer/chaincodeevent.proto\x12\x06protos\"Z\n\x0e\x43haincodeEvent\x12\x14\n\x0c\x63haincode_id\x18\x01 \x01(\t\x12\r\n\x05tx_id\x18\x02 \x01(\t\x12\x12\n\nevent_name\x18\x03 \x01(\t\x12\x0f\n\x07payload\x18\x04 \x01(\x0c\x42\x43\n\x16org.hyperledger.protosZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x1apeer/chaincode_event.proto\x12\x06protos\"Z\n\x0e\x43haincodeEvent\x12\x14\n\x0c\x63haincode_id\x18\x01 \x01(\t\x12\r\n\x05tx_id\x18\x02 \x01(\t\x12\x12\n\nevent_name\x18\x03 \x01(\t\x12\x0f\n\x07payload\x18\x04 \x01(\x0c\x42\x66\n\"org.hyperledger.fabric.protos.peerB\x15\x43haincodeEventPackageZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -73,22 +73,22 @@ extension_ranges=[], oneofs=[ ], - serialized_start=37, - serialized_end=127, + serialized_start=38, + serialized_end=128, ) DESCRIPTOR.message_types_by_name['ChaincodeEvent'] = _CHAINCODEEVENT ChaincodeEvent = _reflection.GeneratedProtocolMessageType('ChaincodeEvent', (_message.Message,), dict( DESCRIPTOR = _CHAINCODEEVENT, - __module__ = 'peer.chaincodeevent_pb2' + __module__ = 'peer.chaincode_event_pb2' # @@protoc_insertion_point(class_scope:protos.ChaincodeEvent) )) _sym_db.RegisterMessage(ChaincodeEvent) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026org.hyperledger.protosZ)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerB\025ChaincodeEventPackageZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/chaincodeevent_pb2_grpc.py b/bddtests/peer/chaincode_event_pb2_grpc.py similarity index 65% rename from bddtests/peer/chaincodeevent_pb2_grpc.py rename to bddtests/peer/chaincode_event_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/chaincodeevent_pb2_grpc.py +++ b/bddtests/peer/chaincode_event_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/chaincode_pb2.py b/bddtests/peer/chaincode_pb2.py index e9be1a46071..b2e12b1271c 100644 --- a/bddtests/peer/chaincode_pb2.py +++ b/bddtests/peer/chaincode_pb2.py @@ -21,7 +21,7 @@ name='peer/chaincode.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x14peer/chaincode.proto\x12\x06protos\x1a\x1fgoogle/protobuf/timestamp.proto\":\n\x0b\x43haincodeID\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\"\x1e\n\x0e\x43haincodeInput\x12\x0c\n\x04\x61rgs\x18\x01 \x03(\x0c\"\xdc\x01\n\rChaincodeSpec\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.protos.ChaincodeSpec.Type\x12)\n\x0c\x63haincode_id\x18\x02 \x01(\x0b\x32\x13.protos.ChaincodeID\x12%\n\x05input\x18\x03 \x01(\x0b\x32\x16.protos.ChaincodeInput\x12\x0f\n\x07timeout\x18\x04 \x01(\x05\">\n\x04Type\x12\r\n\tUNDEFINED\x10\x00\x12\n\n\x06GOLANG\x10\x01\x12\x08\n\x04NODE\x10\x02\x12\x07\n\x03\x43\x41R\x10\x03\x12\x08\n\x04JAVA\x10\x04\"\x8a\x02\n\x17\x43haincodeDeploymentSpec\x12-\n\x0e\x63haincode_spec\x18\x01 \x01(\x0b\x32\x15.protos.ChaincodeSpec\x12\x32\n\x0e\x65\x66\x66\x65\x63tive_date\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x14\n\x0c\x63ode_package\x18\x03 \x01(\x0c\x12\x46\n\x08\x65xec_env\x18\x04 \x01(\x0e\x32\x34.protos.ChaincodeDeploymentSpec.ExecutionEnvironment\".\n\x14\x45xecutionEnvironment\x12\n\n\x06\x44OCKER\x10\x00\x12\n\n\x06SYSTEM\x10\x01\"c\n\x17\x43haincodeInvocationSpec\x12-\n\x0e\x63haincode_spec\x18\x01 \x01(\x0b\x32\x15.protos.ChaincodeSpec\x12\x19\n\x11id_generation_alg\x18\x02 \x01(\t*4\n\x14\x43onfidentialityLevel\x12\n\n\x06PUBLIC\x10\x00\x12\x10\n\x0c\x43ONFIDENTIAL\x10\x01\x42\x43\n\x16org.hyperledger.protosZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x14peer/chaincode.proto\x12\x06protos\x1a\x1fgoogle/protobuf/timestamp.proto\":\n\x0b\x43haincodeID\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\t\"\x1e\n\x0e\x43haincodeInput\x12\x0c\n\x04\x61rgs\x18\x01 \x03(\x0c\"\xdc\x01\n\rChaincodeSpec\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.protos.ChaincodeSpec.Type\x12)\n\x0c\x63haincode_id\x18\x02 \x01(\x0b\x32\x13.protos.ChaincodeID\x12%\n\x05input\x18\x03 \x01(\x0b\x32\x16.protos.ChaincodeInput\x12\x0f\n\x07timeout\x18\x04 \x01(\x05\">\n\x04Type\x12\r\n\tUNDEFINED\x10\x00\x12\n\n\x06GOLANG\x10\x01\x12\x08\n\x04NODE\x10\x02\x12\x07\n\x03\x43\x41R\x10\x03\x12\x08\n\x04JAVA\x10\x04\"\x8a\x02\n\x17\x43haincodeDeploymentSpec\x12-\n\x0e\x63haincode_spec\x18\x01 \x01(\x0b\x32\x15.protos.ChaincodeSpec\x12\x32\n\x0e\x65\x66\x66\x65\x63tive_date\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x14\n\x0c\x63ode_package\x18\x03 \x01(\x0c\x12\x46\n\x08\x65xec_env\x18\x04 \x01(\x0e\x32\x34.protos.ChaincodeDeploymentSpec.ExecutionEnvironment\".\n\x14\x45xecutionEnvironment\x12\n\n\x06\x44OCKER\x10\x00\x12\n\n\x06SYSTEM\x10\x01\"c\n\x17\x43haincodeInvocationSpec\x12-\n\x0e\x63haincode_spec\x18\x01 \x01(\x0b\x32\x15.protos.ChaincodeSpec\x12\x19\n\x11id_generation_alg\x18\x02 \x01(\t*4\n\x14\x43onfidentialityLevel\x12\n\n\x06PUBLIC\x10\x00\x12\x10\n\x0c\x43ONFIDENTIAL\x10\x01\x42O\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -382,7 +382,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026org.hyperledger.protosZ)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/chaincode_pb2_grpc.py b/bddtests/peer/chaincode_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/chaincode_pb2_grpc.py +++ b/bddtests/peer/chaincode_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/chaincodeshim_pb2.py b/bddtests/peer/chaincode_shim_pb2.py similarity index 86% rename from bddtests/peer/chaincodeshim_pb2.py rename to bddtests/peer/chaincode_shim_pb2.py index 88bb86c78ea..7126da2cba8 100644 --- a/bddtests/peer/chaincodeshim_pb2.py +++ b/bddtests/peer/chaincode_shim_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: peer/chaincodeshim.proto +# source: peer/chaincode_shim.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -13,18 +13,18 @@ _sym_db = _symbol_database.Default() -from peer import chaincodeevent_pb2 as peer_dot_chaincodeevent__pb2 +from peer import chaincode_event_pb2 as peer_dot_chaincode__event__pb2 from peer import proposal_pb2 as peer_dot_proposal__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 DESCRIPTOR = _descriptor.FileDescriptor( - name='peer/chaincodeshim.proto', + name='peer/chaincode_shim.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x18peer/chaincodeshim.proto\x12\x06protos\x1a\x19peer/chaincodeevent.proto\x1a\x13peer/proposal.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xac\x04\n\x10\x43haincodeMessage\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.protos.ChaincodeMessage.Type\x12-\n\ttimestamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07payload\x18\x03 \x01(\x0c\x12\x0c\n\x04txid\x18\x04 \x01(\t\x12\"\n\x08proposal\x18\x05 \x01(\x0b\x32\x10.protos.Proposal\x12/\n\x0f\x63haincode_event\x18\x06 \x01(\x0b\x32\x16.protos.ChaincodeEvent\"\xc7\x02\n\x04Type\x12\r\n\tUNDEFINED\x10\x00\x12\x0c\n\x08REGISTER\x10\x01\x12\x0e\n\nREGISTERED\x10\x02\x12\x08\n\x04INIT\x10\x03\x12\t\n\x05READY\x10\x04\x12\x0f\n\x0bTRANSACTION\x10\x05\x12\r\n\tCOMPLETED\x10\x06\x12\t\n\x05\x45RROR\x10\x07\x12\r\n\tGET_STATE\x10\x08\x12\r\n\tPUT_STATE\x10\t\x12\r\n\tDEL_STATE\x10\n\x12\x14\n\x10INVOKE_CHAINCODE\x10\x0b\x12\x0c\n\x08RESPONSE\x10\r\x12\x16\n\x12GET_STATE_BY_RANGE\x10\x0e\x12\x14\n\x10GET_QUERY_RESULT\x10\x0f\x12\x14\n\x10QUERY_STATE_NEXT\x10\x10\x12\x15\n\x11QUERY_STATE_CLOSE\x10\x11\x12\r\n\tKEEPALIVE\x10\x12\x12\x17\n\x13GET_HISTORY_FOR_KEY\x10\x13\"*\n\x0cPutStateInfo\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\"3\n\x0fGetStateByRange\x12\x10\n\x08startKey\x18\x01 \x01(\t\x12\x0e\n\x06\x65ndKey\x18\x02 \x01(\t\"\x1f\n\x0eGetQueryResult\x12\r\n\x05query\x18\x01 \x01(\t\"\x1f\n\x10GetHistoryForKey\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x1c\n\x0eQueryStateNext\x12\n\n\x02id\x18\x01 \x01(\t\"\x1d\n\x0fQueryStateClose\x12\n\n\x02id\x18\x01 \x01(\t\"0\n\x12QueryStateKeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\"g\n\x12QueryStateResponse\x12\x33\n\x0fkeys_and_values\x18\x01 \x03(\x0b\x32\x1a.protos.QueryStateKeyValue\x12\x10\n\x08has_more\x18\x02 \x01(\x08\x12\n\n\x02id\x18\x03 \x01(\t2X\n\x10\x43haincodeSupport\x12\x44\n\x08Register\x12\x18.protos.ChaincodeMessage\x1a\x18.protos.ChaincodeMessage\"\x00(\x01\x30\x01\x42\x43\n\x16org.hyperledger.protosZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x19peer/chaincode_shim.proto\x12\x06protos\x1a\x1apeer/chaincode_event.proto\x1a\x13peer/proposal.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xac\x04\n\x10\x43haincodeMessage\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.protos.ChaincodeMessage.Type\x12-\n\ttimestamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07payload\x18\x03 \x01(\x0c\x12\x0c\n\x04txid\x18\x04 \x01(\t\x12\"\n\x08proposal\x18\x05 \x01(\x0b\x32\x10.protos.Proposal\x12/\n\x0f\x63haincode_event\x18\x06 \x01(\x0b\x32\x16.protos.ChaincodeEvent\"\xc7\x02\n\x04Type\x12\r\n\tUNDEFINED\x10\x00\x12\x0c\n\x08REGISTER\x10\x01\x12\x0e\n\nREGISTERED\x10\x02\x12\x08\n\x04INIT\x10\x03\x12\t\n\x05READY\x10\x04\x12\x0f\n\x0bTRANSACTION\x10\x05\x12\r\n\tCOMPLETED\x10\x06\x12\t\n\x05\x45RROR\x10\x07\x12\r\n\tGET_STATE\x10\x08\x12\r\n\tPUT_STATE\x10\t\x12\r\n\tDEL_STATE\x10\n\x12\x14\n\x10INVOKE_CHAINCODE\x10\x0b\x12\x0c\n\x08RESPONSE\x10\r\x12\x16\n\x12GET_STATE_BY_RANGE\x10\x0e\x12\x14\n\x10GET_QUERY_RESULT\x10\x0f\x12\x14\n\x10QUERY_STATE_NEXT\x10\x10\x12\x15\n\x11QUERY_STATE_CLOSE\x10\x11\x12\r\n\tKEEPALIVE\x10\x12\x12\x17\n\x13GET_HISTORY_FOR_KEY\x10\x13\"*\n\x0cPutStateInfo\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\"3\n\x0fGetStateByRange\x12\x10\n\x08startKey\x18\x01 \x01(\t\x12\x0e\n\x06\x65ndKey\x18\x02 \x01(\t\"\x1f\n\x0eGetQueryResult\x12\r\n\x05query\x18\x01 \x01(\t\"\x1f\n\x10GetHistoryForKey\x12\x0b\n\x03key\x18\x01 \x01(\t\"\x1c\n\x0eQueryStateNext\x12\n\n\x02id\x18\x01 \x01(\t\"\x1d\n\x0fQueryStateClose\x12\n\n\x02id\x18\x01 \x01(\t\"0\n\x12QueryStateKeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\"g\n\x12QueryStateResponse\x12\x33\n\x0fkeys_and_values\x18\x01 \x03(\x0b\x32\x1a.protos.QueryStateKeyValue\x12\x10\n\x08has_more\x18\x02 \x01(\x08\x12\n\n\x02id\x18\x03 \x01(\t2X\n\x10\x43haincodeSupport\x12\x44\n\x08Register\x12\x18.protos.ChaincodeMessage\x1a\x18.protos.ChaincodeMessage\"\x00(\x01\x30\x01\x42O\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , - dependencies=[peer_dot_chaincodeevent__pb2.DESCRIPTOR,peer_dot_proposal__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,]) + dependencies=[peer_dot_chaincode__event__pb2.DESCRIPTOR,peer_dot_proposal__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -114,8 +114,8 @@ ], containing_type=None, options=None, - serialized_start=347, - serialized_end=674, + serialized_start=349, + serialized_end=676, ) _sym_db.RegisterEnumDescriptor(_CHAINCODEMESSAGE_TYPE) @@ -182,8 +182,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=118, - serialized_end=674, + serialized_start=120, + serialized_end=676, ) @@ -220,8 +220,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=676, - serialized_end=718, + serialized_start=678, + serialized_end=720, ) @@ -258,8 +258,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=720, - serialized_end=771, + serialized_start=722, + serialized_end=773, ) @@ -289,8 +289,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=773, - serialized_end=804, + serialized_start=775, + serialized_end=806, ) @@ -320,8 +320,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=806, - serialized_end=837, + serialized_start=808, + serialized_end=839, ) @@ -351,8 +351,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=839, - serialized_end=867, + serialized_start=841, + serialized_end=869, ) @@ -382,8 +382,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=869, - serialized_end=898, + serialized_start=871, + serialized_end=900, ) @@ -420,8 +420,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=900, - serialized_end=948, + serialized_start=902, + serialized_end=950, ) @@ -465,14 +465,14 @@ extension_ranges=[], oneofs=[ ], - serialized_start=950, - serialized_end=1053, + serialized_start=952, + serialized_end=1055, ) _CHAINCODEMESSAGE.fields_by_name['type'].enum_type = _CHAINCODEMESSAGE_TYPE _CHAINCODEMESSAGE.fields_by_name['timestamp'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP _CHAINCODEMESSAGE.fields_by_name['proposal'].message_type = peer_dot_proposal__pb2._PROPOSAL -_CHAINCODEMESSAGE.fields_by_name['chaincode_event'].message_type = peer_dot_chaincodeevent__pb2._CHAINCODEEVENT +_CHAINCODEMESSAGE.fields_by_name['chaincode_event'].message_type = peer_dot_chaincode__event__pb2._CHAINCODEEVENT _CHAINCODEMESSAGE_TYPE.containing_type = _CHAINCODEMESSAGE _QUERYSTATERESPONSE.fields_by_name['keys_and_values'].message_type = _QUERYSTATEKEYVALUE DESCRIPTOR.message_types_by_name['ChaincodeMessage'] = _CHAINCODEMESSAGE @@ -487,70 +487,70 @@ ChaincodeMessage = _reflection.GeneratedProtocolMessageType('ChaincodeMessage', (_message.Message,), dict( DESCRIPTOR = _CHAINCODEMESSAGE, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.ChaincodeMessage) )) _sym_db.RegisterMessage(ChaincodeMessage) PutStateInfo = _reflection.GeneratedProtocolMessageType('PutStateInfo', (_message.Message,), dict( DESCRIPTOR = _PUTSTATEINFO, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.PutStateInfo) )) _sym_db.RegisterMessage(PutStateInfo) GetStateByRange = _reflection.GeneratedProtocolMessageType('GetStateByRange', (_message.Message,), dict( DESCRIPTOR = _GETSTATEBYRANGE, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.GetStateByRange) )) _sym_db.RegisterMessage(GetStateByRange) GetQueryResult = _reflection.GeneratedProtocolMessageType('GetQueryResult', (_message.Message,), dict( DESCRIPTOR = _GETQUERYRESULT, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.GetQueryResult) )) _sym_db.RegisterMessage(GetQueryResult) GetHistoryForKey = _reflection.GeneratedProtocolMessageType('GetHistoryForKey', (_message.Message,), dict( DESCRIPTOR = _GETHISTORYFORKEY, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.GetHistoryForKey) )) _sym_db.RegisterMessage(GetHistoryForKey) QueryStateNext = _reflection.GeneratedProtocolMessageType('QueryStateNext', (_message.Message,), dict( DESCRIPTOR = _QUERYSTATENEXT, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.QueryStateNext) )) _sym_db.RegisterMessage(QueryStateNext) QueryStateClose = _reflection.GeneratedProtocolMessageType('QueryStateClose', (_message.Message,), dict( DESCRIPTOR = _QUERYSTATECLOSE, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.QueryStateClose) )) _sym_db.RegisterMessage(QueryStateClose) QueryStateKeyValue = _reflection.GeneratedProtocolMessageType('QueryStateKeyValue', (_message.Message,), dict( DESCRIPTOR = _QUERYSTATEKEYVALUE, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.QueryStateKeyValue) )) _sym_db.RegisterMessage(QueryStateKeyValue) QueryStateResponse = _reflection.GeneratedProtocolMessageType('QueryStateResponse', (_message.Message,), dict( DESCRIPTOR = _QUERYSTATERESPONSE, - __module__ = 'peer.chaincodeshim_pb2' + __module__ = 'peer.chaincode_shim_pb2' # @@protoc_insertion_point(class_scope:protos.QueryStateResponse) )) _sym_db.RegisterMessage(QueryStateResponse) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026org.hyperledger.protosZ)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/chaincodeshim_pb2_grpc.py b/bddtests/peer/chaincode_shim_pb2_grpc.py similarity index 72% rename from bddtests/peer/chaincodeshim_pb2_grpc.py rename to bddtests/peer/chaincode_shim_pb2_grpc.py index f9b5bc63370..49f2357f208 100644 --- a/bddtests/peer/chaincodeshim_pb2_grpc.py +++ b/bddtests/peer/chaincode_shim_pb2_grpc.py @@ -1,9 +1,9 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities -import peer.chaincodeshim_pb2 as peer_dot_chaincodeshim__pb2 -import peer.chaincodeshim_pb2 as peer_dot_chaincodeshim__pb2 +import peer.chaincode_shim_pb2 as peer_dot_chaincode__shim__pb2 class ChaincodeSupportStub(object): @@ -19,8 +19,8 @@ def __init__(self, channel): """ self.Register = channel.stream_stream( '/protos.ChaincodeSupport/Register', - request_serializer=peer_dot_chaincodeshim__pb2.ChaincodeMessage.SerializeToString, - response_deserializer=peer_dot_chaincodeshim__pb2.ChaincodeMessage.FromString, + request_serializer=peer_dot_chaincode__shim__pb2.ChaincodeMessage.SerializeToString, + response_deserializer=peer_dot_chaincode__shim__pb2.ChaincodeMessage.FromString, ) @@ -39,8 +39,8 @@ def add_ChaincodeSupportServicer_to_server(servicer, server): rpc_method_handlers = { 'Register': grpc.stream_stream_rpc_method_handler( servicer.Register, - request_deserializer=peer_dot_chaincodeshim__pb2.ChaincodeMessage.FromString, - response_serializer=peer_dot_chaincodeshim__pb2.ChaincodeMessage.SerializeToString, + request_deserializer=peer_dot_chaincode__shim__pb2.ChaincodeMessage.FromString, + response_serializer=peer_dot_chaincode__shim__pb2.ChaincodeMessage.SerializeToString, ), } generic_handler = grpc.method_handlers_generic_handler( diff --git a/bddtests/peer/configuration_pb2.py b/bddtests/peer/configuration_pb2.py index eb22a5827d3..2aba1a786d6 100644 --- a/bddtests/peer/configuration_pb2.py +++ b/bddtests/peer/configuration_pb2.py @@ -19,7 +19,7 @@ name='peer/configuration.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x18peer/configuration.proto\x12\x06protos\"7\n\x0b\x41nchorPeers\x12(\n\x0c\x61nchor_peers\x18\x01 \x03(\x0b\x32\x12.protos.AnchorPeer\"(\n\nAnchorPeer\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x05\x42+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x18peer/configuration.proto\x12\x06protos\"7\n\x0b\x41nchorPeers\x12(\n\x0c\x61nchor_peers\x18\x01 \x03(\x0b\x32\x12.protos.AnchorPeer\"(\n\nAnchorPeer\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x05\x42O\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -114,7 +114,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/configuration_pb2_grpc.py b/bddtests/peer/configuration_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/configuration_pb2_grpc.py +++ b/bddtests/peer/configuration_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/events_pb2.py b/bddtests/peer/events_pb2.py index 086fa78f58a..720911e493d 100644 --- a/bddtests/peer/events_pb2.py +++ b/bddtests/peer/events_pb2.py @@ -15,7 +15,7 @@ from common import common_pb2 as common_dot_common__pb2 -from peer import chaincodeevent_pb2 as peer_dot_chaincodeevent__pb2 +from peer import chaincode_event_pb2 as peer_dot_chaincode__event__pb2 from peer import transaction_pb2 as peer_dot_transaction__pb2 @@ -23,9 +23,9 @@ name='peer/events.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x11peer/events.proto\x12\x06protos\x1a\x13\x63ommon/common.proto\x1a\x19peer/chaincodeevent.proto\x1a\x16peer/transaction.proto\"8\n\x0c\x43haincodeReg\x12\x14\n\x0c\x63haincode_id\x18\x01 \x01(\t\x12\x12\n\nevent_name\x18\x02 \x01(\t\"\x81\x01\n\x08Interest\x12%\n\nevent_type\x18\x01 \x01(\x0e\x32\x11.protos.EventType\x12\x32\n\x12\x63haincode_reg_info\x18\x02 \x01(\x0b\x32\x14.protos.ChaincodeRegH\x00\x12\x0f\n\x07\x63hainID\x18\x03 \x01(\tB\t\n\x07RegInfo\",\n\x08Register\x12 \n\x06\x65vents\x18\x01 \x03(\x0b\x32\x10.protos.Interest\"?\n\tRejection\x12\x1f\n\x02tx\x18\x01 \x01(\x0b\x32\x13.protos.Transaction\x12\x11\n\terror_msg\x18\x02 \x01(\t\".\n\nUnregister\x12 \n\x06\x65vents\x18\x01 \x03(\x0b\x32\x10.protos.Interest\"4\n\x0bSignedEvent\x12\x11\n\tsignature\x18\x01 \x01(\x0c\x12\x12\n\neventBytes\x18\x02 \x01(\x0c\"\xec\x01\n\x05\x45vent\x12$\n\x08register\x18\x01 \x01(\x0b\x32\x10.protos.RegisterH\x00\x12\x1e\n\x05\x62lock\x18\x02 \x01(\x0b\x32\r.common.BlockH\x00\x12\x31\n\x0f\x63haincode_event\x18\x03 \x01(\x0b\x32\x16.protos.ChaincodeEventH\x00\x12&\n\trejection\x18\x04 \x01(\x0b\x32\x11.protos.RejectionH\x00\x12(\n\nunregister\x18\x05 \x01(\x0b\x32\x12.protos.UnregisterH\x00\x12\x0f\n\x07\x63reator\x18\x06 \x01(\x0c\x42\x07\n\x05\x45vent*B\n\tEventType\x12\x0c\n\x08REGISTER\x10\x00\x12\t\n\x05\x42LOCK\x10\x01\x12\r\n\tCHAINCODE\x10\x02\x12\r\n\tREJECTION\x10\x03\x32\x34\n\x06\x45vents\x12*\n\x04\x43hat\x12\r.protos.Event\x1a\r.protos.Event\"\x00(\x01\x30\x01\x42+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x11peer/events.proto\x12\x06protos\x1a\x13\x63ommon/common.proto\x1a\x1apeer/chaincode_event.proto\x1a\x16peer/transaction.proto\"8\n\x0c\x43haincodeReg\x12\x14\n\x0c\x63haincode_id\x18\x01 \x01(\t\x12\x12\n\nevent_name\x18\x02 \x01(\t\"\x81\x01\n\x08Interest\x12%\n\nevent_type\x18\x01 \x01(\x0e\x32\x11.protos.EventType\x12\x32\n\x12\x63haincode_reg_info\x18\x02 \x01(\x0b\x32\x14.protos.ChaincodeRegH\x00\x12\x0f\n\x07\x63hainID\x18\x03 \x01(\tB\t\n\x07RegInfo\",\n\x08Register\x12 \n\x06\x65vents\x18\x01 \x03(\x0b\x32\x10.protos.Interest\"?\n\tRejection\x12\x1f\n\x02tx\x18\x01 \x01(\x0b\x32\x13.protos.Transaction\x12\x11\n\terror_msg\x18\x02 \x01(\t\".\n\nUnregister\x12 \n\x06\x65vents\x18\x01 \x03(\x0b\x32\x10.protos.Interest\"4\n\x0bSignedEvent\x12\x11\n\tsignature\x18\x01 \x01(\x0c\x12\x12\n\neventBytes\x18\x02 \x01(\x0c\"\xec\x01\n\x05\x45vent\x12$\n\x08register\x18\x01 \x01(\x0b\x32\x10.protos.RegisterH\x00\x12\x1e\n\x05\x62lock\x18\x02 \x01(\x0b\x32\r.common.BlockH\x00\x12\x31\n\x0f\x63haincode_event\x18\x03 \x01(\x0b\x32\x16.protos.ChaincodeEventH\x00\x12&\n\trejection\x18\x04 \x01(\x0b\x32\x11.protos.RejectionH\x00\x12(\n\nunregister\x18\x05 \x01(\x0b\x32\x12.protos.UnregisterH\x00\x12\x0f\n\x07\x63reator\x18\x06 \x01(\x0c\x42\x07\n\x05\x45vent*B\n\tEventType\x12\x0c\n\x08REGISTER\x10\x00\x12\t\n\x05\x42LOCK\x10\x01\x12\r\n\tCHAINCODE\x10\x02\x12\r\n\tREJECTION\x10\x03\x32\x34\n\x06\x45vents\x12*\n\x04\x43hat\x12\r.protos.Event\x1a\r.protos.Event\"\x00(\x01\x30\x01\x42^\n\"org.hyperledger.fabric.protos.peerB\rEventsPackageZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , - dependencies=[common_dot_common__pb2.DESCRIPTOR,peer_dot_chaincodeevent__pb2.DESCRIPTOR,peer_dot_transaction__pb2.DESCRIPTOR,]) + dependencies=[common_dot_common__pb2.DESCRIPTOR,peer_dot_chaincode__event__pb2.DESCRIPTOR,peer_dot_transaction__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) _EVENTTYPE = _descriptor.EnumDescriptor( @@ -53,8 +53,8 @@ ], containing_type=None, options=None, - serialized_start=743, - serialized_end=809, + serialized_start=744, + serialized_end=810, ) _sym_db.RegisterEnumDescriptor(_EVENTTYPE) @@ -99,8 +99,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=101, - serialized_end=157, + serialized_start=102, + serialized_end=158, ) @@ -147,8 +147,8 @@ name='RegInfo', full_name='protos.Interest.RegInfo', index=0, containing_type=None, fields=[]), ], - serialized_start=160, - serialized_end=289, + serialized_start=161, + serialized_end=290, ) @@ -178,8 +178,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=291, - serialized_end=335, + serialized_start=292, + serialized_end=336, ) @@ -216,8 +216,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=337, - serialized_end=400, + serialized_start=338, + serialized_end=401, ) @@ -247,8 +247,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=402, - serialized_end=448, + serialized_start=403, + serialized_end=449, ) @@ -285,8 +285,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=450, - serialized_end=502, + serialized_start=451, + serialized_end=503, ) @@ -354,8 +354,8 @@ name='Event', full_name='protos.Event.Event', index=0, containing_type=None, fields=[]), ], - serialized_start=505, - serialized_end=741, + serialized_start=506, + serialized_end=742, ) _INTEREST.fields_by_name['event_type'].enum_type = _EVENTTYPE @@ -368,7 +368,7 @@ _UNREGISTER.fields_by_name['events'].message_type = _INTEREST _EVENT.fields_by_name['register'].message_type = _REGISTER _EVENT.fields_by_name['block'].message_type = common_dot_common__pb2._BLOCK -_EVENT.fields_by_name['chaincode_event'].message_type = peer_dot_chaincodeevent__pb2._CHAINCODEEVENT +_EVENT.fields_by_name['chaincode_event'].message_type = peer_dot_chaincode__event__pb2._CHAINCODEEVENT _EVENT.fields_by_name['rejection'].message_type = _REJECTION _EVENT.fields_by_name['unregister'].message_type = _UNREGISTER _EVENT.oneofs_by_name['Event'].fields.append( @@ -446,7 +446,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerB\rEventsPackageZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/events_pb2_grpc.py b/bddtests/peer/events_pb2_grpc.py index e071365d910..8331caf5300 100644 --- a/bddtests/peer/events_pb2_grpc.py +++ b/bddtests/peer/events_pb2_grpc.py @@ -1,9 +1,9 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities import peer.events_pb2 as peer_dot_events__pb2 -import peer.events_pb2 as peer_dot_events__pb2 class EventsStub(object): diff --git a/bddtests/peer/peer_pb2.py b/bddtests/peer/peer_pb2.py index 16912a47287..6177b59741b 100644 --- a/bddtests/peer/peer_pb2.py +++ b/bddtests/peer/peer_pb2.py @@ -21,7 +21,7 @@ name='peer/peer.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x0fpeer/peer.proto\x12\x06protos\x1a\x13peer/proposal.proto\x1a\x1cpeer/proposal_response.proto\"\x16\n\x06PeerID\x12\x0c\n\x04name\x18\x01 \x01(\t\";\n\x0cPeerEndpoint\x12\x1a\n\x02id\x18\x01 \x01(\x0b\x32\x0e.protos.PeerID\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t2Q\n\x08\x45ndorser\x12\x45\n\x0fProcessProposal\x12\x16.protos.SignedProposal\x1a\x18.protos.ProposalResponse\"\x00\x42+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x0fpeer/peer.proto\x12\x06protos\x1a\x13peer/proposal.proto\x1a\x1cpeer/proposal_response.proto\"\x16\n\x06PeerID\x12\x0c\n\x04name\x18\x01 \x01(\t\";\n\x0cPeerEndpoint\x12\x1a\n\x02id\x18\x01 \x01(\x0b\x32\x0e.protos.PeerID\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t2Q\n\x08\x45ndorser\x12\x45\n\x0fProcessProposal\x12\x16.protos.SignedProposal\x1a\x18.protos.ProposalResponse\"\x00\x42O\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , dependencies=[peer_dot_proposal__pb2.DESCRIPTOR,peer_dot_proposal__response__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -117,7 +117,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/peer_pb2_grpc.py b/bddtests/peer/peer_pb2_grpc.py index 1e076e082c5..116fc050e77 100644 --- a/bddtests/peer/peer_pb2_grpc.py +++ b/bddtests/peer/peer_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/proposal_pb2.py b/bddtests/peer/proposal_pb2.py index 4fc817c78e6..57daac9ca01 100644 --- a/bddtests/peer/proposal_pb2.py +++ b/bddtests/peer/proposal_pb2.py @@ -21,7 +21,7 @@ name='peer/proposal.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x13peer/proposal.proto\x12\x06protos\x1a\x14peer/chaincode.proto\x1a\x1cpeer/proposal_response.proto\";\n\x0eSignedProposal\x12\x16\n\x0eproposal_bytes\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\">\n\x08Proposal\x12\x0e\n\x06header\x18\x01 \x01(\x0c\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\x11\n\textension\x18\x03 \x01(\x0c\"a\n\x18\x43haincodeHeaderExtension\x12\x1a\n\x12payload_visibility\x18\x01 \x01(\x0c\x12)\n\x0c\x63haincode_id\x18\x02 \x01(\x0b\x32\x13.protos.ChaincodeID\"\xa8\x01\n\x18\x43haincodeProposalPayload\x12\r\n\x05input\x18\x01 \x01(\x0c\x12H\n\x0cTransientMap\x18\x02 \x03(\x0b\x32\x32.protos.ChaincodeProposalPayload.TransientMapEntry\x1a\x33\n\x11TransientMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"V\n\x0f\x43haincodeAction\x12\x0f\n\x07results\x18\x01 \x01(\x0c\x12\x0e\n\x06\x65vents\x18\x02 \x01(\x0c\x12\"\n\x08response\x18\x03 \x01(\x0b\x32\x10.protos.ResponseB+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x13peer/proposal.proto\x12\x06protos\x1a\x14peer/chaincode.proto\x1a\x1cpeer/proposal_response.proto\";\n\x0eSignedProposal\x12\x16\n\x0eproposal_bytes\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\">\n\x08Proposal\x12\x0e\n\x06header\x18\x01 \x01(\x0c\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\x11\n\textension\x18\x03 \x01(\x0c\"a\n\x18\x43haincodeHeaderExtension\x12\x1a\n\x12payload_visibility\x18\x01 \x01(\x0c\x12)\n\x0c\x63haincode_id\x18\x02 \x01(\x0b\x32\x13.protos.ChaincodeID\"\xa8\x01\n\x18\x43haincodeProposalPayload\x12\r\n\x05input\x18\x01 \x01(\x0c\x12H\n\x0cTransientMap\x18\x02 \x03(\x0b\x32\x32.protos.ChaincodeProposalPayload.TransientMapEntry\x1a\x33\n\x11TransientMapEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\"V\n\x0f\x43haincodeAction\x12\x0f\n\x07results\x18\x01 \x01(\x0c\x12\x0e\n\x06\x65vents\x18\x02 \x01(\x0c\x12\"\n\x08response\x18\x03 \x01(\x0b\x32\x10.protos.ResponseB`\n\"org.hyperledger.fabric.protos.peerB\x0fProposalPackageZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , dependencies=[peer_dot_chaincode__pb2.DESCRIPTOR,peer_dot_proposal__response__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -324,7 +324,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerB\017ProposalPackageZ)github.com/hyperledger/fabric/protos/peer')) _CHAINCODEPROPOSALPAYLOAD_TRANSIENTMAPENTRY.has_options = True _CHAINCODEPROPOSALPAYLOAD_TRANSIENTMAPENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) try: diff --git a/bddtests/peer/proposal_pb2_grpc.py b/bddtests/peer/proposal_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/proposal_pb2_grpc.py +++ b/bddtests/peer/proposal_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/proposal_response_pb2.py b/bddtests/peer/proposal_response_pb2.py index 4b7bf00178e..09ef3315245 100644 --- a/bddtests/peer/proposal_response_pb2.py +++ b/bddtests/peer/proposal_response_pb2.py @@ -20,7 +20,7 @@ name='peer/proposal_response.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x1cpeer/proposal_response.proto\x12\x06protos\x1a\x1fgoogle/protobuf/timestamp.proto\"\xb1\x01\n\x10ProposalResponse\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12-\n\ttimestamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\"\n\x08response\x18\x04 \x01(\x0b\x32\x10.protos.Response\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12(\n\x0b\x65ndorsement\x18\x06 \x01(\x0b\x32\x13.protos.Endorsement\"<\n\x08Response\x12\x0e\n\x06status\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0f\n\x07payload\x18\x03 \x01(\x0c\"C\n\x17ProposalResponsePayload\x12\x15\n\rproposal_hash\x18\x01 \x01(\x0c\x12\x11\n\textension\x18\x02 \x01(\x0c\"2\n\x0b\x45ndorsement\x12\x10\n\x08\x65ndorser\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\x42+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x1cpeer/proposal_response.proto\x12\x06protos\x1a\x1fgoogle/protobuf/timestamp.proto\"\xb1\x01\n\x10ProposalResponse\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12-\n\ttimestamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\"\n\x08response\x18\x04 \x01(\x0b\x32\x10.protos.Response\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12(\n\x0b\x65ndorsement\x18\x06 \x01(\x0b\x32\x13.protos.Endorsement\"<\n\x08Response\x12\x0e\n\x06status\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0f\n\x07payload\x18\x03 \x01(\x0c\"C\n\x17ProposalResponsePayload\x12\x15\n\rproposal_hash\x18\x01 \x01(\x0c\x12\x11\n\textension\x18\x02 \x01(\x0c\"2\n\x0b\x45ndorsement\x12\x10\n\x08\x65ndorser\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\x42h\n\"org.hyperledger.fabric.protos.peerB\x17ProposalResponsePackageZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -245,7 +245,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerB\027ProposalResponsePackageZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/proposal_response_pb2_grpc.py b/bddtests/peer/proposal_response_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/proposal_response_pb2_grpc.py +++ b/bddtests/peer/proposal_response_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/query_pb2.py b/bddtests/peer/query_pb2.py index b6ae38a45e9..e9a3631fb8c 100644 --- a/bddtests/peer/query_pb2.py +++ b/bddtests/peer/query_pb2.py @@ -19,7 +19,7 @@ name='peer/query.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x10peer/query.proto\x12\x06protos\"C\n\x16\x43haincodeQueryResponse\x12)\n\nchaincodes\x18\x01 \x03(\x0b\x32\x15.protos.ChaincodeInfo\"g\n\rChaincodeInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\r\n\x05input\x18\x04 \x01(\t\x12\x0c\n\x04\x65scc\x18\x05 \x01(\t\x12\x0c\n\x04vscc\x18\x06 \x01(\t\"=\n\x14\x43hannelQueryResponse\x12%\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x13.protos.ChannelInfo\"!\n\x0b\x43hannelInfo\x12\x12\n\nchannel_id\x18\x01 \x01(\tB+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x10peer/query.proto\x12\x06protos\"C\n\x16\x43haincodeQueryResponse\x12)\n\nchaincodes\x18\x01 \x03(\x0b\x32\x15.protos.ChaincodeInfo\"g\n\rChaincodeInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\r\n\x05input\x18\x04 \x01(\t\x12\x0c\n\x04\x65scc\x18\x05 \x01(\t\x12\x0c\n\x04vscc\x18\x06 \x01(\t\"=\n\x14\x43hannelQueryResponse\x12%\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x13.protos.ChannelInfo\"!\n\x0b\x43hannelInfo\x12\x12\n\nchannel_id\x18\x01 \x01(\tBO\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -221,7 +221,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/query_pb2_grpc.py b/bddtests/peer/query_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/query_pb2_grpc.py +++ b/bddtests/peer/query_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/peer/transaction_pb2.py b/bddtests/peer/transaction_pb2.py index 33e75cb2aa7..b2bee443d3b 100644 --- a/bddtests/peer/transaction_pb2.py +++ b/bddtests/peer/transaction_pb2.py @@ -23,7 +23,7 @@ name='peer/transaction.proto', package='protos', syntax='proto3', - serialized_pb=_b('\n\x16peer/transaction.proto\x12\x06protos\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cpeer/proposal_response.proto\x1a\x13\x63ommon/common.proto\"A\n\x11SignedTransaction\x12\x19\n\x11transaction_bytes\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"]\n\x14ProcessedTransaction\x12-\n\x13transactionEnvelope\x18\x01 \x01(\x0b\x32\x10.common.Envelope\x12\x16\n\x0evalidationCode\x18\x02 \x01(\x05\"9\n\x0bTransaction\x12*\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x19.protos.TransactionAction\"4\n\x11TransactionAction\x12\x0e\n\x06header\x18\x01 \x01(\x0c\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\"m\n\x16\x43haincodeActionPayload\x12\"\n\x1a\x63haincode_proposal_payload\x18\x01 \x01(\x0c\x12/\n\x06\x61\x63tion\x18\x02 \x01(\x0b\x32\x1f.protos.ChaincodeEndorsedAction\"g\n\x17\x43haincodeEndorsedAction\x12!\n\x19proposal_response_payload\x18\x01 \x01(\x0c\x12)\n\x0c\x65ndorsements\x18\x02 \x03(\x0b\x32\x13.protos.Endorsement*\xc2\x03\n\x10TxValidationCode\x12\t\n\x05VALID\x10\x00\x12\x10\n\x0cNIL_ENVELOPE\x10\x01\x12\x0f\n\x0b\x42\x41\x44_PAYLOAD\x10\x02\x12\x15\n\x11\x42\x41\x44_COMMON_HEADER\x10\x03\x12\x19\n\x15\x42\x41\x44_CREATOR_SIGNATURE\x10\x04\x12 \n\x1cINVALID_ENDORSER_TRANSACTION\x10\x05\x12\x1e\n\x1aINVALID_CONFIG_TRANSACTION\x10\x06\x12\x1a\n\x16UNSUPPORTED_TX_PAYLOAD\x10\x07\x12\x15\n\x11\x42\x41\x44_PROPOSAL_TXID\x10\x08\x12\x12\n\x0e\x44UPLICATE_TXID\x10\t\x12\x1e\n\x1a\x45NDORSEMENT_POLICY_FAILURE\x10\n\x12\x16\n\x12MVCC_READ_CONFLICT\x10\x0b\x12\x19\n\x15PHANTOM_READ_CONFLICT\x10\x0c\x12\x13\n\x0fUNKNOWN_TX_TYPE\x10\r\x12\x1a\n\x16TARGET_CHAIN_NOT_FOUND\x10\x0e\x12\x14\n\x10MARSHAL_TX_ERROR\x10\x0f\x12\x10\n\x0cNIL_TXACTION\x10\x10\x12\x19\n\x14INVALID_OTHER_REASON\x10\xff\x01\x42+Z)github.com/hyperledger/fabric/protos/peerb\x06proto3') + serialized_pb=_b('\n\x16peer/transaction.proto\x12\x06protos\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cpeer/proposal_response.proto\x1a\x13\x63ommon/common.proto\"A\n\x11SignedTransaction\x12\x19\n\x11transaction_bytes\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\"]\n\x14ProcessedTransaction\x12-\n\x13transactionEnvelope\x18\x01 \x01(\x0b\x32\x10.common.Envelope\x12\x16\n\x0evalidationCode\x18\x02 \x01(\x05\"9\n\x0bTransaction\x12*\n\x07\x61\x63tions\x18\x01 \x03(\x0b\x32\x19.protos.TransactionAction\"4\n\x11TransactionAction\x12\x0e\n\x06header\x18\x01 \x01(\x0c\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\"m\n\x16\x43haincodeActionPayload\x12\"\n\x1a\x63haincode_proposal_payload\x18\x01 \x01(\x0c\x12/\n\x06\x61\x63tion\x18\x02 \x01(\x0b\x32\x1f.protos.ChaincodeEndorsedAction\"g\n\x17\x43haincodeEndorsedAction\x12!\n\x19proposal_response_payload\x18\x01 \x01(\x0c\x12)\n\x0c\x65ndorsements\x18\x02 \x03(\x0b\x32\x13.protos.Endorsement*\xc2\x03\n\x10TxValidationCode\x12\t\n\x05VALID\x10\x00\x12\x10\n\x0cNIL_ENVELOPE\x10\x01\x12\x0f\n\x0b\x42\x41\x44_PAYLOAD\x10\x02\x12\x15\n\x11\x42\x41\x44_COMMON_HEADER\x10\x03\x12\x19\n\x15\x42\x41\x44_CREATOR_SIGNATURE\x10\x04\x12 \n\x1cINVALID_ENDORSER_TRANSACTION\x10\x05\x12\x1e\n\x1aINVALID_CONFIG_TRANSACTION\x10\x06\x12\x1a\n\x16UNSUPPORTED_TX_PAYLOAD\x10\x07\x12\x15\n\x11\x42\x41\x44_PROPOSAL_TXID\x10\x08\x12\x12\n\x0e\x44UPLICATE_TXID\x10\t\x12\x1e\n\x1a\x45NDORSEMENT_POLICY_FAILURE\x10\n\x12\x16\n\x12MVCC_READ_CONFLICT\x10\x0b\x12\x19\n\x15PHANTOM_READ_CONFLICT\x10\x0c\x12\x13\n\x0fUNKNOWN_TX_TYPE\x10\r\x12\x1a\n\x16TARGET_CHAIN_NOT_FOUND\x10\x0e\x12\x14\n\x10MARSHAL_TX_ERROR\x10\x0f\x12\x10\n\x0cNIL_TXACTION\x10\x10\x12\x19\n\x14INVALID_OTHER_REASON\x10\xff\x01\x42\x63\n\"org.hyperledger.fabric.protos.peerB\x12TransactionPackageZ)github.com/hyperledger/fabric/protos/peerb\x06proto3') , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,peer_dot_proposal__response__pb2.DESCRIPTOR,common_dot_common__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -412,7 +412,7 @@ DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z)github.com/hyperledger/fabric/protos/peer')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\"org.hyperledger.fabric.protos.peerB\022TransactionPackageZ)github.com/hyperledger/fabric/protos/peer')) try: # THESE ELEMENTS WILL BE DEPRECATED. # Please use the generated *_pb2_grpc.py files instead. diff --git a/bddtests/peer/transaction_pb2_grpc.py b/bddtests/peer/transaction_pb2_grpc.py index c374a4d7d5b..d5557c12314 100644 --- a/bddtests/peer/transaction_pb2_grpc.py +++ b/bddtests/peer/transaction_pb2_grpc.py @@ -1,3 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! import grpc from grpc.framework.common import cardinality from grpc.framework.interfaces.face import utilities as face_utilities diff --git a/bddtests/server_admin_pb2.py b/bddtests/server_admin_pb2.py deleted file mode 100644 index d042955bf5b..00000000000 --- a/bddtests/server_admin_pb2.py +++ /dev/null @@ -1,195 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: server_admin.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='server_admin.proto', - package='protos', - syntax='proto3', - serialized_pb=_b('\n\x12server_admin.proto\x12\x06protos\x1a\x1bgoogle/protobuf/empty.proto\"\x9a\x01\n\x0cServerStatus\x12/\n\x06status\x18\x01 \x01(\x0e\x32\x1f.protos.ServerStatus.StatusCode\"Y\n\nStatusCode\x12\r\n\tUNDEFINED\x10\x00\x12\x0b\n\x07STARTED\x10\x01\x12\x0b\n\x07STOPPED\x10\x02\x12\n\n\x06PAUSED\x10\x03\x12\t\n\x05\x45RROR\x10\x04\x12\x0b\n\x07UNKNOWN\x10\x05\x32\xc1\x01\n\x05\x41\x64min\x12;\n\tGetStatus\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12=\n\x0bStartServer\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x12<\n\nStopServer\x12\x16.google.protobuf.Empty\x1a\x14.protos.ServerStatus\"\x00\x62\x06proto3') - , - dependencies=[google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,]) -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - - - -_SERVERSTATUS_STATUSCODE = _descriptor.EnumDescriptor( - name='StatusCode', - full_name='protos.ServerStatus.StatusCode', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='UNDEFINED', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='STARTED', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='STOPPED', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='PAUSED', index=3, number=3, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ERROR', index=4, number=4, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='UNKNOWN', index=5, number=5, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=125, - serialized_end=214, -) -_sym_db.RegisterEnumDescriptor(_SERVERSTATUS_STATUSCODE) - - -_SERVERSTATUS = _descriptor.Descriptor( - name='ServerStatus', - full_name='protos.ServerStatus', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='protos.ServerStatus.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _SERVERSTATUS_STATUSCODE, - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=60, - serialized_end=214, -) - -_SERVERSTATUS.fields_by_name['status'].enum_type = _SERVERSTATUS_STATUSCODE -_SERVERSTATUS_STATUSCODE.containing_type = _SERVERSTATUS -DESCRIPTOR.message_types_by_name['ServerStatus'] = _SERVERSTATUS - -ServerStatus = _reflection.GeneratedProtocolMessageType('ServerStatus', (_message.Message,), dict( - DESCRIPTOR = _SERVERSTATUS, - __module__ = 'server_admin_pb2' - # @@protoc_insertion_point(class_scope:protos.ServerStatus) - )) -_sym_db.RegisterMessage(ServerStatus) - - -import abc -import six -from grpc.beta import implementations as beta_implementations -from grpc.beta import interfaces as beta_interfaces -from grpc.framework.common import cardinality -from grpc.framework.interfaces.face import utilities as face_utilities - -class BetaAdminServicer(object): - """Interface exported by the server. - """ - def GetStatus(self, request, context): - """Return the serve status. - """ - context.code(beta_interfaces.StatusCode.UNIMPLEMENTED) - def StartServer(self, request, context): - context.code(beta_interfaces.StatusCode.UNIMPLEMENTED) - def StopServer(self, request, context): - context.code(beta_interfaces.StatusCode.UNIMPLEMENTED) - -class BetaAdminStub(object): - """Interface exported by the server. - """ - def GetStatus(self, request, timeout): - """Return the serve status. - """ - raise NotImplementedError() - GetStatus.future = None - def StartServer(self, request, timeout): - raise NotImplementedError() - StartServer.future = None - def StopServer(self, request, timeout): - raise NotImplementedError() - StopServer.future = None - -def beta_create_Admin_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): - import google.protobuf.empty_pb2 - import server_admin_pb2 - import google.protobuf.empty_pb2 - import server_admin_pb2 - import google.protobuf.empty_pb2 - import server_admin_pb2 - request_deserializers = { - ('protos.Admin', 'GetStatus'): google.protobuf.empty_pb2.Empty.FromString, - ('protos.Admin', 'StartServer'): google.protobuf.empty_pb2.Empty.FromString, - ('protos.Admin', 'StopServer'): google.protobuf.empty_pb2.Empty.FromString, - } - response_serializers = { - ('protos.Admin', 'GetStatus'): server_admin_pb2.ServerStatus.SerializeToString, - ('protos.Admin', 'StartServer'): server_admin_pb2.ServerStatus.SerializeToString, - ('protos.Admin', 'StopServer'): server_admin_pb2.ServerStatus.SerializeToString, - } - method_implementations = { - ('protos.Admin', 'GetStatus'): face_utilities.unary_unary_inline(servicer.GetStatus), - ('protos.Admin', 'StartServer'): face_utilities.unary_unary_inline(servicer.StartServer), - ('protos.Admin', 'StopServer'): face_utilities.unary_unary_inline(servicer.StopServer), - } - server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) - return beta_implementations.server(method_implementations, options=server_options) - -def beta_create_Admin_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): - import google.protobuf.empty_pb2 - import server_admin_pb2 - import google.protobuf.empty_pb2 - import server_admin_pb2 - import google.protobuf.empty_pb2 - import server_admin_pb2 - request_serializers = { - ('protos.Admin', 'GetStatus'): google.protobuf.empty_pb2.Empty.SerializeToString, - ('protos.Admin', 'StartServer'): google.protobuf.empty_pb2.Empty.SerializeToString, - ('protos.Admin', 'StopServer'): google.protobuf.empty_pb2.Empty.SerializeToString, - } - response_deserializers = { - ('protos.Admin', 'GetStatus'): server_admin_pb2.ServerStatus.FromString, - ('protos.Admin', 'StartServer'): server_admin_pb2.ServerStatus.FromString, - ('protos.Admin', 'StopServer'): server_admin_pb2.ServerStatus.FromString, - } - cardinalities = { - 'GetStatus': cardinality.Cardinality.UNARY_UNARY, - 'StartServer': cardinality.Cardinality.UNARY_UNARY, - 'StopServer': cardinality.Cardinality.UNARY_UNARY, - } - stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) - return beta_implementations.dynamic_stub(channel, 'protos.Admin', cardinalities, options=stub_options) -# @@protoc_insertion_point(module_scope) diff --git a/bddtests/steps/bootstrap_util.py b/bddtests/steps/bootstrap_util.py index e9bf28d14a5..ffb245484f2 100644 --- a/bddtests/steps/bootstrap_util.py +++ b/bddtests/steps/bootstrap_util.py @@ -34,7 +34,7 @@ from common import configtx_pb2 as common_dot_configtx_pb2 from common import configuration_pb2 as common_dot_configuration_pb2 from common import policies_pb2 as common_dot_policies_pb2 -from msp import mspconfig_pb2, msp_principal_pb2, identities_pb2 +from msp import msp_config_pb2, msp_principal_pb2, identities_pb2 from peer import configuration_pb2 as peer_dot_configuration_pb2 from orderer import configuration_pb2 as orderer_dot_configuration_pb2 import orderer_util @@ -243,8 +243,8 @@ def getMSPConfig(self): # Currently only 1 component, CN= # name = self.getSelfSignedCert().get_subject().getComponents()[0][1] name = self.name - fabricMSPConfig = mspconfig_pb2.FabricMSPConfig(admins=adminCerts, root_certs=cacerts, name=name) - mspConfig = mspconfig_pb2.MSPConfig(config=fabricMSPConfig.SerializeToString(), type=0) + fabricMSPConfig = msp_config_pb2.FabricMSPConfig(admins=adminCerts, root_certs=cacerts, name=name) + mspConfig = msp_config_pb2.MSPConfig(config=fabricMSPConfig.SerializeToString(), type=0) return mspConfig def isInNetwork(self, network): diff --git a/core/chaincode/shim/java/build.gradle b/core/chaincode/shim/java/build.gradle index 6d2c0146ba6..76a1fe207b1 100644 --- a/core/chaincode/shim/java/build.gradle +++ b/core/chaincode/shim/java/build.gradle @@ -91,9 +91,9 @@ task copyToLib(type: Copy) { task copyProtos(type:Copy){ from ("${rootDir}/protos/peer"){ - include '**/chaincodeevent.proto' + include '**/chaincode_event.proto' include '**/chaincode.proto' - include '**/chaincodeshim.proto' + include '**/chaincode_shim.proto' include '**/proposal.proto' include '**/proposal_response.proto' } diff --git a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeBase.java b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeBase.java index 7b484b48aca..9a9d4da9828 100644 --- a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeBase.java +++ b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeBase.java @@ -25,11 +25,11 @@ import org.apache.commons.cli.Options; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hyperledger.protos.Chaincode.ChaincodeID; -import org.hyperledger.protos.ChaincodeSupportGrpc; -import org.hyperledger.protos.ChaincodeSupportGrpc.ChaincodeSupportStub; -import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage; -import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage.Type; +import org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeID; +import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc; +import org.hyperledger.fabric.protos.peer.ChaincodeSupportGrpc.ChaincodeSupportStub; +import org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage; +import org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage.Type; import com.google.protobuf.ByteString; @@ -45,7 +45,7 @@ public abstract class ChaincodeBase { private static Log logger = LogFactory.getLog(ChaincodeBase.class); public abstract String run(ChaincodeStub stub, String function, String[] args); - public abstract String query(ChaincodeStub stub, String function, String[] args); +// public abstract String query(ChaincodeStub stub, String function, String[] args); public abstract String getChaincodeID(); public static final String DEFAULT_HOST = "127.0.0.1"; @@ -239,10 +239,6 @@ public ByteString runRaw(ChaincodeStub stub, String function, String[] args) { return null; } - public ByteString queryRaw(ChaincodeStub stub, String function, String[] args) { - return null; - } - protected ByteString runHelper(ChaincodeStub stub, String function, String[] args) { ByteString ret = runRaw(stub, function, args); if (ret == null) { @@ -251,12 +247,4 @@ protected ByteString runHelper(ChaincodeStub stub, String function, String[] arg } return ret; } - - protected ByteString queryHelper(ChaincodeStub stub, String function, String[] args) { - ByteString ret = queryRaw(stub, function, args); - if (ret == null) { - ret = ByteString.copyFromUtf8(query(stub, function, args)); - } - return ret; - } } diff --git a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeStub.java b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeStub.java index 49f6a2f0816..1d7f6237330 100644 --- a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeStub.java +++ b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeStub.java @@ -16,17 +16,16 @@ package org.hyperledger.java.shim; -import com.google.protobuf.ByteString; -import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hyperledger.protos.Chaincodeshim; - -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hyperledger.fabric.protos.peer.ChaincodeShim; + +import com.google.protobuf.ByteString; + //import static org.hyperledger.protos.TableProto.ColumnDefinition.Type.STRING; public class ChaincodeStub { @@ -102,7 +101,7 @@ public Map getStateByRange(String startKey, String endKey) { */ public Map getStateByRangeRaw(String startKey, String endKey) { Map map = new HashMap<>(); - for (Chaincodeshim.QueryStateKeyValue mapping : handler.handleGetStateByRange( + for (ChaincodeShim.QueryStateKeyValue mapping : handler.handleGetStateByRange( startKey, endKey, uuid).getKeysAndValuesList()) { map.put(mapping.getKey(), mapping.getValue()); } diff --git a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/Handler.java b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/Handler.java index c59104e19ba..05573da32ad 100644 --- a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/Handler.java +++ b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/Handler.java @@ -27,16 +27,17 @@ import org.hyperledger.java.fsm.exceptions.CancelledException; import org.hyperledger.java.fsm.exceptions.NoTransitionException; import org.hyperledger.java.helper.Channel; -import org.hyperledger.protos.Chaincode.*; -import org.hyperledger.protos.Chaincodeshim.*; -import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage.Builder; +import org.hyperledger.fabric.protos.peer.Chaincode.*; +import org.hyperledger.fabric.protos.peer.ChaincodeShim.*; +import org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage.Builder; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import static org.hyperledger.java.fsm.CallbackType.*; -import static org.hyperledger.protos.Chaincodeshim.ChaincodeMessage.Type.*; +import static org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage.Type.*; public class Handler { @@ -248,12 +249,12 @@ private String getFunction(List args) { } private String[] getParameters(List args) { - int size = (args.size() == 0) ? 0 : args.size() - 1; - String[] strArgs = new String[size]; - for(int i = 1; i < args.size(); ++i) { - strArgs[i-1] = args.get(i).toStringUtf8(); - } - return strArgs; + final ArrayList results = new ArrayList<>(); + // skip arg[0], that is the function name + for(int i = 1; i < args.size(); i++) { + results.add(args.get(i).toStringUtf8()); + } + return results.toArray(new String[results.size()]); } // enterInitState will initialize the chaincode if entering init from established. diff --git a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/NextStateInfo.java b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/NextStateInfo.java index 16fde9b80dc..3cd9ffcaca0 100644 --- a/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/NextStateInfo.java +++ b/core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/NextStateInfo.java @@ -16,7 +16,7 @@ package org.hyperledger.java.shim; -import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage; +import org.hyperledger.fabric.protos.peer.ChaincodeShim.ChaincodeMessage; public class NextStateInfo { diff --git a/examples/chaincode/java/SimpleSample/src/main/java/example/SimpleSample.java b/examples/chaincode/java/SimpleSample/src/main/java/example/SimpleSample.java index 9fcb3245b90..f00fdd010ae 100644 --- a/examples/chaincode/java/SimpleSample/src/main/java/example/SimpleSample.java +++ b/examples/chaincode/java/SimpleSample/src/main/java/example/SimpleSample.java @@ -16,6 +16,8 @@ package example; +import java.util.Arrays; + import org.hyperledger.java.shim.ChaincodeBase; import org.hyperledger.java.shim.ChaincodeStub; import org.apache.commons.logging.Log; @@ -32,16 +34,16 @@ public class SimpleSample extends ChaincodeBase { @Override public String run(ChaincodeStub stub, String function, String[] args) { - log.info("In run, function:"+function); - + log.info("In run, function: " + function + ", args: " + Arrays.toString(args)); + switch (function) { case "init": init(stub, function, args); break; case "transfer": - String re = transfer(stub, args); + String re = transfer(stub, args); System.out.println(re); - return re; + return re; case "put": for (int i = 0; i < args.length; i += 2) stub.putState(args[i], args[i + 1]); @@ -50,10 +52,12 @@ public String run(ChaincodeStub stub, String function, String[] args) { for (String arg : args) stub.delState(arg); break; - default: + case "query": + return query(stub, function, args); + default: return transfer(stub, args); } - + return null; } @@ -69,48 +73,48 @@ private String transfer(ChaincodeStub stub, String[] args) { String toAm=stub.getState(toName); String am =args[2]; int valFrom=0; - if (fromAm!=null&&!fromAm.isEmpty()){ + if (fromAm!=null&&!fromAm.isEmpty()){ try{ valFrom = Integer.parseInt(fromAm); }catch(NumberFormatException e ){ - System.out.println("{\"Error\":\"Expecting integer value for asset holding of "+fromName+" \"}"+e); - return "{\"Error\":\"Expecting integer value for asset holding of "+fromName+" \"}"; - } + System.out.println("{\"Error\":\"Expecting integer value for asset holding of "+fromName+" \"}"+e); + return "{\"Error\":\"Expecting integer value for asset holding of "+fromName+" \"}"; + } }else{ return "{\"Error\":\"Failed to get state for " +fromName + "\"}"; } int valTo=0; - if (toAm!=null&&!toAm.isEmpty()){ + if (toAm!=null&&!toAm.isEmpty()){ try{ valTo = Integer.parseInt(toAm); }catch(NumberFormatException e ){ e.printStackTrace(); - return "{\"Error\":\"Expecting integer value for asset holding of "+toName+" \"}"; - } + return "{\"Error\":\"Expecting integer value for asset holding of "+toName+" \"}"; + } }else{ return "{\"Error\":\"Failed to get state for " +toName + "\"}"; } - + int valA =0; try{ valA = Integer.parseInt(am); }catch(NumberFormatException e ){ e.printStackTrace(); return "{\"Error\":\"Expecting integer value for amount \"}"; - } + } if(valA>valFrom) return "{\"Error\":\"Insufficient asset holding value for requested transfer amount \"}"; valFrom = valFrom-valA; valTo = valTo+valA; System.out.println("Transfer "+fromName+">"+toName+" am='"+am+"' new values='"+valFrom+"','"+ valTo+"'"); stub.putState(fromName,""+ valFrom); - stub.putState(toName, ""+valTo); + stub.putState(toName, ""+valTo); System.out.println("Transfer complete"); return null; - + } public String init(ChaincodeStub stub, String function, String[] args) { @@ -121,15 +125,14 @@ public String init(ChaincodeStub stub, String function, String[] args) { int valA = Integer.parseInt(args[1]); int valB = Integer.parseInt(args[3]); stub.putState(args[0], args[1]); - stub.putState(args[2], args[3]); + stub.putState(args[2], args[3]); }catch(NumberFormatException e ){ return "{\"Error\":\"Expecting integer value for asset holding\"}"; - } + } return null; } - - @Override + public String query(ChaincodeStub stub, String function, String[] args) { if(args.length!=1){ return "{\"Error\":\"Incorrect number of arguments. Expecting name of the person to query\"}"; @@ -140,11 +143,11 @@ public String query(ChaincodeStub stub, String function, String[] args) { int valA = Integer.parseInt(am); return "{\"Name\":\"" + args[0] + "\",\"Amount\":\"" + am + "\"}"; }catch(NumberFormatException e ){ - return "{\"Error\":\"Expecting integer value for asset holding\"}"; + return "{\"Error\":\"Expecting integer value for asset holding\"}"; } }else{ return "{\"Error\":\"Failed to get state for " + args[0] + "\"}"; } - + } diff --git a/protos/common/common.pb.go b/protos/common/common.pb.go index cdfd8421541..2405a651bd5 100644 --- a/protos/common/common.pb.go +++ b/protos/common/common.pb.go @@ -387,60 +387,61 @@ func init() { func init() { proto.RegisterFile("common/common.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 870 bytes of a gzipped FileDescriptorProto + // 884 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x55, 0xdd, 0x6e, 0xe3, 0x44, - 0x14, 0xae, 0xe3, 0xfc, 0x34, 0xc7, 0x4d, 0x3b, 0x9d, 0x6c, 0x59, 0x53, 0x58, 0x6d, 0x64, 0xb4, - 0xa8, 0xb4, 0x22, 0x11, 0xe5, 0x06, 0x2e, 0x9d, 0x78, 0xd2, 0xb5, 0x36, 0x6b, 0x2f, 0x63, 0x67, - 0x11, 0xbb, 0x48, 0xd6, 0x24, 0x99, 0x26, 0x16, 0x89, 0x1d, 0xd9, 0x4e, 0xd5, 0xde, 0xf2, 0x00, - 0x08, 0x09, 0x6e, 0x79, 0x01, 0x9e, 0x84, 0xb7, 0xe0, 0x25, 0x90, 0xb8, 0x45, 0xf6, 0xd8, 0xde, - 0x24, 0xac, 0xb4, 0x57, 0x99, 0xef, 0x9c, 0xcf, 0xe7, 0x7c, 0xf3, 0x9d, 0x13, 0x1b, 0xda, 0xd3, - 0x70, 0xb5, 0x0a, 0x83, 0x9e, 0xf8, 0xe9, 0xae, 0xa3, 0x30, 0x09, 0x71, 0x5d, 0xa0, 0xf3, 0xa7, - 0xf3, 0x30, 0x9c, 0x2f, 0x79, 0x2f, 0x8b, 0x4e, 0x36, 0xb7, 0xbd, 0xc4, 0x5f, 0xf1, 0x38, 0x61, - 0xab, 0xb5, 0x20, 0x6a, 0x1a, 0xc0, 0x88, 0xc5, 0xc9, 0x20, 0x0c, 0x6e, 0xfd, 0x39, 0x7e, 0x04, - 0x35, 0x3f, 0x98, 0xf1, 0x7b, 0x55, 0xea, 0x48, 0x17, 0x55, 0x2a, 0x80, 0xf6, 0x16, 0x0e, 0x5f, - 0xf2, 0x84, 0xcd, 0x58, 0xc2, 0x52, 0xc6, 0x1d, 0x5b, 0x6e, 0x78, 0xc6, 0x38, 0xa2, 0x02, 0xe0, - 0x6f, 0x01, 0x62, 0x7f, 0x1e, 0xb0, 0x64, 0x13, 0xf1, 0x58, 0xad, 0x74, 0xe4, 0x0b, 0xe5, 0xfa, - 0xe3, 0x6e, 0xae, 0xa8, 0x78, 0xd6, 0x29, 0x18, 0x74, 0x8b, 0xac, 0xfd, 0x08, 0xa7, 0xff, 0x23, - 0xe0, 0x2f, 0x00, 0x95, 0x14, 0x6f, 0xc1, 0xd9, 0x8c, 0x47, 0x79, 0xc3, 0x93, 0x32, 0xfe, 0x3c, - 0x0b, 0xe3, 0x4f, 0xa1, 0x59, 0x86, 0xd4, 0x4a, 0xc6, 0x79, 0x17, 0xd0, 0xde, 0x40, 0x3d, 0xe7, - 0x3d, 0x83, 0xe3, 0xe9, 0x82, 0x05, 0x01, 0x5f, 0xee, 0x16, 0x6c, 0xe5, 0xd1, 0x9c, 0xf6, 0xbe, - 0xce, 0x95, 0xf7, 0x76, 0xd6, 0xfe, 0x96, 0xa0, 0x35, 0xd8, 0x79, 0x18, 0x43, 0x35, 0x79, 0x58, - 0x0b, 0x6f, 0x6a, 0x34, 0x3b, 0x63, 0x15, 0x1a, 0x77, 0x3c, 0x8a, 0xfd, 0x30, 0xc8, 0xea, 0xd4, - 0x68, 0x01, 0xf1, 0x37, 0xd0, 0x2c, 0xa7, 0xa1, 0xca, 0x1d, 0xe9, 0x42, 0xb9, 0x3e, 0xef, 0x8a, - 0x79, 0x75, 0x8b, 0x79, 0x75, 0xdd, 0x82, 0x41, 0xdf, 0x91, 0xf1, 0x13, 0x80, 0xe2, 0x2e, 0xfe, - 0x4c, 0xad, 0x76, 0xa4, 0x8b, 0x26, 0x6d, 0xe6, 0x11, 0x73, 0x86, 0xdb, 0x50, 0x4b, 0xee, 0xd3, - 0x4c, 0x2d, 0xcb, 0x54, 0x93, 0x7b, 0x73, 0x96, 0x0e, 0x8e, 0xaf, 0xc3, 0xe9, 0x42, 0xad, 0x8b, - 0xd1, 0x66, 0x20, 0x75, 0x8f, 0xdf, 0x27, 0x3c, 0xc8, 0xf4, 0x35, 0x84, 0x7b, 0x65, 0x40, 0xd3, - 0xe1, 0xc4, 0xd9, 0xb3, 0x5b, 0x85, 0xc6, 0x34, 0xe2, 0x2c, 0x09, 0x0b, 0xff, 0x0a, 0x98, 0x36, - 0x08, 0xc2, 0x60, 0x5a, 0x0c, 0x41, 0x00, 0x8d, 0x40, 0xe3, 0x15, 0x7b, 0x58, 0x86, 0x6c, 0x86, - 0x3f, 0x87, 0xfa, 0x96, 0xf3, 0xca, 0xf5, 0x71, 0xb1, 0x20, 0xa2, 0x34, 0xcd, 0xb3, 0xa9, 0x8b, - 0xe9, 0x36, 0xe4, 0x75, 0xb2, 0xb3, 0xd6, 0x87, 0x43, 0x12, 0xdc, 0xf1, 0x65, 0x28, 0x1c, 0x5d, - 0x8b, 0x92, 0x85, 0x84, 0x1c, 0x7e, 0x60, 0x17, 0x7e, 0x91, 0xa0, 0xd6, 0x5f, 0x86, 0xd3, 0x9f, - 0xf0, 0xd5, 0x9e, 0x92, 0x76, 0xa1, 0x24, 0x4b, 0xef, 0xc9, 0x79, 0xb6, 0x25, 0x47, 0xb9, 0x3e, - 0xdd, 0xa1, 0x1a, 0x2c, 0x61, 0x42, 0x21, 0xfe, 0x0a, 0x0e, 0x57, 0xf9, 0x1e, 0xe7, 0xc3, 0x3c, - 0xdb, 0xa1, 0x16, 0x4b, 0x4e, 0x4b, 0x9a, 0x36, 0x07, 0x65, 0xab, 0x21, 0xfe, 0x08, 0xea, 0xc1, - 0x66, 0x35, 0xc9, 0x55, 0x55, 0x69, 0x8e, 0xf0, 0x67, 0xd0, 0x5a, 0x47, 0xfc, 0xce, 0x0f, 0x37, - 0xb1, 0xb7, 0x60, 0xf1, 0x22, 0xbf, 0xd9, 0x51, 0x11, 0x7c, 0xce, 0xe2, 0x05, 0xfe, 0x04, 0x9a, - 0x69, 0x4d, 0x41, 0x90, 0x33, 0xc2, 0x61, 0x1a, 0x48, 0x93, 0xda, 0x53, 0x68, 0x96, 0x72, 0x4b, - 0x7b, 0xa5, 0x8e, 0x5c, 0xda, 0x7b, 0x05, 0xad, 0x1d, 0x91, 0xf8, 0x7c, 0xeb, 0x36, 0x82, 0x58, - 0xe2, 0xcb, 0x3f, 0x25, 0xa8, 0x3b, 0x09, 0x4b, 0x36, 0x31, 0x56, 0xa0, 0x31, 0xb6, 0x5e, 0x58, - 0xf6, 0xf7, 0x16, 0x3a, 0xc0, 0x47, 0xd0, 0x70, 0xc6, 0x83, 0x01, 0x71, 0x1c, 0xf4, 0x97, 0x84, - 0x11, 0x28, 0x7d, 0xdd, 0xf0, 0x28, 0xf9, 0x6e, 0x4c, 0x1c, 0x17, 0xfd, 0x2a, 0xe3, 0x63, 0x68, - 0x0e, 0x6d, 0xda, 0x37, 0x0d, 0x83, 0x58, 0xe8, 0xb7, 0x0c, 0x5b, 0xb6, 0xeb, 0x0d, 0xed, 0xb1, - 0x65, 0xa0, 0xdf, 0x65, 0xfc, 0x04, 0xd4, 0x9c, 0xed, 0x11, 0xcb, 0x35, 0xdd, 0x1f, 0x3c, 0xd7, - 0xb6, 0xbd, 0x91, 0x4e, 0x6f, 0x08, 0xfa, 0x43, 0xc6, 0xe7, 0x70, 0x66, 0x5a, 0x2e, 0xa1, 0x96, - 0x3e, 0xf2, 0x1c, 0x42, 0x5f, 0x13, 0xea, 0x11, 0x4a, 0x6d, 0x8a, 0xfe, 0x91, 0xb1, 0x0a, 0xed, - 0x34, 0x64, 0x0e, 0x88, 0x37, 0xb6, 0xf4, 0xd7, 0xba, 0x39, 0xd2, 0xfb, 0x23, 0x82, 0xfe, 0x95, - 0x2f, 0x7f, 0x96, 0x00, 0x84, 0xbf, 0x6e, 0xfa, 0x6f, 0x54, 0xa0, 0xf1, 0x92, 0x38, 0x8e, 0x7e, - 0x43, 0xd0, 0x01, 0x06, 0xa8, 0x0f, 0x6c, 0x6b, 0x68, 0xde, 0x20, 0x09, 0x9f, 0x42, 0x4b, 0x9c, - 0xbd, 0xf1, 0x2b, 0x43, 0x77, 0x09, 0xaa, 0x60, 0x15, 0x1e, 0x11, 0xcb, 0xb0, 0xa9, 0x43, 0xa8, - 0xe7, 0x52, 0xdd, 0x72, 0xf4, 0x81, 0x6b, 0xda, 0x16, 0x92, 0xf1, 0x63, 0x68, 0xdb, 0xd4, 0x20, - 0x74, 0x2f, 0x51, 0xc5, 0x67, 0x70, 0x6a, 0x90, 0x91, 0x99, 0x6a, 0x73, 0x08, 0x79, 0xe1, 0x99, - 0xd6, 0xd0, 0x46, 0xb5, 0xcb, 0xb7, 0x80, 0x77, 0xec, 0x35, 0xd3, 0xd7, 0x2a, 0x3e, 0x06, 0x70, - 0xcc, 0x1b, 0x4b, 0x77, 0xc7, 0x94, 0x38, 0xe8, 0x00, 0x9f, 0x80, 0x32, 0xd2, 0x1d, 0xd7, 0x2b, - 0x35, 0x3d, 0x86, 0xf6, 0x56, 0x79, 0xc7, 0x1b, 0x9a, 0x23, 0x97, 0x50, 0x54, 0x49, 0x6f, 0x91, - 0xf7, 0x47, 0x72, 0xff, 0xcb, 0x37, 0x57, 0x73, 0x3f, 0x59, 0x6c, 0x26, 0xe9, 0xba, 0xf5, 0x16, - 0x0f, 0x6b, 0x1e, 0x2d, 0xf9, 0x6c, 0xce, 0xa3, 0xde, 0x2d, 0x9b, 0x44, 0xfe, 0x54, 0xbc, 0xfb, - 0xe3, 0xfc, 0xfb, 0x30, 0xa9, 0x67, 0xf0, 0xeb, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xa7, - 0x76, 0x1e, 0x37, 0x06, 0x00, 0x00, + 0x14, 0xae, 0xeb, 0xfc, 0x34, 0x27, 0x4d, 0x3b, 0x9d, 0x6c, 0x59, 0x53, 0x58, 0x6d, 0x64, 0x58, + 0x54, 0x5a, 0x29, 0x11, 0xe5, 0x06, 0x2e, 0x9d, 0x64, 0xd2, 0xb5, 0x36, 0x6b, 0x2f, 0x33, 0xce, + 0x22, 0x76, 0x91, 0xac, 0x49, 0x32, 0x4d, 0x22, 0x12, 0x3b, 0xb2, 0x9d, 0xaa, 0xbd, 0xe5, 0x01, + 0x10, 0x12, 0xdc, 0xf2, 0x02, 0x3c, 0x09, 0x6f, 0xc1, 0x4b, 0x20, 0x71, 0x8b, 0xec, 0x19, 0x7b, + 0x93, 0xb2, 0xd2, 0x5e, 0x65, 0xbe, 0x73, 0x3e, 0x9f, 0xf3, 0xcd, 0x77, 0x4e, 0x6c, 0x68, 0x4e, + 0xc2, 0xd5, 0x2a, 0x0c, 0x3a, 0xf2, 0xa7, 0xbd, 0x8e, 0xc2, 0x24, 0xc4, 0x15, 0x89, 0xce, 0x9e, + 0xce, 0xc2, 0x70, 0xb6, 0x14, 0x9d, 0x2c, 0x3a, 0xde, 0xdc, 0x74, 0x92, 0xc5, 0x4a, 0xc4, 0x09, + 0x5f, 0xad, 0x25, 0xd1, 0x34, 0x01, 0x86, 0x3c, 0x4e, 0x7a, 0x61, 0x70, 0xb3, 0x98, 0xe1, 0x47, + 0x50, 0x5e, 0x04, 0x53, 0x71, 0x67, 0x68, 0x2d, 0xed, 0xbc, 0x44, 0x25, 0x30, 0xdf, 0xc2, 0xc1, + 0x4b, 0x91, 0xf0, 0x29, 0x4f, 0x78, 0xca, 0xb8, 0xe5, 0xcb, 0x8d, 0xc8, 0x18, 0x87, 0x54, 0x02, + 0xfc, 0x2d, 0x40, 0xbc, 0x98, 0x05, 0x3c, 0xd9, 0x44, 0x22, 0x36, 0xf6, 0x5b, 0xfa, 0x79, 0xfd, + 0xea, 0xe3, 0xb6, 0x52, 0x94, 0x3f, 0xcb, 0x72, 0x06, 0xdd, 0x22, 0x9b, 0x3f, 0xc2, 0xc9, 0xff, + 0x08, 0xf8, 0x4b, 0x40, 0x05, 0xc5, 0x9f, 0x0b, 0x3e, 0x15, 0x91, 0x6a, 0x78, 0x5c, 0xc4, 0x9f, + 0x67, 0x61, 0xfc, 0x29, 0xd4, 0x8a, 0x90, 0xb1, 0x9f, 0x71, 0xde, 0x05, 0xcc, 0x37, 0x50, 0x51, + 0xbc, 0x67, 0x70, 0x34, 0x99, 0xf3, 0x20, 0x10, 0xcb, 0xdd, 0x82, 0x0d, 0x15, 0x55, 0xb4, 0xf7, + 0x75, 0xde, 0x7f, 0x6f, 0x67, 0xf3, 0x6f, 0x0d, 0x1a, 0xbd, 0x9d, 0x87, 0x31, 0x94, 0x92, 0xfb, + 0xb5, 0xf4, 0xa6, 0x4c, 0xb3, 0x33, 0x36, 0xa0, 0x7a, 0x2b, 0xa2, 0x78, 0x11, 0x06, 0x59, 0x9d, + 0x32, 0xcd, 0x21, 0xfe, 0x06, 0x6a, 0xc5, 0x34, 0x0c, 0xbd, 0xa5, 0x9d, 0xd7, 0xaf, 0xce, 0xda, + 0x72, 0x5e, 0xed, 0x7c, 0x5e, 0x6d, 0x2f, 0x67, 0xd0, 0x77, 0x64, 0xfc, 0x04, 0x20, 0xbf, 0xcb, + 0x62, 0x6a, 0x94, 0x5a, 0xda, 0x79, 0x8d, 0xd6, 0x54, 0xc4, 0x9e, 0xe2, 0x26, 0x94, 0x93, 0xbb, + 0x34, 0x53, 0xce, 0x32, 0xa5, 0xe4, 0xce, 0x9e, 0xa6, 0x83, 0x13, 0xeb, 0x70, 0x32, 0x37, 0x2a, + 0x72, 0xb4, 0x19, 0x48, 0xdd, 0x13, 0x77, 0x89, 0x08, 0x32, 0x7d, 0x55, 0xe9, 0x5e, 0x11, 0x30, + 0x2d, 0x38, 0x66, 0x0f, 0xec, 0x36, 0xa0, 0x3a, 0x89, 0x04, 0x4f, 0xc2, 0xdc, 0xbf, 0x1c, 0xa6, + 0x0d, 0x82, 0x30, 0x98, 0xe4, 0x43, 0x90, 0xc0, 0x24, 0x50, 0x7d, 0xc5, 0xef, 0x97, 0x21, 0x9f, + 0xe2, 0x2f, 0xa0, 0xb2, 0xe5, 0x7c, 0xfd, 0xea, 0x28, 0x5f, 0x10, 0x59, 0x9a, 0xaa, 0x6c, 0xea, + 0x62, 0xba, 0x0d, 0xaa, 0x4e, 0x76, 0x36, 0xbb, 0x70, 0x40, 0x82, 0x5b, 0xb1, 0x0c, 0xa5, 0xa3, + 0x6b, 0x59, 0x32, 0x97, 0xa0, 0xe0, 0x07, 0x76, 0xe1, 0x17, 0x0d, 0xca, 0xdd, 0x65, 0x38, 0xf9, + 0x09, 0x5f, 0x3e, 0x50, 0xd2, 0xcc, 0x95, 0x64, 0xe9, 0x07, 0x72, 0x9e, 0x6d, 0xc9, 0xa9, 0x5f, + 0x9d, 0xec, 0x50, 0xfb, 0x3c, 0xe1, 0x52, 0x21, 0xfe, 0x0a, 0x0e, 0x56, 0x6a, 0x8f, 0xd5, 0x30, + 0x4f, 0x77, 0xa8, 0xf9, 0x92, 0xd3, 0x82, 0x66, 0xce, 0xa0, 0xbe, 0xd5, 0x10, 0x7f, 0x04, 0x95, + 0x60, 0xb3, 0x1a, 0x2b, 0x55, 0x25, 0xaa, 0x10, 0xfe, 0x0c, 0x1a, 0xeb, 0x48, 0xdc, 0x2e, 0xc2, + 0x4d, 0xec, 0xcf, 0x79, 0x3c, 0x57, 0x37, 0x3b, 0xcc, 0x83, 0xcf, 0x79, 0x3c, 0xc7, 0x9f, 0x40, + 0x2d, 0xad, 0x29, 0x09, 0x7a, 0x46, 0x38, 0x48, 0x03, 0x69, 0xd2, 0x7c, 0x0a, 0xb5, 0x42, 0x6e, + 0x61, 0xaf, 0xd6, 0xd2, 0x0b, 0x7b, 0x2f, 0xa1, 0xb1, 0x23, 0x12, 0x9f, 0x6d, 0xdd, 0x46, 0x12, + 0x0b, 0x7c, 0xf1, 0xa7, 0x06, 0x15, 0x96, 0xf0, 0x64, 0x13, 0xe3, 0x3a, 0x54, 0x47, 0xce, 0x0b, + 0xc7, 0xfd, 0xde, 0x41, 0x7b, 0xf8, 0x10, 0xaa, 0x6c, 0xd4, 0xeb, 0x11, 0xc6, 0xd0, 0x5f, 0x1a, + 0x46, 0x50, 0xef, 0x5a, 0x7d, 0x9f, 0x92, 0xef, 0x46, 0x84, 0x79, 0xe8, 0x57, 0x1d, 0x1f, 0x41, + 0x6d, 0xe0, 0xd2, 0xae, 0xdd, 0xef, 0x13, 0x07, 0xfd, 0x96, 0x61, 0xc7, 0xf5, 0xfc, 0x81, 0x3b, + 0x72, 0xfa, 0xe8, 0x77, 0x1d, 0x3f, 0x01, 0x43, 0xb1, 0x7d, 0xe2, 0x78, 0xb6, 0xf7, 0x83, 0xef, + 0xb9, 0xae, 0x3f, 0xb4, 0xe8, 0x35, 0x41, 0x7f, 0xe8, 0xf8, 0x0c, 0x4e, 0x6d, 0xc7, 0x23, 0xd4, + 0xb1, 0x86, 0x3e, 0x23, 0xf4, 0x35, 0xa1, 0x3e, 0xa1, 0xd4, 0xa5, 0xe8, 0x1f, 0x1d, 0x1b, 0xd0, + 0x4c, 0x43, 0x76, 0x8f, 0xf8, 0x23, 0xc7, 0x7a, 0x6d, 0xd9, 0x43, 0xab, 0x3b, 0x24, 0xe8, 0x5f, + 0xfd, 0xe2, 0x67, 0x0d, 0x40, 0xfa, 0xeb, 0xa5, 0xff, 0xc6, 0x3a, 0x54, 0x5f, 0x12, 0xc6, 0xac, + 0x6b, 0x82, 0xf6, 0x30, 0x40, 0xa5, 0xe7, 0x3a, 0x03, 0xfb, 0x1a, 0x69, 0xf8, 0x04, 0x1a, 0xf2, + 0xec, 0x8f, 0x5e, 0xf5, 0x2d, 0x8f, 0xa0, 0x7d, 0x6c, 0xc0, 0x23, 0xe2, 0xf4, 0x5d, 0xca, 0x08, + 0xf5, 0x3d, 0x6a, 0x39, 0xcc, 0xea, 0x79, 0xb6, 0xeb, 0x20, 0x1d, 0x3f, 0x86, 0xa6, 0x4b, 0xfb, + 0x84, 0x3e, 0x48, 0x94, 0xf0, 0x29, 0x9c, 0xf4, 0xc9, 0xd0, 0x4e, 0xb5, 0x31, 0x42, 0x5e, 0xf8, + 0xb6, 0x33, 0x70, 0x51, 0xf9, 0xe2, 0x2d, 0xe0, 0x1d, 0x7b, 0xed, 0xf4, 0xb5, 0x8a, 0x8f, 0x00, + 0x98, 0x7d, 0xed, 0x58, 0xde, 0x88, 0x12, 0x86, 0xf6, 0xf0, 0x31, 0xd4, 0x87, 0x16, 0xf3, 0xfc, + 0x42, 0xd3, 0x63, 0x68, 0x6e, 0x95, 0x67, 0xfe, 0xc0, 0x1e, 0x7a, 0x84, 0xa2, 0xfd, 0xf4, 0x16, + 0xaa, 0x3f, 0xd2, 0xbb, 0x0c, 0x3e, 0x0f, 0xa3, 0x59, 0x7b, 0x7e, 0xbf, 0x16, 0xd1, 0x52, 0x4c, + 0x67, 0x22, 0x6a, 0xdf, 0xf0, 0x71, 0xb4, 0x98, 0xc8, 0x97, 0x48, 0xac, 0xb6, 0xf0, 0xcd, 0xe5, + 0x6c, 0x91, 0xcc, 0x37, 0xe3, 0x14, 0x76, 0xb6, 0xc8, 0x1d, 0x49, 0x96, 0x5f, 0x88, 0x58, 0x7d, + 0x45, 0xc6, 0x95, 0x0c, 0x7e, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x43, 0x62, 0xd7, + 0x5d, 0x06, 0x00, 0x00, } diff --git a/protos/common/common.proto b/protos/common/common.proto index 01f8423102d..97aa27792ea 100644 --- a/protos/common/common.proto +++ b/protos/common/common.proto @@ -19,6 +19,7 @@ syntax = "proto3"; import "google/protobuf/timestamp.proto"; option go_package = "github.com/hyperledger/fabric/protos/common"; +option java_package = "org.hyperledger.fabric.protos.common"; package common; diff --git a/protos/common/configtx.pb.go b/protos/common/configtx.pb.go index a3858f2fe75..4aa9b6d425e 100644 --- a/protos/common/configtx.pb.go +++ b/protos/common/configtx.pb.go @@ -267,47 +267,48 @@ func init() { func init() { proto.RegisterFile("common/configtx.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 663 bytes of a gzipped FileDescriptorProto + // 674 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x55, 0xdb, 0x6e, 0xd3, 0x40, - 0x10, 0x55, 0xe2, 0xd6, 0x4d, 0x26, 0xe9, 0x85, 0x4d, 0x10, 0xc6, 0x02, 0x51, 0x8c, 0x28, 0x2d, - 0x88, 0xa4, 0x94, 0x87, 0x54, 0x48, 0x7d, 0xa1, 0xaa, 0x80, 0x97, 0x0a, 0x1c, 0x2e, 0x52, 0x85, - 0x88, 0x1c, 0x7b, 0x9b, 0x58, 0x75, 0xbc, 0xc6, 0x5e, 0x07, 0xf2, 0x15, 0x7c, 0x20, 0x7f, 0xc0, - 0x57, 0x20, 0xef, 0xc5, 0xac, 0x13, 0x27, 0x11, 0x4f, 0xc9, 0xcc, 0x9c, 0x73, 0x66, 0x77, 0x76, - 0x8e, 0x0c, 0xb7, 0x5d, 0x32, 0x99, 0x90, 0xb0, 0xeb, 0x92, 0xf0, 0xda, 0x1f, 0xd1, 0x9f, 0x9d, - 0x28, 0x26, 0x94, 0x20, 0x9d, 0xa7, 0xcd, 0x56, 0x5e, 0xce, 0x7e, 0x78, 0xd1, 0x94, 0x9c, 0x88, - 0x04, 0xbe, 0xeb, 0xe3, 0x84, 0xa7, 0xad, 0x1b, 0xd8, 0x39, 0x67, 0x2a, 0x17, 0xe1, 0x14, 0x07, - 0x24, 0xc2, 0xe8, 0x00, 0x74, 0xae, 0x6b, 0x54, 0xf6, 0x2b, 0x87, 0x8d, 0x93, 0x9d, 0x8e, 0xd0, - 0xe1, 0x38, 0x5b, 0x54, 0xd1, 0x0b, 0x68, 0x04, 0x4e, 0x42, 0x07, 0x69, 0xe4, 0x39, 0x14, 0x1b, - 0x55, 0x06, 0xde, 0x93, 0x60, 0x29, 0x67, 0x43, 0x06, 0xfa, 0xc4, 0x30, 0xd6, 0x6f, 0x0d, 0x6e, - 0x71, 0x95, 0x37, 0x31, 0x49, 0xa3, 0xbe, 0x3b, 0xc6, 0x13, 0x07, 0x9d, 0x81, 0x3e, 0xca, 0xc2, - 0xc4, 0xa8, 0xec, 0x6b, 0x87, 0x8d, 0x93, 0xc7, 0xc5, 0x86, 0x0a, 0xb4, 0xc3, 0xfe, 0x27, 0x17, - 0x21, 0x8d, 0x67, 0xb6, 0x20, 0x65, 0xf4, 0xa9, 0x13, 0xa4, 0x38, 0x31, 0xaa, 0xeb, 0xe8, 0x9f, - 0x19, 0x4e, 0xd0, 0x39, 0x09, 0x9d, 0x43, 0x4d, 0x8e, 0xc4, 0xd0, 0x98, 0xc0, 0x93, 0xe5, 0x02, - 0xef, 0x05, 0x92, 0x4b, 0xe4, 0x44, 0xf3, 0x23, 0x34, 0x94, 0xa3, 0xa1, 0x3d, 0xd0, 0x6e, 0xf0, - 0x8c, 0xcd, 0xaf, 0x6e, 0x67, 0x7f, 0x51, 0x17, 0x36, 0x59, 0x3f, 0x31, 0xa6, 0xbb, 0x4b, 0x5b, - 0xd8, 0x1c, 0xf7, 0xaa, 0x7a, 0x5a, 0xc9, 0x54, 0x95, 0x13, 0xff, 0xb7, 0x2a, 0xe3, 0x2e, 0xaa, - 0x7e, 0x81, 0xed, 0xc2, 0x35, 0x4a, 0x74, 0x8f, 0x8b, 0xba, 0x66, 0x51, 0x97, 0xb1, 0x67, 0x0b, - 0xc2, 0x56, 0x4b, 0x3e, 0xae, 0xd2, 0xd8, 0x6a, 0x03, 0x5a, 0x64, 0x59, 0xdf, 0x40, 0xe7, 0x59, - 0x64, 0x42, 0x2d, 0xc1, 0xdf, 0x53, 0x1c, 0xba, 0x98, 0x9d, 0x60, 0xc3, 0xce, 0x63, 0x74, 0x0a, - 0xdb, 0xee, 0xd8, 0x09, 0x43, 0x1c, 0x0c, 0xd8, 0x5b, 0x8b, 0xe3, 0xb4, 0x4a, 0x86, 0x67, 0x37, - 0x05, 0x92, 0x45, 0x16, 0x85, 0x36, 0x2f, 0xf2, 0xc5, 0xcb, 0x77, 0xfb, 0x11, 0x6c, 0xf3, 0xed, - 0x95, 0x5b, 0x9b, 0xb5, 0x6c, 0xda, 0x4d, 0x57, 0x01, 0xa3, 0x1e, 0x40, 0xe2, 0x8f, 0x42, 0x87, - 0xa6, 0x71, 0xbe, 0x54, 0x77, 0x8a, 0x3d, 0xfb, 0xb2, 0x6e, 0x2b, 0x50, 0xeb, 0x57, 0x05, 0x9a, - 0x6a, 0x5b, 0x74, 0x1f, 0x40, 0x5e, 0xc0, 0xf7, 0xc4, 0x80, 0xeb, 0x22, 0xf3, 0xce, 0x43, 0x1d, - 0xa8, 0xc5, 0xd8, 0xf1, 0x06, 0x09, 0xa6, 0xab, 0xae, 0xb6, 0x95, 0x81, 0xfa, 0x98, 0xa2, 0x63, - 0xa8, 0xff, 0x88, 0x7d, 0x8a, 0x19, 0x41, 0x5b, 0x4e, 0xa8, 0x31, 0x54, 0x1f, 0x53, 0xeb, 0x8f, - 0x06, 0x0d, 0xa5, 0x82, 0x0c, 0xd8, 0x9a, 0xe2, 0x38, 0xf1, 0x49, 0x28, 0x86, 0x2d, 0x43, 0xd4, - 0xcb, 0x4d, 0xc8, 0x2f, 0xfc, 0xa0, 0x44, 0xb8, 0xd4, 0x7e, 0xbd, 0xdc, 0x7e, 0xda, 0x72, 0x62, - 0x99, 0xf1, 0xce, 0x14, 0xe3, 0x6d, 0x30, 0xea, 0xc3, 0x32, 0xea, 0x12, 0xcb, 0x65, 0xb3, 0x9d, - 0x10, 0x6f, 0xc0, 0xe2, 0x99, 0xb1, 0xc9, 0x67, 0x3b, 0x21, 0x1e, 0xdf, 0x33, 0xf3, 0x72, 0x9d, - 0x23, 0x8f, 0x8a, 0x3b, 0x5e, 0x3a, 0x48, 0xc5, 0x35, 0x97, 0xeb, 0xbc, 0xb8, 0x5a, 0x8f, 0x71, - 0x55, 0xbd, 0x0f, 0xeb, 0x5d, 0xf8, 0xb4, 0xa8, 0xd8, 0x2e, 0x73, 0xa1, 0xea, 0xbf, 0xaf, 0xf2, - 0xad, 0x59, 0xb3, 0x15, 0x6f, 0xdd, 0x56, 0x85, 0x9b, 0x42, 0x62, 0x6e, 0xa0, 0xda, 0xdc, 0x40, - 0x2d, 0x22, 0x77, 0x9b, 0xc7, 0x2b, 0xe4, 0x0f, 0x40, 0x17, 0x22, 0xd5, 0xe2, 0x07, 0x44, 0x1c, - 0x59, 0x54, 0xd7, 0x35, 0xbc, 0x82, 0xdd, 0x39, 0xb3, 0xa1, 0x23, 0xd8, 0xcb, 0xed, 0x36, 0x18, - 0x63, 0xc7, 0xc3, 0xb1, 0x70, 0xf0, 0x6e, 0x9e, 0x7f, 0xcb, 0xd2, 0xe8, 0x1e, 0xd4, 0xf3, 0x94, - 0xb8, 0xe7, 0xbf, 0xc4, 0xeb, 0xe7, 0x57, 0xcf, 0x46, 0x3e, 0x1d, 0xa7, 0xc3, 0xec, 0x68, 0xdd, - 0xf1, 0x2c, 0xc2, 0x71, 0x80, 0xbd, 0x11, 0x8e, 0xbb, 0xd7, 0xce, 0x30, 0xf6, 0xdd, 0x2e, 0xfb, - 0x38, 0x26, 0xe2, 0x0b, 0x3a, 0xd4, 0x59, 0xf8, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, - 0xff, 0x85, 0xc2, 0x78, 0x07, 0x00, 0x00, + 0x10, 0x55, 0xe2, 0xd6, 0x4d, 0x26, 0xe9, 0x85, 0x6d, 0x10, 0xc6, 0x02, 0x51, 0x0c, 0x94, 0x16, + 0x24, 0xa7, 0x94, 0x87, 0x56, 0x48, 0x7d, 0xa1, 0xaa, 0x80, 0x97, 0x0a, 0x1c, 0x2e, 0x52, 0x85, + 0x88, 0x5c, 0x7b, 0xeb, 0x58, 0x75, 0xbc, 0x66, 0xbd, 0x2e, 0xe4, 0x2b, 0xf8, 0x40, 0xfe, 0x80, + 0xaf, 0x40, 0xde, 0x5d, 0x9b, 0x75, 0xe2, 0x24, 0xe2, 0x29, 0x99, 0x99, 0x73, 0xce, 0xec, 0xce, + 0xce, 0x91, 0xe1, 0xb6, 0x47, 0xc6, 0x63, 0x12, 0xf7, 0x3d, 0x12, 0x5f, 0x85, 0x01, 0xfb, 0x69, + 0x27, 0x94, 0x30, 0x82, 0x74, 0x91, 0x36, 0xb7, 0xcb, 0x72, 0xfe, 0x23, 0x8a, 0x66, 0xc1, 0x49, + 0x48, 0x14, 0x7a, 0x21, 0x4e, 0x45, 0xda, 0xba, 0x86, 0x8d, 0x53, 0xae, 0x72, 0x16, 0xdf, 0xe0, + 0x88, 0x24, 0x18, 0xed, 0x82, 0x2e, 0x74, 0x8d, 0xc6, 0x4e, 0x63, 0xaf, 0x73, 0xb8, 0x61, 0x4b, + 0x1d, 0x81, 0x73, 0x64, 0x15, 0xbd, 0x80, 0x4e, 0xe4, 0xa6, 0x6c, 0x98, 0x25, 0xbe, 0xcb, 0xb0, + 0xd1, 0xe4, 0xe0, 0xad, 0x02, 0x5c, 0xc8, 0x39, 0x90, 0x83, 0x3e, 0x71, 0x8c, 0xf5, 0x5b, 0x83, + 0x5b, 0x42, 0xe5, 0x0d, 0x25, 0x59, 0x32, 0xf0, 0x46, 0x78, 0xec, 0xa2, 0x13, 0xd0, 0x83, 0x3c, + 0x4c, 0x8d, 0xc6, 0x8e, 0xb6, 0xd7, 0x39, 0x7c, 0x52, 0x6d, 0xa8, 0x40, 0x6d, 0xfe, 0x3f, 0x3d, + 0x8b, 0x19, 0x9d, 0x38, 0x92, 0x94, 0xd3, 0x6f, 0xdc, 0x28, 0xc3, 0xa9, 0xd1, 0x5c, 0x46, 0xff, + 0xcc, 0x71, 0x92, 0x2e, 0x48, 0xe8, 0x14, 0x5a, 0xc5, 0x48, 0x0c, 0x8d, 0x0b, 0x3c, 0x9d, 0x2f, + 0xf0, 0x5e, 0x22, 0x85, 0x44, 0x49, 0x34, 0x3f, 0x42, 0x47, 0x39, 0x1a, 0xda, 0x02, 0xed, 0x1a, + 0x4f, 0xf8, 0xfc, 0xda, 0x4e, 0xfe, 0x17, 0xf5, 0x61, 0x95, 0xf7, 0x93, 0x63, 0xba, 0x3b, 0xb7, + 0x85, 0x23, 0x70, 0xaf, 0x9a, 0xc7, 0x8d, 0x5c, 0x55, 0x39, 0xf1, 0x7f, 0xab, 0x72, 0xee, 0xac, + 0xea, 0x17, 0x58, 0xaf, 0x5c, 0xa3, 0x46, 0xf7, 0xa0, 0xaa, 0x6b, 0x56, 0x75, 0x39, 0x7b, 0x32, + 0x23, 0x6c, 0x6d, 0x17, 0x8f, 0xab, 0x34, 0xb6, 0x7a, 0x80, 0x66, 0x59, 0xd6, 0x37, 0xd0, 0x45, + 0x16, 0x99, 0xd0, 0x4a, 0xf1, 0xf7, 0x0c, 0xc7, 0x1e, 0xe6, 0x27, 0x58, 0x71, 0xca, 0x18, 0x1d, + 0xc3, 0xba, 0x37, 0x72, 0xe3, 0x18, 0x47, 0x43, 0xfe, 0xd6, 0xf2, 0x38, 0xdb, 0x35, 0xc3, 0x73, + 0xba, 0x12, 0xc9, 0x23, 0x8b, 0x41, 0x4f, 0x14, 0xc5, 0xe2, 0x95, 0xbb, 0xfd, 0x08, 0xd6, 0xc5, + 0xf6, 0x16, 0x5b, 0x9b, 0xb7, 0xec, 0x3a, 0x5d, 0x4f, 0x01, 0xa3, 0x23, 0x80, 0x34, 0x0c, 0x62, + 0x97, 0x65, 0xb4, 0x5c, 0xaa, 0x3b, 0xd5, 0x9e, 0x83, 0xa2, 0xee, 0x28, 0x50, 0xeb, 0x57, 0x03, + 0xba, 0x6a, 0x5b, 0x74, 0x1f, 0xa0, 0xb8, 0x40, 0xe8, 0xcb, 0x01, 0xb7, 0x65, 0xe6, 0x9d, 0x8f, + 0x6c, 0x68, 0x51, 0xec, 0xfa, 0xc3, 0x14, 0xb3, 0x45, 0x57, 0x5b, 0xcb, 0x41, 0x03, 0xcc, 0xd0, + 0x01, 0xb4, 0x7f, 0xd0, 0x90, 0x61, 0x4e, 0xd0, 0xe6, 0x13, 0x5a, 0x1c, 0x35, 0xc0, 0xcc, 0xfa, + 0xa3, 0x41, 0x47, 0xa9, 0x20, 0x03, 0xd6, 0x6e, 0x30, 0x4d, 0x43, 0x12, 0xcb, 0x61, 0x17, 0x21, + 0x3a, 0x2a, 0x4d, 0x28, 0x2e, 0xfc, 0xa0, 0x46, 0xb8, 0xd6, 0x7e, 0x47, 0xa5, 0xfd, 0xb4, 0xf9, + 0xc4, 0x3a, 0xe3, 0x9d, 0x28, 0xc6, 0x5b, 0xe1, 0xd4, 0x87, 0x75, 0xd4, 0x39, 0x96, 0xcb, 0x67, + 0x3b, 0x26, 0xfe, 0x90, 0xc7, 0x13, 0x63, 0x55, 0xcc, 0x76, 0x4c, 0x7c, 0xb1, 0x67, 0xe6, 0xf9, + 0x32, 0x47, 0xee, 0x57, 0x77, 0xbc, 0x76, 0x90, 0x8a, 0x6b, 0xce, 0x97, 0x79, 0x71, 0xb1, 0x1e, + 0xe7, 0xaa, 0x7a, 0x1f, 0x96, 0xbb, 0xf0, 0x59, 0x55, 0xb1, 0x57, 0xe7, 0x42, 0xd5, 0x7f, 0x5f, + 0x8b, 0xb7, 0xe6, 0xcd, 0x16, 0xbc, 0x75, 0x4f, 0x15, 0xee, 0x4a, 0x89, 0xa9, 0x81, 0x6a, 0x53, + 0x03, 0xb5, 0x48, 0xb1, 0xdb, 0x22, 0x5e, 0x20, 0xbf, 0x0b, 0xba, 0x14, 0x69, 0x56, 0x3f, 0x20, + 0xf2, 0xc8, 0xb2, 0xba, 0xac, 0xe1, 0x05, 0x6c, 0x4e, 0x99, 0x0d, 0xed, 0xc3, 0x56, 0x69, 0xb7, + 0xe1, 0x08, 0xbb, 0x3e, 0xa6, 0xd2, 0xc1, 0x9b, 0x65, 0xfe, 0x2d, 0x4f, 0xa3, 0x7b, 0xd0, 0x2e, + 0x53, 0xf2, 0x9e, 0xff, 0x12, 0xaf, 0x07, 0xf0, 0x98, 0xd0, 0xc0, 0x1e, 0x4d, 0x12, 0x4c, 0x23, + 0xec, 0x07, 0x98, 0xda, 0x57, 0xee, 0x25, 0x0d, 0x3d, 0xf1, 0x55, 0x4c, 0xe5, 0x89, 0x2f, 0x9e, + 0x07, 0x21, 0x1b, 0x65, 0x97, 0x79, 0xd8, 0x57, 0xc0, 0x7d, 0x01, 0xee, 0x0b, 0xb0, 0xfc, 0xce, + 0x5e, 0xea, 0x3c, 0x7c, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0x25, 0x75, 0xfb, 0xf8, 0x9e, 0x07, + 0x00, 0x00, } diff --git a/protos/common/configtx.proto b/protos/common/configtx.proto index 7498022ccd0..c810b82fe70 100644 --- a/protos/common/configtx.proto +++ b/protos/common/configtx.proto @@ -20,6 +20,7 @@ import "common/common.proto"; import "common/policies.proto"; option go_package = "github.com/hyperledger/fabric/protos/common"; +option java_package = "org.hyperledger.fabric.protos.common"; package common; diff --git a/protos/common/configuration.pb.go b/protos/common/configuration.pb.go index 5ab340260f0..a4d1cb8e438 100644 --- a/protos/common/configuration.pb.go +++ b/protos/common/configuration.pb.go @@ -58,18 +58,19 @@ func init() { func init() { proto.RegisterFile("common/configuration.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 205 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x44, 0x8e, 0x41, 0x4b, 0xc4, 0x30, - 0x10, 0x46, 0x29, 0xea, 0x42, 0x03, 0xc2, 0x12, 0x3c, 0xac, 0xe2, 0x61, 0xe9, 0x41, 0x16, 0xc4, - 0x8d, 0xe2, 0x2f, 0xd8, 0xe2, 0xc1, 0x9b, 0x50, 0x6f, 0xde, 0xd2, 0x64, 0x9a, 0x04, 0x9b, 0x4c, - 0x99, 0x4c, 0x10, 0xff, 0xbd, 0x90, 0x2a, 0xde, 0xe6, 0xcd, 0xc7, 0x83, 0x27, 0x6e, 0x0c, 0xc6, - 0x88, 0x49, 0x19, 0x4c, 0x53, 0x70, 0x85, 0x34, 0x07, 0x4c, 0xc7, 0x85, 0x90, 0x51, 0x6e, 0xd6, - 0xad, 0xbb, 0x13, 0xdb, 0x57, 0x9d, 0x7d, 0x48, 0xee, 0x34, 0x3b, 0xa4, 0xc0, 0x3e, 0x4a, 0x29, - 0xce, 0x93, 0x8e, 0xb0, 0x6b, 0xf6, 0xcd, 0xa1, 0x1d, 0xea, 0xdd, 0x3d, 0x89, 0xeb, 0x7e, 0x46, - 0xf3, 0xf9, 0xa2, 0x59, 0xff, 0x0a, 0xef, 0x4c, 0xc5, 0x70, 0x21, 0x90, 0x57, 0xe2, 0xe2, 0x2b, - 0x58, 0xf6, 0xd5, 0xb8, 0x1c, 0x56, 0xe8, 0x1e, 0xc5, 0xf6, 0x8d, 0x2c, 0x10, 0xd0, 0xc9, 0x5a, - 0x82, 0x9c, 0x21, 0xcb, 0x5b, 0xd1, 0xea, 0x3f, 0xd8, 0x35, 0xfb, 0xb3, 0x43, 0x3b, 0xfc, 0x3f, - 0xfa, 0x87, 0x8f, 0x7b, 0x17, 0xd8, 0x97, 0xf1, 0x68, 0x30, 0x2a, 0xff, 0xbd, 0x00, 0xcd, 0x60, - 0x1d, 0x90, 0x9a, 0xf4, 0x48, 0xc1, 0xa8, 0xda, 0x9e, 0xd5, 0xda, 0x3e, 0x6e, 0x2a, 0x3e, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x65, 0x4f, 0x72, 0xe8, 0x00, 0x00, 0x00, + // 218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8e, 0x41, 0x4b, 0x03, 0x31, + 0x10, 0x85, 0x59, 0xd4, 0xc2, 0x0e, 0x08, 0x25, 0x78, 0xa8, 0xe2, 0xa1, 0x2c, 0x22, 0x05, 0x61, + 0xa3, 0xf8, 0x0b, 0x5a, 0x3c, 0x78, 0x13, 0xb6, 0x37, 0x6f, 0xd9, 0x64, 0x9a, 0x04, 0x77, 0x33, + 0x65, 0x32, 0x8b, 0xf8, 0xef, 0xc5, 0x8d, 0x62, 0x6f, 0xf3, 0xcd, 0xfb, 0x1e, 0x3c, 0xb8, 0xb1, + 0x34, 0x8e, 0x94, 0xb4, 0xa5, 0x74, 0x88, 0x7e, 0x62, 0x23, 0x91, 0x52, 0x7b, 0x64, 0x12, 0x52, + 0x8b, 0x92, 0x35, 0xf7, 0xb0, 0x7c, 0x35, 0x39, 0xc4, 0xe4, 0xb7, 0x83, 0x27, 0x8e, 0x12, 0x46, + 0xa5, 0xe0, 0x3c, 0x99, 0x11, 0x57, 0xd5, 0xba, 0xda, 0xd4, 0xdd, 0x7c, 0x37, 0x4f, 0x70, 0xbd, + 0x1b, 0xc8, 0x7e, 0xbc, 0x18, 0x31, 0xbf, 0x85, 0xbd, 0xf0, 0x64, 0x65, 0x62, 0x54, 0x57, 0x70, + 0xf1, 0x19, 0x9d, 0x84, 0xb9, 0x71, 0xd9, 0x15, 0x68, 0x1e, 0x61, 0xf9, 0xc6, 0x0e, 0x19, 0x79, + 0xeb, 0x1c, 0x63, 0xce, 0x98, 0xd5, 0x2d, 0xd4, 0xe6, 0x0f, 0x56, 0xd5, 0xfa, 0x6c, 0x53, 0x77, + 0xff, 0x8f, 0xdd, 0x1e, 0xee, 0x88, 0x7d, 0x1b, 0xbe, 0x8e, 0xc8, 0x03, 0x3a, 0x8f, 0xdc, 0x1e, + 0x4c, 0xcf, 0xd1, 0x96, 0xd1, 0xb9, 0x2d, 0xa3, 0xdf, 0x1f, 0x7c, 0x94, 0x30, 0xf5, 0x3f, 0xa8, + 0x4f, 0x64, 0x5d, 0x64, 0x5d, 0x64, 0x5d, 0xe4, 0x7e, 0x31, 0xe3, 0xf3, 0x77, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xf0, 0x7e, 0xef, 0xa1, 0x0e, 0x01, 0x00, 0x00, } diff --git a/protos/common/configuration.proto b/protos/common/configuration.proto index cd0b581c674..614d7cd9dd9 100644 --- a/protos/common/configuration.proto +++ b/protos/common/configuration.proto @@ -17,6 +17,7 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/common"; +option java_package = "org.hyperledger.fabric.protos.common"; package common; diff --git a/protos/common/ledger.pb.go b/protos/common/ledger.pb.go index f19da1b3bdb..b52f548d729 100644 --- a/protos/common/ledger.pb.go +++ b/protos/common/ledger.pb.go @@ -33,7 +33,7 @@ func init() { func init() { proto.RegisterFile("common/ledger.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 173 bytes of a gzipped FileDescriptorProto + // 186 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x49, 0x4d, 0x49, 0x4f, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0x08, 0x2a, 0x35, 0x31, 0x72, 0xf1, 0x39, 0xe5, 0xe4, 0x27, 0x67, 0x27, 0x67, 0x24, @@ -41,8 +41,9 @@ var fileDescriptor3 = []byte{ 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0x41, 0x79, 0x42, 0x5a, 0x5c, 0x02, 0xc9, 0xa5, 0x45, 0x45, 0xa9, 0x79, 0x25, 0x60, 0x0d, 0x1e, 0x89, 0xc5, 0x19, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x18, 0xe2, 0x42, 0x3a, 0x5c, 0x82, 0x05, 0x45, 0xa9, 0x65, 0x99, 0xf9, 0xa5, 0xc5, 0x08, - 0xc5, 0xcc, 0x60, 0xc5, 0x98, 0x12, 0x4e, 0xba, 0x51, 0xda, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, - 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x19, 0x95, 0x05, 0xa9, 0x45, 0x10, 0xc7, 0xea, 0xa7, 0x25, 0x26, - 0x15, 0x65, 0x26, 0xeb, 0x83, 0xdd, 0x5c, 0xac, 0x0f, 0x71, 0x73, 0x12, 0x1b, 0x98, 0x6b, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x93, 0x7a, 0x44, 0xd9, 0x00, 0x00, 0x00, + 0xc5, 0xcc, 0x60, 0xc5, 0x98, 0x12, 0x4e, 0xc1, 0x5c, 0x2a, 0xf9, 0x45, 0xe9, 0x7a, 0x19, 0x95, + 0x05, 0xa9, 0x45, 0x50, 0x57, 0xa6, 0x25, 0x26, 0x15, 0x65, 0x26, 0x43, 0x1c, 0x5b, 0xac, 0x07, + 0x71, 0x6c, 0x94, 0x76, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x12, 0x88, 0xab, 0x8f, 0xa4, 0x58, 0x1f, + 0xa2, 0x58, 0x1f, 0xa2, 0x58, 0x1f, 0xa2, 0x38, 0x89, 0x0d, 0xcc, 0x35, 0x06, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x9f, 0xcc, 0x05, 0xd1, 0xff, 0x00, 0x00, 0x00, } diff --git a/protos/common/ledger.proto b/protos/common/ledger.proto index 573ca34002b..a9b99711c3d 100644 --- a/protos/common/ledger.proto +++ b/protos/common/ledger.proto @@ -16,6 +16,7 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/common"; +option java_package = "org.hyperledger.fabric.protos.common"; package common; diff --git a/protos/common/policies.pb.go b/protos/common/policies.pb.go index 14e57429b3f..0d3e53048b2 100644 --- a/protos/common/policies.pb.go +++ b/protos/common/policies.pb.go @@ -273,35 +273,35 @@ func init() { func init() { proto.RegisterFile("common/policies.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 466 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x52, 0x5d, 0x8f, 0xd2, 0x40, - 0x14, 0x65, 0x00, 0x0b, 0x5c, 0x58, 0xad, 0x13, 0x95, 0x66, 0x13, 0x95, 0xf4, 0xc1, 0x90, 0x18, - 0xdb, 0x04, 0x7c, 0xf2, 0x0d, 0x94, 0xb8, 0x75, 0x69, 0x69, 0x86, 0x6e, 0xcc, 0xfa, 0xd2, 0x50, - 0x18, 0xd8, 0x49, 0xda, 0xe9, 0xa4, 0x9d, 0x6e, 0x52, 0x7f, 0x85, 0xcf, 0xfe, 0x1b, 0xff, 0x99, - 0xe9, 0xd7, 0x46, 0x77, 0xb3, 0x6f, 0xf7, 0x9e, 0x9e, 0x7b, 0xee, 0x39, 0x73, 0x0b, 0x2f, 0xf7, - 0x71, 0x14, 0xc5, 0xdc, 0x14, 0x71, 0xc8, 0xf6, 0x8c, 0xa6, 0x86, 0x48, 0x62, 0x19, 0x63, 0xa5, - 0x82, 0xcf, 0xc7, 0x51, 0x2a, 0xcc, 0x28, 0x15, 0xbe, 0x48, 0x18, 0xdf, 0x33, 0xb1, 0x0b, 0x2b, - 0x82, 0xfe, 0x13, 0x14, 0xb7, 0x18, 0xc9, 0x31, 0x86, 0xae, 0xcc, 0x05, 0xd5, 0xd0, 0x04, 0x4d, - 0x9f, 0x90, 0xb2, 0xc6, 0xaf, 0x40, 0x29, 0x05, 0x73, 0xad, 0x3d, 0x41, 0xd3, 0x11, 0xa9, 0x3b, - 0xfd, 0x0b, 0x40, 0x35, 0xe5, 0x15, 0xac, 0x21, 0xf4, 0xae, 0x9c, 0x4b, 0x67, 0xf3, 0xdd, 0x51, - 0x5b, 0xf8, 0x0c, 0x06, 0x5b, 0xeb, 0xab, 0xb3, 0xf0, 0xae, 0xc8, 0x4a, 0x45, 0xb8, 0x07, 0x1d, - 0x7b, 0xeb, 0xaa, 0x6d, 0xfc, 0x1c, 0xce, 0x2c, 0xdb, 0x5d, 0x5b, 0x9f, 0x2d, 0xcf, 0xb7, 0x57, - 0xde, 0x42, 0xed, 0xe8, 0xbf, 0x11, 0x8c, 0xb7, 0xec, 0xc4, 0x77, 0x32, 0x4b, 0x68, 0xa5, 0xb7, - 0xe2, 0xb7, 0x34, 0x8c, 0x05, 0xc5, 0x1a, 0xf4, 0x6e, 0x69, 0x92, 0xb2, 0x98, 0xd7, 0x86, 0x9a, - 0x16, 0x9b, 0xff, 0x79, 0x1a, 0xce, 0xc6, 0x46, 0x95, 0xd1, 0xb8, 0x27, 0xd5, 0x98, 0xc5, 0x1f, - 0x01, 0xd8, 0x81, 0x72, 0xc9, 0x24, 0xa3, 0xa9, 0xd6, 0x99, 0x74, 0xa6, 0xc3, 0xd9, 0x8b, 0x66, - 0xc8, 0xde, 0xba, 0x6e, 0xf3, 0x24, 0xe4, 0x1f, 0x9e, 0xfe, 0x07, 0xc1, 0xb3, 0x7b, 0x8a, 0xf8, - 0x35, 0x0c, 0x52, 0x76, 0xe2, 0xf4, 0xe0, 0x07, 0x79, 0x65, 0xeb, 0xa2, 0x45, 0xfa, 0x15, 0xb4, - 0xcc, 0xf1, 0x27, 0xe8, 0x73, 0x3f, 0xce, 0xa4, 0x1f, 0x1f, 0x6b, 0x6f, 0x6f, 0x1e, 0xf1, 0x66, - 0x38, 0x9b, 0x4c, 0x6e, 0x8e, 0x17, 0x2d, 0xa2, 0xf0, 0xb2, 0x3a, 0xbf, 0x04, 0xa5, 0xc2, 0xf0, - 0x08, 0x50, 0x93, 0x19, 0x71, 0x3c, 0x87, 0x7e, 0x73, 0x52, 0xad, 0x5d, 0x5a, 0x7f, 0x34, 0xef, - 0x1d, 0x71, 0xa9, 0x40, 0xb7, 0x38, 0x8c, 0xfe, 0x0b, 0x01, 0xb6, 0x22, 0x51, 0xa0, 0xd2, 0xa6, - 0x72, 0x77, 0x17, 0x03, 0xd2, 0x2c, 0xf0, 0xeb, 0x57, 0x2c, 0x56, 0x0d, 0xc8, 0x20, 0xcd, 0x82, - 0xfa, 0xf3, 0x1c, 0xba, 0x49, 0x16, 0xd2, 0x32, 0xc2, 0xd3, 0xd9, 0xdb, 0x66, 0xdd, 0x43, 0x21, - 0x83, 0x64, 0x21, 0x25, 0x25, 0x59, 0x7f, 0x07, 0xdd, 0xa2, 0x2b, 0xee, 0xbd, 0x70, 0xae, 0xd5, - 0x56, 0x59, 0xac, 0xd7, 0x2a, 0xc2, 0x23, 0xe8, 0xdb, 0x8b, 0x6f, 0x1b, 0x62, 0x79, 0xd7, 0x6a, - 0x7b, 0xf9, 0xe1, 0xc7, 0xfb, 0x13, 0x93, 0x37, 0x59, 0x50, 0xc8, 0x9a, 0x37, 0xb9, 0xa0, 0x49, - 0x48, 0x0f, 0x27, 0x9a, 0x98, 0xc7, 0x5d, 0x90, 0xb0, 0xbd, 0x59, 0xfe, 0x96, 0xa9, 0x59, 0x2d, - 0x0d, 0x94, 0xb2, 0x9d, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x13, 0x57, 0x22, 0xdf, 0x02, - 0x00, 0x00, + // 478 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x52, 0xd1, 0x8e, 0xd2, 0x40, + 0x14, 0x65, 0x00, 0x0b, 0x5c, 0x58, 0xad, 0x13, 0x15, 0xb2, 0x89, 0x4a, 0x1a, 0x63, 0x48, 0x4c, + 0xda, 0x04, 0x7c, 0xf2, 0x0d, 0x94, 0xb8, 0x75, 0x69, 0x21, 0x03, 0x1b, 0xb3, 0xbe, 0x34, 0x14, + 0x06, 0x76, 0x92, 0x32, 0x33, 0x69, 0xa7, 0x9b, 0xd4, 0xaf, 0xf0, 0xd9, 0xbf, 0xf1, 0xcf, 0x4c, + 0x3b, 0xed, 0x66, 0x5d, 0xb3, 0x6f, 0xf7, 0xdc, 0x9e, 0x7b, 0xee, 0x39, 0x73, 0x0b, 0x2f, 0x77, + 0xe2, 0x74, 0x12, 0xdc, 0x91, 0x22, 0x62, 0x3b, 0x46, 0x13, 0x5b, 0xc6, 0x42, 0x09, 0x6c, 0xe8, + 0xf6, 0x79, 0xff, 0x94, 0x48, 0xe7, 0x94, 0xc8, 0x40, 0xc6, 0x8c, 0xef, 0x98, 0xdc, 0x46, 0x9a, + 0x60, 0xfd, 0x04, 0x63, 0x95, 0x8f, 0x64, 0x18, 0x43, 0x53, 0x65, 0x92, 0x0e, 0xd0, 0x10, 0x8d, + 0x9e, 0x90, 0xa2, 0xc6, 0xaf, 0xc0, 0x28, 0x04, 0xb3, 0x41, 0x7d, 0x88, 0x46, 0x3d, 0x52, 0x22, + 0xeb, 0x0b, 0x80, 0x9e, 0xda, 0xe4, 0xac, 0x2e, 0xb4, 0xae, 0xfc, 0x4b, 0x7f, 0xf9, 0xdd, 0x37, + 0x6b, 0xf8, 0x0c, 0x3a, 0x6b, 0xf7, 0xab, 0x3f, 0xdd, 0x5c, 0x91, 0xb9, 0x89, 0x70, 0x0b, 0x1a, + 0xde, 0x7a, 0x65, 0xd6, 0xf1, 0x73, 0x38, 0x73, 0xbd, 0xd5, 0xc2, 0xfd, 0xec, 0x6e, 0x02, 0x6f, + 0xbe, 0x99, 0x9a, 0x0d, 0xeb, 0x37, 0x82, 0xfe, 0x9a, 0x1d, 0xf9, 0x56, 0xa5, 0x31, 0xd5, 0x7a, + 0x73, 0x7e, 0x4b, 0x23, 0x21, 0x29, 0x1e, 0x40, 0xeb, 0x96, 0xc6, 0x09, 0x13, 0xbc, 0x34, 0x54, + 0x41, 0xec, 0xfc, 0xe3, 0xa9, 0x3b, 0xee, 0xdb, 0x3a, 0xa3, 0xfd, 0x40, 0xaa, 0x32, 0x8b, 0x3f, + 0x02, 0xb0, 0x3d, 0xe5, 0x8a, 0x29, 0x46, 0x93, 0x41, 0x63, 0xd8, 0x18, 0x75, 0xc7, 0x2f, 0xaa, + 0x21, 0x6f, 0xbd, 0x5a, 0x55, 0x4f, 0x42, 0xee, 0xf1, 0xac, 0x3f, 0x08, 0x9e, 0x3d, 0x50, 0xc4, + 0xaf, 0xa1, 0x93, 0xb0, 0x23, 0xa7, 0xfb, 0x20, 0xcc, 0xb4, 0xad, 0x8b, 0x1a, 0x69, 0xeb, 0xd6, + 0x2c, 0xc3, 0x9f, 0xa0, 0xcd, 0x03, 0x91, 0xaa, 0x40, 0x1c, 0x4a, 0x6f, 0x6f, 0x1e, 0xf1, 0x66, + 0xfb, 0xcb, 0x54, 0x2d, 0x0f, 0x17, 0x35, 0x62, 0xf0, 0xa2, 0x3a, 0xbf, 0x04, 0x43, 0xf7, 0x70, + 0x0f, 0x50, 0x95, 0x19, 0x71, 0x3c, 0x81, 0x76, 0x75, 0xd2, 0x41, 0xbd, 0xb0, 0xfe, 0x68, 0xde, + 0x3b, 0xe2, 0xcc, 0x80, 0x66, 0x7e, 0x18, 0xeb, 0x17, 0x02, 0xec, 0x9e, 0x64, 0xde, 0x55, 0x1e, + 0x55, 0xdb, 0xbb, 0x18, 0x90, 0xa4, 0x61, 0x50, 0xbe, 0x62, 0xbe, 0xaa, 0x43, 0x3a, 0x49, 0x1a, + 0x96, 0x9f, 0x27, 0xd0, 0x8c, 0xd3, 0x88, 0x16, 0x11, 0x9e, 0x8e, 0xdf, 0x56, 0xeb, 0xfe, 0x17, + 0xb2, 0x49, 0x1a, 0x51, 0x52, 0x90, 0xad, 0xf7, 0xd0, 0xcc, 0x51, 0x7e, 0xef, 0xa9, 0x7f, 0x6d, + 0xd6, 0x8a, 0x62, 0xb1, 0x30, 0x11, 0xee, 0x41, 0xdb, 0x9b, 0x7e, 0x5b, 0x12, 0x77, 0x73, 0x6d, + 0xd6, 0x67, 0x6b, 0x78, 0x27, 0xe2, 0xa3, 0x7d, 0x93, 0x49, 0x1a, 0x47, 0x74, 0x7f, 0xa4, 0xb1, + 0x7d, 0xd8, 0x86, 0x31, 0xdb, 0xe9, 0xff, 0x31, 0x29, 0xb7, 0xfd, 0xf8, 0x70, 0x64, 0xea, 0x26, + 0x0d, 0x73, 0xe8, 0xdc, 0x23, 0x3b, 0x9a, 0xec, 0x68, 0xb2, 0xa3, 0xc9, 0xa1, 0x51, 0xc0, 0xc9, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x05, 0x25, 0xe5, 0x05, 0x03, 0x00, 0x00, } diff --git a/protos/common/policies.proto b/protos/common/policies.proto index 5f2c6b38ec7..76206c8723e 100644 --- a/protos/common/policies.proto +++ b/protos/common/policies.proto @@ -19,6 +19,7 @@ syntax = "proto3"; import "msp/msp_principal.proto"; option go_package = "github.com/hyperledger/fabric/protos/common"; +option java_package = "org.hyperledger.fabric.protos.common"; package common; diff --git a/protos/msp/identities.pb.go b/protos/msp/identities.pb.go index 73cb169d136..241bbecb90f 100644 --- a/protos/msp/identities.pb.go +++ b/protos/msp/identities.pb.go @@ -7,19 +7,19 @@ Package msp is a generated protocol buffer package. It is generated from these files: msp/identities.proto + msp/msp_config.proto msp/msp_principal.proto - msp/mspconfig.proto It has these top-level messages: SerializedIdentity - MSPPrincipal - OrganizationUnit - MSPRole MSPConfig FabricMSPConfig SigningIdentityInfo KeyInfo FabricOUIdentifier + MSPPrincipal + OrganizationUnit + MSPRole */ package msp @@ -60,15 +60,16 @@ func init() { func init() { proto.RegisterFile("msp/identities.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 157 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x12, 0xc9, 0x2d, 0x2e, 0xd0, - 0xcf, 0x4c, 0x49, 0xcd, 0x2b, 0xc9, 0x2c, 0xc9, 0x4c, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x62, 0xce, 0x2d, 0x2e, 0x50, 0x72, 0xe5, 0x12, 0x0a, 0x4e, 0x2d, 0xca, 0x4c, 0xcc, 0xc9, - 0xac, 0x4a, 0x4d, 0xf1, 0x84, 0x28, 0xa9, 0x14, 0x12, 0xe1, 0x62, 0xcd, 0x2d, 0x2e, 0xc8, 0x4c, - 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0x70, 0x84, 0x24, 0xb9, 0x38, 0x32, 0x53, 0xe2, - 0x93, 0x2a, 0x4b, 0x52, 0x8b, 0x25, 0x98, 0x14, 0x18, 0x35, 0x78, 0x82, 0xd8, 0x33, 0x53, 0x9c, - 0x40, 0x5c, 0x27, 0xad, 0x28, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0xfd, 0x8c, 0xca, 0x82, 0xd4, 0xa2, 0x9c, 0xd4, 0x94, 0xf4, 0xd4, 0x22, 0xfd, 0xb4, 0xc4, 0xa4, - 0xa2, 0xcc, 0x64, 0x7d, 0xb0, 0x95, 0xc5, 0xfa, 0xb9, 0xc5, 0x05, 0x49, 0x6c, 0x60, 0xb6, 0x31, - 0x20, 0x00, 0x00, 0xff, 0xff, 0x56, 0x8f, 0x19, 0x9a, 0x96, 0x00, 0x00, 0x00, + // 171 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0xcd, 0x3d, 0x0b, 0xc2, 0x30, + 0x10, 0xc6, 0x71, 0xaa, 0xf8, 0x16, 0x9c, 0x42, 0x87, 0xba, 0x55, 0xa7, 0x4e, 0xc9, 0xe0, 0x37, + 0x28, 0x38, 0x38, 0xb8, 0xd4, 0xcd, 0x45, 0x9a, 0xe6, 0x6c, 0x0f, 0x1a, 0x73, 0xe4, 0xe2, 0x50, + 0x3f, 0xbd, 0x68, 0x16, 0xb7, 0xe7, 0x0f, 0x3f, 0x78, 0x44, 0xee, 0x98, 0x34, 0x5a, 0x78, 0x46, + 0x8c, 0x08, 0xac, 0x28, 0xf8, 0xe8, 0xe5, 0xdc, 0x31, 0x1d, 0x4e, 0x42, 0x5e, 0x21, 0x60, 0x3b, + 0xe2, 0x1b, 0xec, 0x39, 0x91, 0x49, 0xe6, 0x62, 0xe1, 0x98, 0xd0, 0x16, 0x59, 0x99, 0x55, 0x9b, + 0x26, 0x85, 0xdc, 0x89, 0x35, 0xda, 0xbb, 0x99, 0x22, 0x70, 0x31, 0x2b, 0xb3, 0x6a, 0xdb, 0xac, + 0xd0, 0xd6, 0xdf, 0xac, 0x2f, 0x62, 0xef, 0x43, 0xaf, 0x86, 0x89, 0x20, 0x8c, 0x60, 0x7b, 0x08, + 0xea, 0xd1, 0x9a, 0x80, 0x5d, 0xfa, 0x62, 0xe5, 0x98, 0x6e, 0x55, 0x8f, 0x71, 0x78, 0x19, 0xd5, + 0x79, 0xa7, 0xff, 0xa4, 0x4e, 0x52, 0x27, 0xa9, 0x1d, 0x93, 0x59, 0xfe, 0xf6, 0xf1, 0x13, 0x00, + 0x00, 0xff, 0xff, 0xaf, 0xfd, 0x80, 0x9c, 0xb9, 0x00, 0x00, 0x00, } diff --git a/protos/msp/identities.proto b/protos/msp/identities.proto index fb9017a1c81..7046248c57c 100644 --- a/protos/msp/identities.proto +++ b/protos/msp/identities.proto @@ -17,6 +17,7 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/msp"; +option java_package = "org.hyperledger.fabric.protos.msp"; package msp; diff --git a/protos/msp/mspconfig.pb.go b/protos/msp/msp_config.pb.go similarity index 70% rename from protos/msp/mspconfig.pb.go rename to protos/msp/msp_config.pb.go index ca07658351b..1de7664c3a1 100644 --- a/protos/msp/mspconfig.pb.go +++ b/protos/msp/msp_config.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. -// source: msp/mspconfig.proto +// source: msp/msp_config.proto // DO NOT EDIT! package msp @@ -27,7 +27,7 @@ type MSPConfig struct { func (m *MSPConfig) Reset() { *m = MSPConfig{} } func (m *MSPConfig) String() string { return proto.CompactTextString(m) } func (*MSPConfig) ProtoMessage() {} -func (*MSPConfig) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (*MSPConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } // FabricMSPConfig collects all the configuration information for // a Fabric MSP. @@ -74,7 +74,7 @@ type FabricMSPConfig struct { func (m *FabricMSPConfig) Reset() { *m = FabricMSPConfig{} } func (m *FabricMSPConfig) String() string { return proto.CompactTextString(m) } func (*FabricMSPConfig) ProtoMessage() {} -func (*FabricMSPConfig) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } +func (*FabricMSPConfig) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } func (m *FabricMSPConfig) GetSigningIdentity() *SigningIdentityInfo { if m != nil { @@ -106,7 +106,7 @@ type SigningIdentityInfo struct { func (m *SigningIdentityInfo) Reset() { *m = SigningIdentityInfo{} } func (m *SigningIdentityInfo) String() string { return proto.CompactTextString(m) } func (*SigningIdentityInfo) ProtoMessage() {} -func (*SigningIdentityInfo) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } +func (*SigningIdentityInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } func (m *SigningIdentityInfo) GetPrivateSigner() *KeyInfo { if m != nil { @@ -132,7 +132,7 @@ type KeyInfo struct { func (m *KeyInfo) Reset() { *m = KeyInfo{} } func (m *KeyInfo) String() string { return proto.CompactTextString(m) } func (*KeyInfo) ProtoMessage() {} -func (*KeyInfo) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} } +func (*KeyInfo) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } // FabricOUIdentifier represents an organizazional unit and // its related chain of trust identifier. @@ -148,7 +148,7 @@ type FabricOUIdentifier struct { func (m *FabricOUIdentifier) Reset() { *m = FabricOUIdentifier{} } func (m *FabricOUIdentifier) String() string { return proto.CompactTextString(m) } func (*FabricOUIdentifier) ProtoMessage() {} -func (*FabricOUIdentifier) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} } +func (*FabricOUIdentifier) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } func init() { proto.RegisterType((*MSPConfig)(nil), "msp.MSPConfig") @@ -158,37 +158,39 @@ func init() { proto.RegisterType((*FabricOUIdentifier)(nil), "msp.FabricOUIdentifier") } -func init() { proto.RegisterFile("msp/mspconfig.proto", fileDescriptor2) } - -var fileDescriptor2 = []byte{ - // 458 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x6e, 0xd3, 0x30, - 0x14, 0x56, 0xda, 0xad, 0x53, 0x4f, 0xd3, 0x16, 0x3c, 0x18, 0xb9, 0x60, 0x10, 0x82, 0x10, 0x11, - 0x12, 0xad, 0xb4, 0x5e, 0x70, 0x4f, 0x11, 0x52, 0x05, 0x13, 0x28, 0xd5, 0x6e, 0xb8, 0x89, 0xd2, - 0xd4, 0xcd, 0x8e, 0x1a, 0xff, 0xc8, 0x76, 0x27, 0x85, 0x97, 0xe0, 0xfd, 0x78, 0x1a, 0x14, 0xdb, - 0xa2, 0x2d, 0x4c, 0xbb, 0x3b, 0xfe, 0x7e, 0x4e, 0xbe, 0x73, 0x1c, 0xc3, 0x39, 0xd3, 0x72, 0xca, - 0xb4, 0x2c, 0x05, 0xdf, 0x60, 0x35, 0x91, 0x4a, 0x18, 0x41, 0xba, 0x4c, 0xcb, 0xe4, 0x03, 0xf4, - 0xaf, 0x97, 0xdf, 0xe7, 0x16, 0x27, 0x04, 0x4e, 0x4c, 0x23, 0x69, 0x14, 0xc4, 0x41, 0x7a, 0x9a, - 0xd9, 0x9a, 0x5c, 0x40, 0xcf, 0xb9, 0xa2, 0x4e, 0x1c, 0xa4, 0x61, 0xe6, 0x4f, 0xc9, 0xef, 0x0e, - 0x8c, 0x3f, 0x17, 0x2b, 0x85, 0xe5, 0x91, 0x9f, 0x17, 0xcc, 0xf9, 0xfb, 0x99, 0xad, 0xc9, 0x25, - 0x80, 0x12, 0xc2, 0xe4, 0x25, 0x55, 0x46, 0x47, 0x9d, 0xb8, 0x9b, 0x86, 0x59, 0xbf, 0x45, 0xe6, - 0x2d, 0x40, 0xde, 0x03, 0x41, 0x6e, 0xa8, 0x62, 0x74, 0x8d, 0x85, 0xa1, 0x5e, 0xd6, 0xb5, 0xb2, - 0xc7, 0x87, 0x8c, 0x93, 0x5f, 0x40, 0xaf, 0x58, 0x33, 0xe4, 0x3a, 0x3a, 0xb1, 0x12, 0x7f, 0x22, - 0x6f, 0x61, 0xac, 0xe8, 0x9d, 0x28, 0x0b, 0x83, 0x82, 0xe7, 0x35, 0x6a, 0x13, 0x9d, 0x5a, 0xc1, - 0x68, 0x0f, 0x7f, 0x45, 0x6d, 0xc8, 0x1c, 0x1e, 0x69, 0xac, 0x38, 0xf2, 0x2a, 0xc7, 0x35, 0xe5, - 0x06, 0x4d, 0x13, 0xf5, 0xe2, 0x20, 0x1d, 0x5c, 0x45, 0x13, 0xa6, 0xe5, 0x64, 0xe9, 0xc8, 0x85, - 0xe7, 0x16, 0x7c, 0x23, 0xb2, 0xb1, 0x3e, 0x06, 0x49, 0x0e, 0x2f, 0x85, 0xaa, 0x0a, 0x8e, 0x3f, - 0x6d, 0xe3, 0xa2, 0xce, 0x77, 0x1c, 0x8d, 0x6f, 0xb8, 0x41, 0xaa, 0x74, 0x74, 0x16, 0x77, 0xd3, - 0xc1, 0xd5, 0x33, 0xdb, 0xd3, 0xad, 0xe9, 0xdb, 0xcd, 0xe2, 0x2f, 0x9f, 0x5d, 0x1e, 0xfb, 0x6f, - 0x38, 0x9a, 0x3d, 0xab, 0x13, 0x01, 0xe7, 0xf7, 0x04, 0x21, 0xaf, 0x61, 0x28, 0x77, 0xab, 0x1a, - 0xcb, 0xbc, 0x4d, 0x44, 0x95, 0x5d, 0x74, 0x98, 0x85, 0x0e, 0x5c, 0x5a, 0x8c, 0xcc, 0x60, 0x24, - 0x15, 0xde, 0xb5, 0xcb, 0xf4, 0xaa, 0x8e, 0x9d, 0x2f, 0xb4, 0x59, 0xbe, 0x50, 0x37, 0xd3, 0xd0, - 0x6b, 0x9c, 0x29, 0x59, 0xc2, 0x99, 0x67, 0xc8, 0x1b, 0x18, 0x6d, 0x69, 0x73, 0x30, 0x8c, 0xbf, - 0xce, 0xe1, 0x96, 0x36, 0xfb, 0x8c, 0xe4, 0x15, 0x84, 0xad, 0x8c, 0x15, 0x86, 0x2a, 0x2c, 0x6a, - 0xff, 0x77, 0x0c, 0xb6, 0xb4, 0xb9, 0xf6, 0x50, 0xf2, 0x2b, 0x00, 0xf2, 0xff, 0xec, 0x64, 0x06, - 0x4f, 0xdb, 0x5b, 0x76, 0xa3, 0xfe, 0xfb, 0x9d, 0x30, 0x7b, 0xb2, 0x27, 0x0f, 0x4c, 0x9f, 0xe0, - 0xc5, 0xc3, 0x2b, 0xb7, 0x01, 0xfa, 0xd9, 0xf3, 0x87, 0x16, 0xfb, 0xf1, 0xdd, 0x8f, 0xb4, 0x42, - 0x73, 0xbb, 0x5b, 0x4d, 0x4a, 0xc1, 0xa6, 0xb7, 0x8d, 0xa4, 0xaa, 0xa6, 0xeb, 0x8a, 0xaa, 0xe9, - 0xc6, 0xe6, 0x9c, 0xda, 0x97, 0xa1, 0xdb, 0xa7, 0xb2, 0xea, 0xd9, 0x7a, 0xf6, 0x27, 0x00, 0x00, - 0xff, 0xff, 0x35, 0x7e, 0x6d, 0x6e, 0x3c, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("msp/msp_config.proto", fileDescriptor1) } + +var fileDescriptor1 = []byte{ + // 482 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x53, 0x4d, 0x6f, 0xd3, 0x30, + 0x18, 0x56, 0xdb, 0xad, 0x53, 0xdf, 0xa6, 0xed, 0x30, 0x63, 0xe4, 0xc0, 0xa0, 0x0b, 0x42, 0xe4, + 0x42, 0x2a, 0xad, 0x07, 0xee, 0x2b, 0x42, 0xaa, 0xa0, 0x62, 0x4a, 0xb5, 0x0b, 0x97, 0xc8, 0x4d, + 0xdd, 0xec, 0x55, 0x13, 0xdb, 0xb2, 0xdd, 0x49, 0xe1, 0x4f, 0xf0, 0xff, 0xf8, 0x35, 0x28, 0xb6, + 0x45, 0x5b, 0x40, 0xbb, 0x39, 0xcf, 0x87, 0xf3, 0xbc, 0x8f, 0x6d, 0xb8, 0xa8, 0xb4, 0x9c, 0x54, + 0x5a, 0x66, 0xb9, 0xe0, 0x1b, 0x2c, 0x12, 0xa9, 0x84, 0x11, 0xa4, 0x53, 0x69, 0x19, 0x7d, 0x84, + 0xde, 0x62, 0x79, 0x37, 0xb3, 0x38, 0x21, 0x70, 0x62, 0x6a, 0xc9, 0xc2, 0xd6, 0xb8, 0x15, 0x9f, + 0xa6, 0x76, 0x4d, 0x2e, 0xa1, 0xeb, 0x5c, 0x61, 0x7b, 0xdc, 0x8a, 0x83, 0xd4, 0x7f, 0x45, 0xbf, + 0xda, 0x30, 0xfa, 0x4c, 0x57, 0x0a, 0xf3, 0x23, 0x3f, 0xa7, 0x95, 0xf3, 0xf7, 0x52, 0xbb, 0x26, + 0x57, 0x00, 0x4a, 0x08, 0x93, 0xe5, 0x4c, 0x19, 0x1d, 0xb6, 0xc7, 0x9d, 0x38, 0x48, 0x7b, 0x0d, + 0x32, 0x6b, 0x00, 0xf2, 0x01, 0x08, 0x72, 0xc3, 0x54, 0xc5, 0xd6, 0x48, 0x0d, 0xf3, 0xb2, 0x8e, + 0x95, 0x3d, 0x3b, 0x64, 0x9c, 0xfc, 0x12, 0xba, 0x74, 0x5d, 0x21, 0xd7, 0xe1, 0x89, 0x95, 0xf8, + 0x2f, 0xf2, 0x1e, 0x46, 0x8a, 0x3d, 0x8a, 0x9c, 0x1a, 0x14, 0x3c, 0x2b, 0x51, 0x9b, 0xf0, 0xd4, + 0x0a, 0x86, 0x7b, 0xf8, 0x2b, 0x6a, 0x43, 0x66, 0x70, 0xae, 0xb1, 0xe0, 0xc8, 0x8b, 0x0c, 0xd7, + 0x8c, 0x1b, 0x34, 0x75, 0xd8, 0x1d, 0xb7, 0xe2, 0xfe, 0x4d, 0x98, 0x54, 0x5a, 0x26, 0x4b, 0x47, + 0xce, 0x3d, 0x37, 0xe7, 0x1b, 0x91, 0x8e, 0xf4, 0x31, 0x48, 0x32, 0x78, 0x23, 0x54, 0x41, 0x39, + 0xfe, 0xb0, 0x1b, 0xd3, 0x32, 0xdb, 0x71, 0x34, 0x7e, 0xc3, 0x0d, 0x32, 0xa5, 0xc3, 0xb3, 0x71, + 0x27, 0xee, 0xdf, 0xbc, 0xb4, 0x7b, 0xba, 0x9a, 0xbe, 0xdd, 0xcf, 0xff, 0xf0, 0xe9, 0xd5, 0xb1, + 0xff, 0x9e, 0xa3, 0xd9, 0xb3, 0x3a, 0x12, 0xf0, 0xfc, 0x3f, 0x41, 0xc8, 0x5b, 0x18, 0xc8, 0xdd, + 0xaa, 0xc4, 0x3c, 0x6b, 0x12, 0x31, 0x65, 0x8b, 0x0e, 0xd2, 0xc0, 0x81, 0x4b, 0x8b, 0x91, 0x29, + 0x0c, 0xa5, 0xc2, 0xc7, 0xa6, 0x4c, 0xaf, 0x6a, 0xdb, 0xf9, 0x02, 0x9b, 0xe5, 0x0b, 0x73, 0x33, + 0x0d, 0xbc, 0xc6, 0x99, 0xa2, 0x25, 0x9c, 0x79, 0x86, 0xbc, 0x83, 0xe1, 0x96, 0xd5, 0x07, 0xc3, + 0xf8, 0xe3, 0x1c, 0x6c, 0x59, 0xbd, 0xcf, 0x48, 0xae, 0x21, 0x68, 0x64, 0x15, 0x35, 0x4c, 0x21, + 0x2d, 0xfd, 0xed, 0xe8, 0x6f, 0x59, 0xbd, 0xf0, 0x50, 0xf4, 0xb3, 0x05, 0xe4, 0xdf, 0xd9, 0xc9, + 0x14, 0x5e, 0x34, 0xa7, 0xec, 0x46, 0xfd, 0xfb, 0x3f, 0x41, 0x7a, 0xb1, 0x27, 0x0f, 0x4c, 0x9f, + 0xe0, 0xf5, 0xd3, 0x95, 0xdb, 0x00, 0xbd, 0xf4, 0xd5, 0x53, 0xc5, 0xde, 0x66, 0x70, 0x2d, 0x54, + 0x91, 0x3c, 0xd4, 0x92, 0xa9, 0x92, 0xad, 0x0b, 0xa6, 0x92, 0x8d, 0x0d, 0xe8, 0x9e, 0x84, 0x6e, + 0x2a, 0xba, 0x3d, 0x5f, 0x68, 0xe9, 0x2e, 0xf4, 0x1d, 0xcd, 0xb7, 0xb4, 0x60, 0xdf, 0xe3, 0x02, + 0xcd, 0xc3, 0x6e, 0x95, 0xe4, 0xa2, 0x9a, 0x1c, 0x78, 0x27, 0xce, 0x3b, 0x71, 0xde, 0xe6, 0x81, + 0xad, 0xba, 0x76, 0x3d, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x42, 0xf3, 0x59, 0x72, 0x03, + 0x00, 0x00, } diff --git a/protos/msp/mspconfig.proto b/protos/msp/msp_config.proto similarity index 97% rename from protos/msp/mspconfig.proto rename to protos/msp/msp_config.proto index 129aa25b429..40442080ecd 100644 --- a/protos/msp/mspconfig.proto +++ b/protos/msp/msp_config.proto @@ -17,6 +17,8 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/msp"; +option java_package = "org.hyperledger.fabric.protos.msp"; +option java_outer_classname = "MspConfigPackage"; package msp; @@ -120,4 +122,4 @@ message FabricOUIdentifier { // OrganizationUnitIdentifier defines the organizational unit under the // MSP identified with MSPIdentifier string organizational_unit_identifier = 2; -} \ No newline at end of file +} diff --git a/protos/msp/msp_principal.pb.go b/protos/msp/msp_principal.pb.go index 5345e6be386..29ce02fb806 100644 --- a/protos/msp/msp_principal.pb.go +++ b/protos/msp/msp_principal.pb.go @@ -41,7 +41,7 @@ func (x MSPPrincipal_Classification) String() string { return proto.EnumName(MSPPrincipal_Classification_name, int32(x)) } func (MSPPrincipal_Classification) EnumDescriptor() ([]byte, []int) { - return fileDescriptor1, []int{0, 0} + return fileDescriptor2, []int{0, 0} } type MSPRole_MSPRoleType int32 @@ -63,7 +63,7 @@ var MSPRole_MSPRoleType_value = map[string]int32{ func (x MSPRole_MSPRoleType) String() string { return proto.EnumName(MSPRole_MSPRoleType_name, int32(x)) } -func (MSPRole_MSPRoleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{2, 0} } +func (MSPRole_MSPRoleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{2, 0} } // MSPPrincipal aims to represent an MSP-centric set of identities. // In particular, this structure allows for definition of @@ -103,7 +103,7 @@ type MSPPrincipal struct { func (m *MSPPrincipal) Reset() { *m = MSPPrincipal{} } func (m *MSPPrincipal) String() string { return proto.CompactTextString(m) } func (*MSPPrincipal) ProtoMessage() {} -func (*MSPPrincipal) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (*MSPPrincipal) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } // OrganizationUnit governs the organization of the Principal // field of a policy principal when a specific organization unity members @@ -123,7 +123,7 @@ type OrganizationUnit struct { func (m *OrganizationUnit) Reset() { *m = OrganizationUnit{} } func (m *OrganizationUnit) String() string { return proto.CompactTextString(m) } func (*OrganizationUnit) ProtoMessage() {} -func (*OrganizationUnit) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (*OrganizationUnit) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } // MSPRole governs the organization of the Principal // field of an MSPPrincipal when it aims to define one of the @@ -140,7 +140,7 @@ type MSPRole struct { func (m *MSPRole) Reset() { *m = MSPRole{} } func (m *MSPRole) String() string { return proto.CompactTextString(m) } func (*MSPRole) ProtoMessage() {} -func (*MSPRole) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } +func (*MSPRole) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } func init() { proto.RegisterType((*MSPPrincipal)(nil), "common.MSPPrincipal") @@ -150,32 +150,33 @@ func init() { proto.RegisterEnum("common.MSPRole_MSPRoleType", MSPRole_MSPRoleType_name, MSPRole_MSPRoleType_value) } -func init() { proto.RegisterFile("msp/msp_principal.proto", fileDescriptor1) } - -var fileDescriptor1 = []byte{ - // 372 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0xce, 0x9a, 0x40, - 0x14, 0x85, 0x1d, 0x6b, 0xad, 0xde, 0x5a, 0x42, 0x27, 0x35, 0x9a, 0xd4, 0x34, 0x86, 0xb6, 0x89, - 0xe9, 0x02, 0x12, 0x7d, 0x80, 0x46, 0x2b, 0x69, 0x48, 0x0a, 0x98, 0x11, 0x17, 0x75, 0x51, 0x82, - 0x38, 0xea, 0x24, 0xc0, 0x4c, 0x06, 0x5c, 0xd8, 0x17, 0xe8, 0x0b, 0xf5, 0x35, 0xfa, 0x4e, 0x0d, - 0x63, 0x44, 0xfc, 0x57, 0xff, 0x0a, 0xb8, 0xe7, 0x7c, 0x87, 0x7b, 0x67, 0x2e, 0x0c, 0xd2, 0x5c, - 0x58, 0x69, 0x2e, 0x42, 0x21, 0x59, 0x16, 0x33, 0x11, 0x25, 0xa6, 0x90, 0xbc, 0xe0, 0xb8, 0x1d, - 0xf3, 0x34, 0xe5, 0x99, 0xf1, 0x0f, 0x41, 0xcf, 0x5d, 0xaf, 0x56, 0x37, 0x19, 0xff, 0x82, 0x61, - 0xe5, 0x0d, 0xe3, 0x24, 0xca, 0x73, 0x76, 0x60, 0x71, 0x54, 0x30, 0x9e, 0x0d, 0xd1, 0x18, 0x4d, - 0xb4, 0xe9, 0x47, 0xf3, 0xca, 0x9a, 0x75, 0xce, 0xfc, 0xf6, 0x60, 0x25, 0x83, 0x2a, 0xe4, 0x51, - 0xc0, 0x23, 0xe8, 0x56, 0xd2, 0xb0, 0x39, 0x46, 0x93, 0x1e, 0xb9, 0x17, 0x8c, 0xaf, 0xa0, 0x3d, - 0xf1, 0x77, 0xa0, 0x45, 0xfc, 0x1f, 0xb6, 0xde, 0xc0, 0x7d, 0x78, 0xeb, 0x93, 0xef, 0x73, 0xcf, - 0xd9, 0xce, 0x03, 0xc7, 0xf7, 0xc2, 0x8d, 0xe7, 0x04, 0x3a, 0xc2, 0x3d, 0xe8, 0x38, 0x4b, 0xdb, - 0x0b, 0x9c, 0xe0, 0xa7, 0xde, 0x34, 0xfe, 0x22, 0xd0, 0x7d, 0x79, 0x8c, 0x32, 0xf6, 0x5b, 0xf1, - 0x9b, 0x8c, 0x15, 0xf8, 0x33, 0x68, 0xe5, 0x19, 0xb0, 0x3d, 0xcd, 0x0a, 0x76, 0x60, 0x54, 0xaa, - 0x49, 0xba, 0xe4, 0x4d, 0x9a, 0x0b, 0xa7, 0x2a, 0xe2, 0x25, 0x7c, 0xe0, 0x35, 0x34, 0x4a, 0xc2, - 0x73, 0xc6, 0x8a, 0x3a, 0xd6, 0x54, 0xd8, 0xe8, 0xd1, 0x55, 0xfe, 0xa2, 0x96, 0x32, 0x83, 0x7e, - 0x4c, 0xe5, 0xf5, 0x23, 0xaf, 0xc3, 0x2f, 0xd4, 0xb0, 0xef, 0xee, 0xe2, 0x1d, 0x32, 0xfe, 0x20, - 0x78, 0xe5, 0xae, 0x57, 0x84, 0x27, 0xf4, 0xb9, 0xdd, 0x5a, 0xd0, 0x92, 0x3c, 0xa1, 0xaa, 0x27, - 0x6d, 0xfa, 0xbe, 0x76, 0x29, 0x65, 0xca, 0xed, 0x19, 0x5c, 0x04, 0x25, 0xca, 0x68, 0x7c, 0x82, - 0xd7, 0xb5, 0x22, 0x06, 0x68, 0xbb, 0xb6, 0xbb, 0xb0, 0x89, 0xde, 0xc0, 0x5d, 0x78, 0x39, 0x5f, - 0xba, 0x8e, 0xa7, 0xa3, 0xc5, 0x97, 0xed, 0xe4, 0xc8, 0x8a, 0xd3, 0x79, 0x57, 0x06, 0x5a, 0xa7, - 0x8b, 0xa0, 0x32, 0xa1, 0xfb, 0x23, 0x95, 0xd6, 0x21, 0xda, 0x49, 0x16, 0x5b, 0x6a, 0x7f, 0xf2, - 0x72, 0xa9, 0x76, 0x6d, 0xf5, 0x3e, 0xfb, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x80, 0x80, 0x30, 0x7e, - 0x66, 0x02, 0x00, 0x00, +func init() { proto.RegisterFile("msp/msp_principal.proto", fileDescriptor2) } + +var fileDescriptor2 = []byte{ + // 386 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0x8e, 0x93, 0x40, + 0x14, 0x87, 0x77, 0xea, 0x5a, 0xb7, 0xc7, 0x4a, 0x70, 0xe2, 0x66, 0x9b, 0xb8, 0x31, 0x1b, 0xac, + 0x49, 0xaf, 0x20, 0x69, 0x1f, 0xc0, 0xb4, 0x96, 0x18, 0x12, 0xf9, 0x93, 0x29, 0xbd, 0xb0, 0x17, + 0x12, 0x4a, 0xa7, 0x74, 0x12, 0x60, 0x26, 0x03, 0xbd, 0xa8, 0x2f, 0xe0, 0x0b, 0xf9, 0x1a, 0xbe, + 0x93, 0x01, 0x2c, 0x9d, 0x7a, 0xb5, 0x57, 0x30, 0xe7, 0xf7, 0x7d, 0x67, 0x66, 0xe0, 0xc0, 0x43, + 0x5e, 0x0a, 0x2b, 0x2f, 0x45, 0x24, 0x24, 0x2b, 0x12, 0x26, 0xe2, 0xcc, 0x14, 0x92, 0x57, 0x1c, + 0xf7, 0x13, 0x9e, 0xe7, 0xbc, 0x30, 0xfe, 0x20, 0x18, 0xba, 0xab, 0x20, 0x38, 0xc7, 0xf8, 0x07, + 0x8c, 0x3a, 0x36, 0x4a, 0xb2, 0xb8, 0x2c, 0xd9, 0x9e, 0x25, 0x71, 0xc5, 0x78, 0x31, 0x42, 0x4f, + 0x68, 0xa2, 0x4d, 0x3f, 0x9a, 0xad, 0x6b, 0xaa, 0x9e, 0xf9, 0xe5, 0x0a, 0x25, 0x0f, 0x5d, 0x93, + 0xeb, 0x00, 0x3f, 0xc2, 0xa0, 0x8b, 0x46, 0xbd, 0x27, 0x34, 0x19, 0x92, 0x4b, 0xc1, 0xf8, 0x0c, + 0xda, 0x7f, 0xfc, 0x1d, 0xdc, 0x12, 0xff, 0x9b, 0xad, 0xdf, 0xe0, 0x7b, 0x78, 0xeb, 0x93, 0xaf, + 0x73, 0xcf, 0xd9, 0xcc, 0x43, 0xc7, 0xf7, 0xa2, 0xb5, 0xe7, 0x84, 0x3a, 0xc2, 0x43, 0xb8, 0x73, + 0x96, 0xb6, 0x17, 0x3a, 0xe1, 0x77, 0xbd, 0x67, 0xfc, 0x46, 0xa0, 0xfb, 0x32, 0x8d, 0x0b, 0xf6, + 0xb3, 0xf1, 0xd7, 0x05, 0xab, 0xf0, 0x27, 0xd0, 0xea, 0x6f, 0xc0, 0x76, 0xb4, 0xa8, 0xd8, 0x9e, + 0x51, 0xd9, 0xdc, 0x64, 0x40, 0xde, 0xe4, 0xa5, 0x70, 0xba, 0x22, 0x5e, 0xc2, 0x07, 0xae, 0xa8, + 0x71, 0x16, 0x1d, 0x0b, 0x56, 0xa9, 0x5a, 0xaf, 0xd1, 0x1e, 0xaf, 0xa9, 0x7a, 0x0b, 0xa5, 0xcb, + 0x0c, 0xee, 0x13, 0x2a, 0xdb, 0x45, 0xa9, 0xca, 0x2f, 0x9a, 0xcb, 0xbe, 0xbb, 0x84, 0x17, 0xc9, + 0xf8, 0x85, 0xe0, 0x95, 0xbb, 0x0a, 0x08, 0xcf, 0xe8, 0x73, 0x4f, 0x6b, 0xc1, 0xad, 0xe4, 0x19, + 0x6d, 0xce, 0xa4, 0x4d, 0xdf, 0x2b, 0x3f, 0xa5, 0xee, 0x72, 0x7e, 0x86, 0x27, 0x41, 0x49, 0x03, + 0x1a, 0x63, 0x78, 0xad, 0x14, 0x31, 0x40, 0xdf, 0xb5, 0xdd, 0x85, 0x4d, 0xf4, 0x1b, 0x3c, 0x80, + 0x97, 0xf3, 0xa5, 0xeb, 0x78, 0x3a, 0x5a, 0x04, 0x30, 0xe6, 0x32, 0x35, 0x0f, 0x27, 0x41, 0x65, + 0x46, 0x77, 0x29, 0x95, 0xe6, 0x3e, 0xde, 0x4a, 0x96, 0xb4, 0x83, 0x53, 0xfe, 0xdb, 0x67, 0x33, + 0x49, 0x59, 0x75, 0x38, 0x6e, 0xeb, 0xa5, 0xa5, 0xc0, 0x56, 0x0b, 0x5b, 0x2d, 0x5c, 0x8f, 0xde, + 0xb6, 0xdf, 0xbc, 0xcf, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xd3, 0xfe, 0xdb, 0x8c, 0x02, + 0x00, 0x00, } diff --git a/protos/msp/msp_principal.proto b/protos/msp/msp_principal.proto index 663966665ea..d9e3cec43bd 100644 --- a/protos/msp/msp_principal.proto +++ b/protos/msp/msp_principal.proto @@ -18,6 +18,7 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/msp"; +option java_package = "org.hyperledger.fabric.protos.common"; package common; diff --git a/protos/orderer/ab.pb.go b/protos/orderer/ab.pb.go index 9e36b97e07b..2c9041f5be9 100644 --- a/protos/orderer/ab.pb.go +++ b/protos/orderer/ab.pb.go @@ -597,35 +597,36 @@ var _AtomicBroadcast_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("orderer/ab.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 480 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x93, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xc7, 0x63, 0x48, 0xdd, 0x76, 0x68, 0xd3, 0x74, 0xab, 0x56, 0x51, 0x0e, 0x08, 0x59, 0x02, - 0x82, 0x00, 0x1b, 0x05, 0x89, 0x03, 0x45, 0x42, 0x31, 0x6d, 0x95, 0x88, 0x28, 0x41, 0x4e, 0x38, - 0xc0, 0x25, 0xf2, 0xc7, 0xa4, 0x31, 0x75, 0xbc, 0xd6, 0xee, 0x26, 0xa8, 0x4f, 0xc1, 0x8b, 0xf0, - 0x48, 0x3c, 0x0c, 0xda, 0x0f, 0x3b, 0x0a, 0x14, 0x4e, 0xc9, 0xcc, 0xfc, 0xfe, 0xb3, 0xff, 0x19, - 0x8d, 0xa1, 0x49, 0x59, 0x82, 0x0c, 0x99, 0x17, 0x46, 0x6e, 0xc1, 0xa8, 0xa0, 0x64, 0xd7, 0x64, - 0xda, 0x27, 0x31, 0x5d, 0x2e, 0x69, 0xee, 0xe9, 0x1f, 0x5d, 0x75, 0xce, 0xe1, 0xd8, 0x67, 0x34, - 0x4c, 0xe2, 0x90, 0x8b, 0x00, 0x79, 0x41, 0x73, 0x8e, 0xe4, 0x09, 0xd8, 0x5c, 0x84, 0x62, 0xc5, - 0x5b, 0xd6, 0x23, 0xab, 0xd3, 0xe8, 0x36, 0x5c, 0xa3, 0x99, 0xa8, 0x6c, 0x60, 0xaa, 0xce, 0x01, - 0xc0, 0x04, 0xf1, 0x66, 0x84, 0xdf, 0x91, 0x8b, 0x32, 0x1a, 0x67, 0x89, 0x8c, 0x9e, 0xc2, 0xa1, - 0x8c, 0x26, 0x05, 0xc6, 0xe9, 0x3c, 0xc5, 0x84, 0x9c, 0x81, 0x9d, 0xaf, 0x96, 0x11, 0x32, 0xd5, - 0xb4, 0x1e, 0x98, 0xc8, 0xf9, 0x69, 0xc1, 0x81, 0x24, 0x3f, 0x51, 0x9e, 0x8a, 0x94, 0xe6, 0xe4, - 0x25, 0xd8, 0xb9, 0xea, 0xa8, 0xc0, 0x07, 0xdd, 0x13, 0xd7, 0x4c, 0xe0, 0x6e, 0x1e, 0xeb, 0xd7, - 0x02, 0x03, 0x49, 0x9c, 0xaa, 0x27, 0x5b, 0xf7, 0xee, 0xc0, 0xb5, 0x1b, 0x89, 0x6b, 0x88, 0xbc, - 0x81, 0x7d, 0x5e, 0x7a, 0x6a, 0xdd, 0x57, 0x8a, 0xb3, 0x2d, 0x45, 0xe5, 0xb8, 0x5f, 0x0b, 0x36, - 0xa8, 0x6f, 0x43, 0x7d, 0x7a, 0x5b, 0xa0, 0xf3, 0xcb, 0x82, 0x3d, 0x89, 0x0d, 0xf2, 0x39, 0x25, - 0xcf, 0x61, 0x87, 0x8b, 0x90, 0x95, 0x4e, 0x4f, 0xb7, 0x1a, 0x95, 0x03, 0x05, 0x9a, 0x21, 0xcf, - 0xa0, 0xce, 0x05, 0x2d, 0x8c, 0xcd, 0x7f, 0xb0, 0x0a, 0x21, 0x6f, 0x61, 0x2f, 0xc2, 0x45, 0xb8, - 0x4e, 0x29, 0x53, 0x1e, 0x1b, 0xdd, 0x87, 0x5b, 0xb8, 0x7c, 0x5c, 0xfd, 0xf1, 0x0d, 0x15, 0x54, - 0xbc, 0xf3, 0x4e, 0xaf, 0xb3, 0xac, 0x90, 0x53, 0x38, 0xf6, 0x87, 0xe3, 0x0f, 0x1f, 0x67, 0x9f, - 0x47, 0xd3, 0xc1, 0x70, 0x16, 0x5c, 0xf6, 0x2e, 0xbe, 0x34, 0x6b, 0x32, 0x7d, 0xd5, 0x1b, 0x0c, - 0x67, 0x83, 0xab, 0xd9, 0x68, 0x3c, 0x35, 0x69, 0xcb, 0xf9, 0x06, 0x47, 0x17, 0x98, 0xa5, 0x6b, - 0x64, 0xd5, 0x35, 0x74, 0xfe, 0x7f, 0x0d, 0x72, 0xb7, 0xba, 0x4e, 0x1e, 0xc3, 0x4e, 0x94, 0xd1, - 0xf8, 0xc6, 0x8c, 0x78, 0x58, 0x82, 0xbe, 0x4c, 0xf6, 0x6b, 0x81, 0xae, 0x96, 0xab, 0xec, 0xfe, - 0xb0, 0xe0, 0xa8, 0x27, 0xe8, 0x32, 0x8d, 0xab, 0x13, 0x24, 0xef, 0x61, 0x7f, 0x13, 0x34, 0xcb, - 0x06, 0x97, 0xf9, 0x1a, 0x33, 0x5a, 0x60, 0xbb, 0x5d, 0xad, 0xe1, 0xaf, 0xab, 0x75, 0x6a, 0x1d, - 0xeb, 0x95, 0x45, 0xce, 0x61, 0xd7, 0x0c, 0x70, 0x87, 0xbc, 0x55, 0xc9, 0xff, 0x18, 0x52, 0x8b, - 0x7d, 0xf7, 0xeb, 0x8b, 0xeb, 0x54, 0x2c, 0x56, 0x91, 0x54, 0x7a, 0x8b, 0xdb, 0x02, 0x59, 0x86, - 0xc9, 0x35, 0x32, 0x6f, 0x1e, 0x46, 0x2c, 0x8d, 0x3d, 0xf5, 0xd1, 0x70, 0xcf, 0x74, 0x89, 0x6c, - 0x15, 0xbf, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x79, 0xcc, 0xb7, 0x76, 0x03, 0x00, 0x00, + // 492 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x93, 0xdb, 0x6e, 0xd3, 0x4c, + 0x10, 0xc7, 0xe3, 0xef, 0x4b, 0xd3, 0x76, 0x68, 0xd3, 0x74, 0xab, 0x56, 0x51, 0x2e, 0x10, 0xb2, + 0x54, 0x08, 0x02, 0x6c, 0x14, 0x24, 0x2e, 0x28, 0x12, 0x8a, 0x69, 0xab, 0x44, 0x44, 0x09, 0x72, + 0xd2, 0x0b, 0xb8, 0x89, 0x7c, 0x98, 0x24, 0xa6, 0x8e, 0xd7, 0xda, 0xdd, 0x04, 0xf5, 0x29, 0x78, + 0x11, 0x1e, 0x89, 0x87, 0x41, 0x7b, 0xb0, 0x43, 0xa0, 0x70, 0x65, 0xcf, 0xcc, 0xef, 0x3f, 0x27, + 0xcd, 0x42, 0x83, 0xb2, 0x18, 0x19, 0x32, 0x37, 0x08, 0x9d, 0x9c, 0x51, 0x41, 0xc9, 0xae, 0xf1, + 0xb4, 0x4e, 0x22, 0xba, 0x5c, 0xd2, 0xcc, 0xd5, 0x1f, 0x1d, 0xb5, 0x2f, 0xe0, 0xd8, 0x63, 0x34, + 0x88, 0xa3, 0x80, 0x0b, 0x1f, 0x79, 0x4e, 0x33, 0x8e, 0xe4, 0x31, 0xd4, 0xb8, 0x08, 0xc4, 0x8a, + 0x37, 0xad, 0x47, 0x56, 0xbb, 0xde, 0xa9, 0x3b, 0x46, 0x33, 0x56, 0x5e, 0xdf, 0x44, 0xed, 0x03, + 0x80, 0x31, 0xe2, 0xed, 0x10, 0xbf, 0x22, 0x17, 0x85, 0x35, 0x4a, 0x63, 0x69, 0x3d, 0x81, 0x43, + 0x69, 0x8d, 0x73, 0x8c, 0x92, 0x59, 0x82, 0x31, 0x39, 0x83, 0x5a, 0xb6, 0x5a, 0x86, 0xc8, 0x54, + 0xd2, 0xaa, 0x6f, 0x2c, 0xfb, 0xbb, 0x05, 0x07, 0x92, 0xfc, 0x48, 0x79, 0x22, 0x12, 0x9a, 0x91, + 0x17, 0x50, 0xcb, 0x54, 0x46, 0x05, 0x3e, 0xe8, 0x9c, 0x38, 0x66, 0x02, 0x67, 0x53, 0xac, 0x57, + 0xf1, 0x0d, 0x24, 0x71, 0xaa, 0x4a, 0x36, 0xff, 0xbb, 0x07, 0xd7, 0xdd, 0x48, 0x5c, 0x43, 0xe4, + 0x35, 0xec, 0xf3, 0xa2, 0xa7, 0xe6, 0xff, 0x4a, 0x71, 0xb6, 0xa5, 0x28, 0x3b, 0xee, 0x55, 0xfc, + 0x0d, 0xea, 0xd5, 0xa0, 0x3a, 0xb9, 0xcb, 0xd1, 0xfe, 0x61, 0xc1, 0x9e, 0xc4, 0xfa, 0xd9, 0x8c, + 0x92, 0x67, 0xb0, 0xc3, 0x45, 0xc0, 0x8a, 0x4e, 0x4f, 0xb7, 0x12, 0x15, 0x03, 0xf9, 0x9a, 0x21, + 0x4f, 0xa1, 0xca, 0x05, 0xcd, 0x4d, 0x9b, 0x7f, 0x61, 0x15, 0x42, 0xde, 0xc0, 0x5e, 0x88, 0x8b, + 0x60, 0x9d, 0x50, 0xa6, 0x7a, 0xac, 0x77, 0x1e, 0x6e, 0xe1, 0xb2, 0xb8, 0xfa, 0xf1, 0x0c, 0xe5, + 0x97, 0xbc, 0xfd, 0x56, 0xaf, 0xb3, 0x88, 0x90, 0x53, 0x38, 0xf6, 0x06, 0xa3, 0xf7, 0x1f, 0xa6, + 0x37, 0xc3, 0x49, 0x7f, 0x30, 0xf5, 0xaf, 0xba, 0x97, 0x9f, 0x1a, 0x15, 0xe9, 0xbe, 0xee, 0xf6, + 0x07, 0xd3, 0xfe, 0xf5, 0x74, 0x38, 0x9a, 0x18, 0xb7, 0x65, 0x7f, 0x81, 0xa3, 0x4b, 0x4c, 0x93, + 0x35, 0xb2, 0xf2, 0x1a, 0xda, 0xff, 0xbe, 0x06, 0xb9, 0x5b, 0x1d, 0x27, 0xe7, 0xb0, 0x13, 0xa6, + 0x34, 0xba, 0x35, 0x23, 0x1e, 0x16, 0xa0, 0x27, 0x9d, 0xbd, 0x8a, 0xaf, 0xa3, 0xc5, 0x2a, 0x3b, + 0xdf, 0x2c, 0x38, 0xea, 0x0a, 0xba, 0x4c, 0xa2, 0xf2, 0x04, 0xc9, 0x3b, 0xd8, 0xdf, 0x18, 0x8d, + 0x22, 0xc1, 0x55, 0xb6, 0xc6, 0x94, 0xe6, 0xd8, 0x6a, 0x95, 0x6b, 0xf8, 0xe3, 0x6a, 0xed, 0x4a, + 0xdb, 0x7a, 0x69, 0x91, 0x0b, 0xd8, 0x35, 0x03, 0xdc, 0x23, 0x6f, 0x96, 0xf2, 0xdf, 0x86, 0xd4, + 0x62, 0xef, 0x06, 0xce, 0x29, 0x9b, 0x3b, 0x8b, 0xbb, 0x1c, 0x59, 0x8a, 0xf1, 0x1c, 0x99, 0x33, + 0x0b, 0x42, 0x96, 0x44, 0xfa, 0xb5, 0xf0, 0x42, 0xfe, 0xf9, 0xf9, 0x3c, 0x11, 0x8b, 0x55, 0x28, + 0x0b, 0xb8, 0xbf, 0xd0, 0xae, 0xa6, 0x5d, 0x4d, 0xbb, 0x86, 0x0e, 0x6b, 0xca, 0x7e, 0xf5, 0x33, + 0x00, 0x00, 0xff, 0xff, 0xee, 0xc5, 0xfc, 0x14, 0x9d, 0x03, 0x00, 0x00, } diff --git a/protos/orderer/ab.proto b/protos/orderer/ab.proto index 20ba6395e58..1ee5017cb03 100644 --- a/protos/orderer/ab.proto +++ b/protos/orderer/ab.proto @@ -19,6 +19,7 @@ syntax = "proto3"; import "common/common.proto"; option go_package = "github.com/hyperledger/fabric/protos/orderer"; +option java_package = "org.hyperledger.fabric.protos.orderer"; package orderer; @@ -26,7 +27,7 @@ message BroadcastResponse { common.Status status = 1; } -message SeekNewest { } +message SeekNewest { } message SeekOldest { } diff --git a/protos/orderer/configuration.pb.go b/protos/orderer/configuration.pb.go index f1b3be10734..96f97ae40ef 100644 --- a/protos/orderer/configuration.pb.go +++ b/protos/orderer/configuration.pb.go @@ -116,26 +116,27 @@ func init() { func init() { proto.RegisterFile("orderer/configuration.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 333 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x91, 0x5f, 0x6b, 0xa3, 0x40, - 0x14, 0xc5, 0x71, 0x93, 0x4d, 0xd6, 0xcb, 0x66, 0xff, 0xcc, 0x2e, 0x45, 0xc8, 0x4b, 0xb0, 0x2f, - 0x52, 0x42, 0x2c, 0xed, 0x37, 0xd0, 0xc7, 0x92, 0x52, 0x6c, 0x9e, 0xfa, 0x52, 0x46, 0x73, 0xd5, - 0x21, 0x3a, 0x23, 0x77, 0x46, 0xd0, 0x7e, 0x89, 0x7e, 0xe5, 0xe2, 0xc4, 0x04, 0xda, 0xbc, 0x9d, - 0x73, 0xef, 0x0f, 0xe6, 0xcc, 0x3d, 0xb0, 0x54, 0xb4, 0x47, 0x42, 0x0a, 0x33, 0x25, 0x73, 0x51, - 0xb4, 0xc4, 0x8d, 0x50, 0x72, 0xd3, 0x90, 0x32, 0x8a, 0xcd, 0xc7, 0xa5, 0x7f, 0x0d, 0x8b, 0x58, - 0x49, 0x8d, 0x52, 0xb7, 0x7a, 0xd7, 0x37, 0xc8, 0x18, 0x4c, 0x4d, 0xdf, 0xa0, 0xe7, 0xac, 0x9c, - 0xc0, 0x4d, 0xac, 0xf6, 0xdf, 0x1d, 0x70, 0x23, 0x6e, 0xb2, 0xf2, 0x59, 0xbc, 0x21, 0x0b, 0xe0, - 0x77, 0xcd, 0xbb, 0x2d, 0x6a, 0xcd, 0x0b, 0x8c, 0x55, 0x2b, 0x8d, 0x85, 0x17, 0xc9, 0xd7, 0x31, - 0xbb, 0x81, 0x3f, 0x3c, 0xd5, 0xaa, 0x6a, 0x0d, 0x6e, 0x79, 0x17, 0xf5, 0x06, 0xb5, 0xf7, 0xcd, - 0xa2, 0x17, 0x73, 0xb6, 0x86, 0xbf, 0x0d, 0x61, 0x8e, 0x44, 0xb8, 0x3f, 0xc3, 0x13, 0x0b, 0x5f, - 0x2e, 0xfc, 0x00, 0x7e, 0xda, 0x40, 0x3b, 0x51, 0xa3, 0x6a, 0x0d, 0xf3, 0x60, 0x6e, 0x8e, 0x72, - 0x0c, 0x7e, 0xb2, 0x7e, 0x00, 0xbf, 0x62, 0x42, 0xfb, 0xf7, 0x27, 0x55, 0x89, 0xac, 0x67, 0x57, - 0x30, 0x6b, 0xac, 0x1a, 0xd1, 0xd1, 0xf9, 0xb7, 0xe0, 0xc5, 0x25, 0x17, 0xf2, 0x33, 0xfe, 0xc8, - 0x6b, 0xd4, 0xec, 0x3f, 0x7c, 0x97, 0x83, 0xf0, 0x9c, 0xd5, 0x24, 0x70, 0x93, 0xa3, 0x19, 0x52, - 0x3c, 0xf0, 0xfc, 0xc0, 0x23, 0x52, 0x07, 0x24, 0x3d, 0xa4, 0x48, 0x8f, 0x72, 0xe4, 0x4e, 0xd6, - 0xbf, 0x83, 0x7f, 0x71, 0xc9, 0xa5, 0xc4, 0x2a, 0x41, 0x6d, 0x48, 0x64, 0xc3, 0x03, 0x9a, 0x2d, - 0xc1, 0xad, 0x79, 0xf7, 0x9a, 0x9d, 0x8f, 0x38, 0x4d, 0x7e, 0xd4, 0xbc, 0xb3, 0xd7, 0x8b, 0x36, - 0x2f, 0xeb, 0x42, 0x98, 0xb2, 0x4d, 0x37, 0x99, 0xaa, 0xc3, 0xb2, 0x6f, 0x90, 0x2a, 0xdc, 0x17, - 0x48, 0x61, 0xce, 0x53, 0x12, 0x59, 0x68, 0xab, 0xd4, 0xe1, 0x58, 0x65, 0x3a, 0xb3, 0xfe, 0xfe, - 0x23, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x81, 0xdc, 0xdc, 0xf9, 0x01, 0x00, 0x00, + // 347 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x91, 0x5f, 0x8b, 0x9b, 0x40, + 0x14, 0xc5, 0xb1, 0x49, 0x93, 0x7a, 0x69, 0xfa, 0x67, 0x5a, 0x8a, 0x90, 0x97, 0x60, 0x29, 0x48, + 0x09, 0x5a, 0xda, 0x6f, 0xa0, 0x8f, 0x25, 0xa5, 0xd8, 0xf4, 0xa5, 0x2f, 0x65, 0x34, 0x57, 0x1d, + 0xa2, 0x33, 0x72, 0x67, 0x04, 0xdd, 0x2f, 0xb1, 0x5f, 0x79, 0x71, 0x34, 0x61, 0x77, 0xf3, 0x76, + 0xce, 0xbd, 0x3f, 0x98, 0x33, 0xf7, 0xc0, 0x56, 0xd1, 0x09, 0x09, 0x29, 0xca, 0x95, 0x2c, 0x44, + 0xd9, 0x11, 0x37, 0x42, 0xc9, 0xb0, 0x25, 0x65, 0x14, 0x5b, 0xcf, 0x4b, 0xff, 0x33, 0x6c, 0x12, + 0x25, 0x35, 0x4a, 0xdd, 0xe9, 0xe3, 0xd0, 0x22, 0x63, 0xb0, 0x34, 0x43, 0x8b, 0x9e, 0xb3, 0x73, + 0x02, 0x37, 0xb5, 0xda, 0xbf, 0x77, 0xc0, 0x8d, 0xb9, 0xc9, 0xab, 0x3f, 0xe2, 0x0e, 0x59, 0x00, + 0x6f, 0x1b, 0xde, 0x1f, 0x50, 0x6b, 0x5e, 0x62, 0xa2, 0x3a, 0x69, 0x2c, 0xbc, 0x49, 0x9f, 0x8f, + 0xd9, 0x57, 0x78, 0xc7, 0x33, 0xad, 0xea, 0xce, 0xe0, 0x81, 0xf7, 0xf1, 0x60, 0x50, 0x7b, 0x2f, + 0x2c, 0x7a, 0x33, 0x67, 0x7b, 0x78, 0xdf, 0x12, 0x16, 0x48, 0x84, 0xa7, 0x2b, 0xbc, 0xb0, 0xf0, + 0xed, 0xc2, 0x0f, 0xe0, 0xb5, 0x0d, 0x74, 0x14, 0x0d, 0xaa, 0xce, 0x30, 0x0f, 0xd6, 0x66, 0x92, + 0x73, 0xf0, 0x8b, 0xf5, 0x03, 0x78, 0x93, 0x10, 0xda, 0xbf, 0xff, 0x56, 0xb5, 0xc8, 0x07, 0xf6, + 0x09, 0x56, 0xad, 0x55, 0x33, 0x3a, 0x3b, 0xff, 0x1b, 0x78, 0x49, 0xc5, 0x85, 0x7c, 0x8a, 0xff, + 0xe2, 0x0d, 0x6a, 0xf6, 0x11, 0x5e, 0xca, 0x51, 0x78, 0xce, 0x6e, 0x11, 0xb8, 0xe9, 0x64, 0xc6, + 0x14, 0x3f, 0x79, 0x71, 0xe6, 0x31, 0xa9, 0x33, 0x92, 0x1e, 0x53, 0x64, 0x93, 0x9c, 0xb9, 0x8b, + 0xf5, 0xbf, 0xc3, 0x87, 0xa4, 0xe2, 0x52, 0x62, 0x9d, 0xa2, 0x36, 0x24, 0xf2, 0xf1, 0x01, 0xcd, + 0xb6, 0xe0, 0x36, 0xbc, 0xff, 0x9f, 0x5f, 0x8f, 0xb8, 0x4c, 0x5f, 0x35, 0xbc, 0xb7, 0xd7, 0x8b, + 0xff, 0xc2, 0x17, 0x45, 0x65, 0x58, 0x0d, 0x2d, 0x52, 0x8d, 0xa7, 0x12, 0x29, 0x2c, 0x78, 0x46, + 0x22, 0x9f, 0x3a, 0xd4, 0xe1, 0xdc, 0xe1, 0xbf, 0x7d, 0x29, 0x4c, 0xd5, 0x65, 0x61, 0xae, 0x9a, + 0xe8, 0x11, 0x1d, 0x4d, 0x74, 0x34, 0xd1, 0xd1, 0x4c, 0x67, 0x2b, 0xeb, 0x7f, 0x3c, 0x04, 0x00, + 0x00, 0xff, 0xff, 0xeb, 0x0b, 0x25, 0xfc, 0x20, 0x02, 0x00, 0x00, } diff --git a/protos/orderer/configuration.proto b/protos/orderer/configuration.proto index 7c0b5ced05d..ca383b36608 100644 --- a/protos/orderer/configuration.proto +++ b/protos/orderer/configuration.proto @@ -17,6 +17,7 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/orderer"; +option java_package = "org.hyperledger.fabric.protos.orderer"; package orderer; diff --git a/protos/orderer/kafka.pb.go b/protos/orderer/kafka.pb.go index 9e21b58c736..3be9d5de44b 100644 --- a/protos/orderer/kafka.pb.go +++ b/protos/orderer/kafka.pb.go @@ -224,24 +224,25 @@ func init() { func init() { proto.RegisterFile("orderer/kafka.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 304 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x91, 0x3d, 0x6b, 0xf3, 0x30, - 0x14, 0x85, 0x93, 0x37, 0x21, 0xe1, 0x55, 0xd2, 0x45, 0x21, 0xe0, 0xa1, 0x94, 0x36, 0x53, 0x87, - 0x62, 0x41, 0xba, 0x94, 0x4e, 0x25, 0x59, 0x02, 0xa5, 0x1f, 0x08, 0x4f, 0x5d, 0x8c, 0x2c, 0x5f, - 0x3b, 0xc6, 0x1f, 0x32, 0xd2, 0xf5, 0xe0, 0xff, 0xd8, 0x1f, 0x55, 0x2c, 0xcb, 0x50, 0x8a, 0xc9, - 0x78, 0xef, 0x79, 0x0e, 0xe7, 0xe8, 0x8a, 0x6c, 0x94, 0x8e, 0x41, 0x83, 0x66, 0xb9, 0x48, 0x72, - 0xe1, 0xd7, 0x5a, 0xa1, 0xa2, 0x4b, 0xb7, 0xdc, 0x7d, 0x4f, 0xc9, 0xfa, 0xb5, 0x13, 0xde, 0xc0, - 0x18, 0x91, 0x02, 0x7d, 0x22, 0x4b, 0x0d, 0x69, 0x53, 0x08, 0xed, 0x4d, 0x6f, 0xa7, 0xf7, 0xab, - 0xfd, 0xb5, 0xef, 0x58, 0xff, 0x37, 0xc7, 0x7b, 0xe6, 0x34, 0xe1, 0x03, 0x4e, 0x5f, 0xc8, 0x0a, - 0xb3, 0x12, 0x42, 0x54, 0xa1, 0x6c, 0xd0, 0xfb, 0x67, 0xdd, 0x37, 0xa3, 0xee, 0x20, 0x2b, 0x21, - 0x50, 0xc7, 0x06, 0x4f, 0x13, 0xfe, 0x1f, 0x87, 0xa1, 0xcb, 0x96, 0xaa, 0xaa, 0x40, 0xa2, 0x37, - 0xbb, 0x90, 0x7d, 0xec, 0x99, 0x2e, 0xdb, 0xe1, 0x87, 0x05, 0x99, 0x07, 0x6d, 0x0d, 0x3b, 0x46, - 0x36, 0x23, 0x2d, 0xa9, 0x47, 0x96, 0xb5, 0x68, 0x0b, 0x25, 0x62, 0xfb, 0xa8, 0x35, 0x1f, 0xc6, - 0xdd, 0x33, 0xd9, 0x8e, 0x16, 0xa3, 0x77, 0x64, 0x1d, 0x15, 0x4a, 0xe6, 0x61, 0xd5, 0x94, 0x11, - 0xf4, 0xc7, 0x98, 0xf3, 0x95, 0xdd, 0xbd, 0xdb, 0xd5, 0xdf, 0x30, 0x57, 0xeb, 0x42, 0xd8, 0x91, - 0x5c, 0x39, 0x03, 0x8a, 0x58, 0xa0, 0xa0, 0x7b, 0xb2, 0x2d, 0x84, 0xc1, 0x50, 0x25, 0x89, 0x01, - 0x0c, 0x6b, 0xd0, 0x26, 0x33, 0x08, 0xbd, 0x71, 0xc6, 0x37, 0x9d, 0xf8, 0x61, 0xb5, 0xcf, 0x41, - 0x3a, 0xf8, 0x5f, 0x0f, 0x69, 0x86, 0xe7, 0x26, 0xf2, 0xa5, 0x2a, 0xd9, 0xb9, 0xad, 0x41, 0x17, - 0x10, 0xa7, 0xa0, 0x59, 0x22, 0x22, 0x9d, 0x49, 0x66, 0x7f, 0xd8, 0x30, 0x77, 0xb9, 0x68, 0x61, - 0xe7, 0xc7, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x38, 0x89, 0x66, 0xa4, 0x08, 0x02, 0x00, 0x00, + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x91, 0x4f, 0x6b, 0xc2, 0x40, + 0x10, 0xc5, 0xb5, 0x8a, 0xd2, 0xd1, 0x5e, 0x22, 0x42, 0x0e, 0xa5, 0xb4, 0x42, 0xa1, 0x87, 0x92, + 0x80, 0xbd, 0x94, 0x9e, 0x8a, 0x5e, 0x84, 0xd2, 0x3f, 0x2c, 0xf6, 0xd2, 0x4b, 0xd8, 0x6c, 0x26, + 0x31, 0x98, 0xb8, 0x61, 0x77, 0x72, 0xf0, 0x3b, 0xf6, 0x43, 0x95, 0xec, 0x6e, 0x40, 0x4a, 0xf0, + 0x38, 0xf3, 0x7e, 0x8f, 0xf7, 0x76, 0x16, 0x66, 0x52, 0x25, 0xa8, 0x50, 0x85, 0x7b, 0x9e, 0xee, + 0x79, 0x50, 0x29, 0x49, 0xd2, 0x1b, 0xbb, 0xe5, 0xe2, 0xb7, 0x0f, 0xd3, 0xb7, 0x46, 0x78, 0x47, + 0xad, 0x79, 0x86, 0xde, 0x33, 0x8c, 0x15, 0x66, 0x75, 0xc1, 0x95, 0xdf, 0xbf, 0xed, 0x3f, 0x4c, + 0x96, 0xd7, 0x81, 0x63, 0x83, 0x53, 0x8e, 0x59, 0x66, 0xd3, 0x63, 0x2d, 0xee, 0xbd, 0xc2, 0x84, + 0xf2, 0x12, 0x23, 0x92, 0x91, 0xa8, 0xc9, 0xbf, 0x30, 0xee, 0x9b, 0x4e, 0xf7, 0x36, 0x2f, 0x71, + 0x2b, 0xd7, 0x35, 0x6d, 0x7a, 0xec, 0x92, 0xda, 0xa1, 0xc9, 0x16, 0xf2, 0x70, 0x40, 0x41, 0xfe, + 0xe0, 0x4c, 0xf6, 0xda, 0x32, 0x4d, 0xb6, 0xc3, 0x57, 0x23, 0x18, 0x6e, 0x8f, 0x15, 0x2e, 0x42, + 0x98, 0x75, 0xb4, 0xf4, 0x7c, 0x18, 0x57, 0xfc, 0x58, 0x48, 0x9e, 0x98, 0x47, 0x4d, 0x59, 0x3b, + 0x2e, 0x5e, 0x60, 0xde, 0x59, 0xcc, 0xbb, 0x83, 0x69, 0x5c, 0x48, 0xb1, 0x8f, 0x0e, 0x75, 0x19, + 0xa3, 0x3d, 0xc6, 0x90, 0x4d, 0xcc, 0xee, 0xc3, 0xac, 0xfe, 0x87, 0xb9, 0x5a, 0x67, 0xc2, 0xd6, + 0x70, 0xe5, 0x0c, 0xc4, 0x13, 0x4e, 0xdc, 0x5b, 0xc2, 0xbc, 0xe0, 0x9a, 0x22, 0x99, 0xa6, 0x1a, + 0x29, 0xaa, 0x50, 0xe9, 0x5c, 0x13, 0x5a, 0xe3, 0x80, 0xcd, 0x1a, 0xf1, 0xd3, 0x68, 0x5f, 0xad, + 0xb4, 0xfa, 0x86, 0x7b, 0xa9, 0xb2, 0x60, 0x77, 0xac, 0x50, 0x15, 0x98, 0x64, 0xa8, 0x82, 0x94, + 0xc7, 0x2a, 0x17, 0xf6, 0x6b, 0x75, 0x7b, 0xb2, 0x9f, 0xc7, 0x2c, 0xa7, 0x5d, 0x1d, 0x07, 0x42, + 0x96, 0xe1, 0x09, 0x1d, 0x5a, 0x3a, 0xb4, 0x74, 0xe8, 0xe8, 0x78, 0x64, 0xe6, 0xa7, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x15, 0x78, 0x4d, 0xd8, 0x2f, 0x02, 0x00, 0x00, } diff --git a/protos/orderer/kafka.proto b/protos/orderer/kafka.proto index ac0ee639c1f..1d0dcc35f8c 100644 --- a/protos/orderer/kafka.proto +++ b/protos/orderer/kafka.proto @@ -17,6 +17,7 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/orderer"; +option java_package = "org.hyperledger.fabric.protos.orderer"; package orderer; diff --git a/protos/peer/admin.pb.go b/protos/peer/admin.pb.go index 74ef2c349bd..eda2cf72531 100644 --- a/protos/peer/admin.pb.go +++ b/protos/peer/admin.pb.go @@ -8,8 +8,8 @@ Package peer is a generated protocol buffer package. It is generated from these files: peer/admin.proto peer/chaincode.proto - peer/chaincodeevent.proto - peer/chaincodeshim.proto + peer/chaincode_event.proto + peer/chaincode_shim.proto peer/configuration.proto peer/events.proto peer/peer.proto @@ -369,30 +369,31 @@ var _Admin_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("peer/admin.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 388 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x92, 0xdf, 0x8e, 0xd2, 0x40, - 0x14, 0xc6, 0x29, 0x0a, 0xda, 0x83, 0x7f, 0xc6, 0x89, 0x51, 0x02, 0x31, 0x9a, 0x5e, 0x69, 0x4c, - 0xda, 0x04, 0x2f, 0xbc, 0x50, 0x2f, 0xd0, 0x56, 0x34, 0x42, 0x21, 0x2d, 0xc4, 0xe8, 0x0d, 0x69, - 0xe9, 0xa1, 0x90, 0x4c, 0x99, 0xee, 0xcc, 0x94, 0x84, 0xd7, 0xd9, 0x77, 0xda, 0xf7, 0xd9, 0xb4, - 0x03, 0x61, 0xb3, 0xbb, 0x37, 0xfb, 0xe7, 0xea, 0xf4, 0x9c, 0xf3, 0x9d, 0x2f, 0x9d, 0x5f, 0x3e, - 0x20, 0x39, 0xa2, 0x70, 0xa2, 0x24, 0x5b, 0x6f, 0xec, 0x5c, 0x70, 0xc5, 0x69, 0xb3, 0x2a, 0xb2, - 0xd3, 0x4d, 0x39, 0x4f, 0x19, 0x3a, 0x55, 0x1b, 0x17, 0x4b, 0x07, 0xb3, 0x5c, 0xed, 0xb4, 0xc8, - 0x3a, 0x35, 0xe0, 0x49, 0x88, 0x62, 0x8b, 0x22, 0x54, 0x91, 0x2a, 0x24, 0xfd, 0x0c, 0x4d, 0x59, - 0x7d, 0xb5, 0x8d, 0x77, 0xc6, 0xfb, 0x67, 0xbd, 0xb7, 0x5a, 0x28, 0xed, 0x8b, 0x2a, 0x5b, 0x97, - 0x1f, 0x3c, 0xc1, 0x60, 0x2f, 0xb7, 0xfe, 0x01, 0x1c, 0xa7, 0xf4, 0x29, 0x98, 0x33, 0xdf, 0xf5, - 0x7e, 0xfe, 0xf6, 0x3d, 0x97, 0xd4, 0x68, 0x0b, 0x1e, 0x85, 0xd3, 0x7e, 0x30, 0xf5, 0x5c, 0x62, - 0xe8, 0x66, 0x3c, 0x99, 0x78, 0x2e, 0xa9, 0x53, 0x80, 0xe6, 0xa4, 0x3f, 0x0b, 0x3d, 0x97, 0x3c, - 0xa0, 0x26, 0x34, 0xbc, 0x20, 0x18, 0x07, 0xe4, 0x61, 0xa9, 0x99, 0xf9, 0x7f, 0xfc, 0xf1, 0x5f, - 0x9f, 0x34, 0xac, 0x11, 0x3c, 0x1f, 0xf2, 0x74, 0x88, 0x5b, 0x64, 0x01, 0x9e, 0x14, 0x28, 0x15, - 0x7d, 0x03, 0xc0, 0x78, 0x3a, 0xcf, 0x78, 0x52, 0x30, 0xac, 0x7e, 0xd5, 0x0c, 0x4c, 0xc6, 0xd3, - 0x51, 0x35, 0xa0, 0x5d, 0x28, 0x9b, 0x39, 0x2b, 0x4f, 0xda, 0xf5, 0x6a, 0xfb, 0x98, 0xed, 0x2d, - 0x2c, 0x1f, 0xc8, 0xd1, 0x4e, 0xe6, 0x7c, 0x23, 0xf1, 0x2e, 0x7e, 0xbd, 0xb3, 0x3a, 0x34, 0xfa, - 0x25, 0x78, 0xfa, 0x05, 0xcc, 0x01, 0xaa, 0x3d, 0xc9, 0x57, 0xb6, 0x06, 0x6f, 0x1f, 0xc0, 0xdb, - 0x5e, 0x09, 0xbe, 0xf3, 0xf2, 0x3a, 0xa2, 0x56, 0x8d, 0x7e, 0x83, 0x56, 0xa8, 0x22, 0xa1, 0xf4, - 0xf8, 0xc6, 0xe7, 0x5f, 0x4b, 0xfe, 0x3c, 0xbf, 0xe5, 0xf5, 0x2f, 0x78, 0x31, 0x40, 0xa5, 0x5f, - 0x7b, 0x80, 0x43, 0x5f, 0x1f, 0xc4, 0x97, 0xe8, 0x77, 0xda, 0x57, 0x17, 0x9a, 0xa3, 0x76, 0x0a, - 0xef, 0xc5, 0xe9, 0xfb, 0xc7, 0xff, 0x1f, 0xd2, 0xb5, 0x5a, 0x15, 0xb1, 0xbd, 0xe0, 0x99, 0xb3, - 0xda, 0xe5, 0x28, 0x18, 0x26, 0x29, 0x0a, 0x67, 0x19, 0xc5, 0x62, 0xbd, 0xd0, 0x89, 0x96, 0x4e, - 0x99, 0xfc, 0x58, 0xa7, 0xfd, 0xd3, 0x79, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x24, 0x41, 0xca, - 0x08, 0x03, 0x00, 0x00, + // 409 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40, + 0x10, 0xc6, 0xeb, 0x40, 0x02, 0x9e, 0x16, 0x58, 0x56, 0x08, 0xa2, 0x54, 0x08, 0xe4, 0x13, 0x5c, + 0xd6, 0x52, 0x39, 0x70, 0x00, 0x0e, 0x29, 0x36, 0x05, 0xd1, 0x3a, 0x96, 0xdd, 0x08, 0x81, 0x84, + 0x2a, 0x3b, 0x9e, 0x6e, 0x23, 0xd6, 0x5d, 0xb3, 0xbb, 0xae, 0x94, 0xd7, 0xe1, 0x9d, 0x78, 0x1f, + 0xb4, 0xde, 0x58, 0x89, 0x80, 0x0b, 0x7f, 0x4e, 0xe3, 0x99, 0xf9, 0xbe, 0x4f, 0xf6, 0x4f, 0x1e, + 0x20, 0x0d, 0xa2, 0x0a, 0x8b, 0xaa, 0x5e, 0x5e, 0xb2, 0x46, 0x49, 0x23, 0xe9, 0xa8, 0x2b, 0x7a, + 0xb2, 0xcf, 0xa5, 0xe4, 0x02, 0xc3, 0xae, 0x2d, 0xdb, 0xf3, 0x10, 0xeb, 0xc6, 0xac, 0x9c, 0x28, + 0xf8, 0xe6, 0xc1, 0x5e, 0x8e, 0xea, 0x0a, 0x55, 0x6e, 0x0a, 0xd3, 0x6a, 0xfa, 0x1c, 0x46, 0xba, + 0x7b, 0x1a, 0x7b, 0x8f, 0xbd, 0x27, 0xb7, 0x0f, 0x1e, 0x39, 0xa1, 0x66, 0xdb, 0x2a, 0xe6, 0xca, + 0x6b, 0x59, 0x61, 0xb6, 0x96, 0x07, 0x1f, 0x01, 0x36, 0x53, 0x7a, 0x0b, 0xfc, 0x79, 0x12, 0xc5, + 0x6f, 0xde, 0x25, 0x71, 0x44, 0x76, 0xe8, 0x2e, 0xdc, 0xc8, 0x4f, 0xa7, 0xd9, 0x69, 0x1c, 0x11, + 0xcf, 0x35, 0xb3, 0x34, 0x8d, 0x23, 0x32, 0xa0, 0x00, 0xa3, 0x74, 0x3a, 0xcf, 0xe3, 0x88, 0x5c, + 0xa3, 0x3e, 0x0c, 0xe3, 0x2c, 0x9b, 0x65, 0xe4, 0xba, 0xd5, 0xcc, 0x93, 0xf7, 0xc9, 0xec, 0x43, + 0x42, 0x86, 0xc1, 0x09, 0xdc, 0x39, 0x96, 0xfc, 0x18, 0xaf, 0x50, 0x64, 0xf8, 0xb5, 0x45, 0x6d, + 0xe8, 0x43, 0x00, 0x21, 0xf9, 0x59, 0x2d, 0xab, 0x56, 0x60, 0xf7, 0xaa, 0x7e, 0xe6, 0x0b, 0xc9, + 0x4f, 0xba, 0x01, 0xdd, 0x07, 0xdb, 0x9c, 0x09, 0x6b, 0x19, 0x0f, 0xba, 0xed, 0x4d, 0xb1, 0x8e, + 0x08, 0x12, 0x20, 0x9b, 0x38, 0xdd, 0xc8, 0x4b, 0x8d, 0xff, 0x92, 0x77, 0xf0, 0x7d, 0x00, 0xc3, + 0xa9, 0x05, 0x4f, 0x5f, 0x80, 0x7f, 0x84, 0x66, 0x4d, 0xf2, 0x3e, 0x73, 0xe0, 0x59, 0x0f, 0x9e, + 0xc5, 0x16, 0xfc, 0xe4, 0xde, 0xef, 0x88, 0x06, 0x3b, 0xf4, 0x15, 0xec, 0xe6, 0xa6, 0x50, 0xc6, + 0x8d, 0xff, 0xd8, 0xfe, 0xd2, 0xf2, 0x97, 0xcd, 0x5f, 0xba, 0xdf, 0xc2, 0xdd, 0x23, 0x34, 0xee, + 0x6b, 0x7b, 0x38, 0xf4, 0x41, 0x2f, 0xfe, 0x89, 0xfe, 0x64, 0xfc, 0xeb, 0xc2, 0x71, 0x74, 0x49, + 0xf9, 0x7f, 0x49, 0x3a, 0xfc, 0x0c, 0x81, 0x54, 0x9c, 0x5d, 0xac, 0x1a, 0x54, 0x02, 0x2b, 0x8e, + 0x8a, 0x9d, 0x17, 0xa5, 0x5a, 0x2e, 0x7a, 0x8f, 0xfd, 0xe5, 0x0f, 0xf7, 0x3a, 0xf4, 0x69, 0xb1, + 0xf8, 0x52, 0x70, 0xfc, 0xf4, 0x94, 0x2f, 0xcd, 0x45, 0x5b, 0xb2, 0x85, 0xac, 0xc3, 0x2d, 0x63, + 0xe8, 0x8c, 0xee, 0x06, 0x74, 0x68, 0x8d, 0xa5, 0xbb, 0x8f, 0x67, 0x3f, 0x02, 0x00, 0x00, 0xff, + 0xff, 0xc1, 0x51, 0x29, 0x73, 0x3a, 0x03, 0x00, 0x00, } diff --git a/protos/peer/admin.proto b/protos/peer/admin.proto index 9fd9df72a46..05cbbcf1f18 100644 --- a/protos/peer/admin.proto +++ b/protos/peer/admin.proto @@ -16,6 +16,8 @@ limitations under the License. syntax = "proto3"; +option java_package = "org.hyperledger.fabric.protos.peer"; +option java_outer_classname = "AdminPackage"; option go_package = "github.com/hyperledger/fabric/protos/peer"; package protos; diff --git a/protos/peer/chaincode.pb.go b/protos/peer/chaincode.pb.go index 05b5959ef37..b260a45a8cf 100644 --- a/protos/peer/chaincode.pb.go +++ b/protos/peer/chaincode.pb.go @@ -219,42 +219,42 @@ func init() { func init() { proto.RegisterFile("peer/chaincode.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 585 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x53, 0x5d, 0x6f, 0xd3, 0x30, - 0x14, 0x5d, 0xd6, 0xee, 0xeb, 0xf6, 0x83, 0x60, 0xc6, 0xa8, 0xf6, 0xc2, 0x88, 0x78, 0x18, 0x13, - 0x4a, 0xa5, 0x32, 0xf1, 0x84, 0x90, 0xb2, 0x24, 0x9b, 0x02, 0xa5, 0x9d, 0xb2, 0x0e, 0x09, 0x5e, - 0x2a, 0x37, 0xb9, 0x4d, 0x2d, 0x52, 0x3b, 0x4a, 0xdc, 0x68, 0x7d, 0xe6, 0x7f, 0xf1, 0xd7, 0x40, - 0x76, 0xd6, 0x6e, 0xd3, 0xf6, 0xc8, 0x93, 0xed, 0xe3, 0x73, 0xec, 0x73, 0x8f, 0xee, 0x85, 0xfd, - 0x0c, 0x31, 0xef, 0x46, 0x33, 0xca, 0x78, 0x24, 0x62, 0xb4, 0xb3, 0x5c, 0x48, 0x41, 0xb6, 0xf5, - 0x52, 0x1c, 0xbe, 0x4e, 0x84, 0x48, 0x52, 0xec, 0xea, 0xe3, 0x64, 0x31, 0xed, 0x4a, 0x36, 0xc7, - 0x42, 0xd2, 0x79, 0x56, 0x11, 0xad, 0x21, 0x34, 0xdc, 0x95, 0x36, 0xf0, 0x08, 0x81, 0x7a, 0x46, - 0xe5, 0xac, 0x63, 0x1c, 0x19, 0xc7, 0x7b, 0xa1, 0xde, 0x2b, 0x8c, 0xd3, 0x39, 0x76, 0x36, 0x2b, - 0x4c, 0xed, 0x49, 0x07, 0x76, 0x4a, 0xcc, 0x0b, 0x26, 0x78, 0xa7, 0xa6, 0xe1, 0xd5, 0xd1, 0x7a, - 0x0b, 0xed, 0xbb, 0x07, 0x79, 0xb6, 0x90, 0x4a, 0x4f, 0xf3, 0xa4, 0xe8, 0x18, 0x47, 0xb5, 0xe3, - 0x66, 0xa8, 0xf7, 0xd6, 0x5f, 0x03, 0x5a, 0x6b, 0xda, 0x55, 0x86, 0x11, 0xb1, 0xa1, 0x2e, 0x97, - 0x19, 0xea, 0x9f, 0xdb, 0xbd, 0xc3, 0xca, 0x5e, 0x61, 0x3f, 0x20, 0xd9, 0xa3, 0x65, 0x86, 0xa1, - 0xe6, 0x91, 0x8f, 0xd0, 0x5c, 0x17, 0x3d, 0x66, 0xb1, 0x76, 0xd7, 0xe8, 0xbd, 0x78, 0xa4, 0x0b, - 0xbc, 0xb0, 0xb1, 0x26, 0x06, 0x31, 0x79, 0x0f, 0x5b, 0x4c, 0xd9, 0xd2, 0xbe, 0x1b, 0xbd, 0x83, - 0xc7, 0x02, 0x75, 0x1b, 0x56, 0x24, 0x55, 0xa7, 0x4a, 0x4c, 0x2c, 0x64, 0xa7, 0x7e, 0x64, 0x1c, - 0x6f, 0x85, 0xab, 0xa3, 0xf5, 0x19, 0xea, 0xca, 0x0d, 0x69, 0xc1, 0xde, 0xf5, 0xc0, 0xf3, 0xcf, - 0x83, 0x81, 0xef, 0x99, 0x1b, 0x04, 0x60, 0xfb, 0x62, 0xd8, 0x77, 0x06, 0x17, 0xa6, 0x41, 0x76, - 0xa1, 0x3e, 0x18, 0x7a, 0xbe, 0xb9, 0x49, 0x76, 0xa0, 0xe6, 0x3a, 0xa1, 0x59, 0x53, 0xd0, 0x17, - 0xe7, 0xbb, 0x63, 0xd6, 0xad, 0x3f, 0x9b, 0xf0, 0x6a, 0xfd, 0xa7, 0x87, 0x59, 0x2a, 0x96, 0x73, - 0xe4, 0x52, 0x67, 0xf1, 0x09, 0xda, 0x77, 0xb5, 0x15, 0x19, 0x46, 0x3a, 0x95, 0x46, 0xef, 0xe5, - 0x93, 0xa9, 0x84, 0xad, 0xe8, 0x41, 0x92, 0x0e, 0xb4, 0x71, 0x3a, 0xc5, 0x48, 0xb2, 0x12, 0xc7, - 0x31, 0x95, 0x78, 0x9b, 0xcd, 0xa1, 0x5d, 0x35, 0x83, 0xbd, 0x6a, 0x06, 0x7b, 0xb4, 0x6a, 0x86, - 0xb0, 0xb5, 0x56, 0x78, 0x54, 0x22, 0x79, 0x03, 0x4d, 0xfd, 0x77, 0x46, 0xa3, 0x5f, 0x34, 0x41, - 0x9d, 0x55, 0x33, 0x6c, 0x28, 0xec, 0xb2, 0x82, 0xc8, 0x10, 0x76, 0xf1, 0x06, 0xa3, 0x31, 0xf2, - 0x52, 0x47, 0xd3, 0xee, 0x9d, 0x3e, 0x72, 0xf7, 0xb0, 0x2c, 0xdb, 0xbf, 0xc1, 0x68, 0x21, 0x99, - 0xe0, 0x3e, 0x2f, 0x59, 0x2e, 0xb8, 0xba, 0x08, 0x77, 0xd4, 0x2b, 0x3e, 0x2f, 0x2d, 0x1b, 0xf6, - 0x9f, 0x22, 0xa8, 0x44, 0xbd, 0xa1, 0xfb, 0xd5, 0x0f, 0xab, 0x74, 0xaf, 0x7e, 0x5c, 0x8d, 0xfc, - 0x6f, 0xa6, 0x61, 0xfd, 0x36, 0xee, 0x05, 0x18, 0xf0, 0x52, 0x44, 0x54, 0x49, 0xff, 0x43, 0x80, - 0x27, 0xf0, 0x9c, 0xc5, 0xe3, 0x04, 0x39, 0xe6, 0xfa, 0xc9, 0x31, 0x4d, 0x93, 0xdb, 0xee, 0x7f, - 0xc6, 0xe2, 0x8b, 0x35, 0xee, 0xa4, 0xc9, 0xc9, 0x29, 0xec, 0xbb, 0x82, 0x4f, 0x59, 0x8c, 0x5c, - 0x32, 0x9a, 0x32, 0xb9, 0xec, 0x63, 0x89, 0xa9, 0x72, 0x7a, 0x79, 0x7d, 0xd6, 0x0f, 0x5c, 0x73, - 0x83, 0x98, 0xd0, 0x74, 0x87, 0x83, 0xf3, 0xc0, 0xf3, 0x07, 0xa3, 0xc0, 0xe9, 0x9b, 0xc6, 0x99, - 0x0b, 0x07, 0x22, 0x4f, 0xec, 0xd9, 0x32, 0xc3, 0x3c, 0xc5, 0x38, 0xc1, 0xfc, 0xd6, 0xd8, 0xcf, - 0x77, 0x09, 0x93, 0xb3, 0xc5, 0xc4, 0x8e, 0xc4, 0xbc, 0x7b, 0xef, 0xba, 0x3b, 0xa5, 0x93, 0x9c, - 0x45, 0xd5, 0x1c, 0x17, 0x5d, 0x35, 0xf3, 0x93, 0x6a, 0xc6, 0x3f, 0xfc, 0x0b, 0x00, 0x00, 0xff, - 0xff, 0xd7, 0xce, 0x97, 0x9a, 0x02, 0x04, 0x00, 0x00, + // 591 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x5d, 0x6f, 0xd3, 0x3e, + 0x14, 0xc6, 0x97, 0xb5, 0x7b, 0x3b, 0x7d, 0xf9, 0xe7, 0x6f, 0x06, 0x54, 0xbb, 0x61, 0x44, 0x5c, + 0x8c, 0x09, 0xa5, 0x52, 0x99, 0xb8, 0x42, 0x48, 0x59, 0x93, 0x4d, 0x81, 0xd2, 0x4c, 0x59, 0x87, + 0x04, 0x37, 0x95, 0x9b, 0x9c, 0xa6, 0x16, 0xa9, 0x1d, 0x25, 0x6e, 0xb4, 0x5e, 0xf3, 0xbd, 0xf8, + 0x6a, 0x20, 0x3b, 0x6b, 0xb7, 0xa9, 0xbb, 0xe4, 0x2a, 0xf6, 0x93, 0xe7, 0xd8, 0xcf, 0xf9, 0xe9, + 0x18, 0x0e, 0x33, 0xc4, 0xbc, 0x1b, 0xcd, 0x28, 0xe3, 0x91, 0x88, 0xd1, 0xce, 0x72, 0x21, 0x05, + 0xd9, 0xd5, 0x9f, 0xe2, 0xe8, 0x55, 0x22, 0x44, 0x92, 0x62, 0x57, 0x6f, 0x27, 0x8b, 0x69, 0x57, + 0xb2, 0x39, 0x16, 0x92, 0xce, 0xb3, 0xca, 0x68, 0x05, 0xd0, 0xe8, 0xaf, 0x6a, 0x7d, 0x97, 0x10, + 0xa8, 0x67, 0x54, 0xce, 0x3a, 0xc6, 0xb1, 0x71, 0x72, 0x10, 0xea, 0xb5, 0xd2, 0x38, 0x9d, 0x63, + 0x67, 0xbb, 0xd2, 0xd4, 0x9a, 0x74, 0x60, 0xaf, 0xc4, 0xbc, 0x60, 0x82, 0x77, 0x6a, 0x5a, 0x5e, + 0x6d, 0xad, 0x37, 0xd0, 0xbe, 0x3f, 0x90, 0x67, 0x0b, 0xa9, 0xea, 0x69, 0x9e, 0x14, 0x1d, 0xe3, + 0xb8, 0x76, 0xd2, 0x0c, 0xf5, 0xda, 0xfa, 0x63, 0x40, 0x6b, 0x6d, 0xbb, 0xce, 0x30, 0x22, 0x36, + 0xd4, 0xe5, 0x32, 0x43, 0x7d, 0x73, 0xbb, 0x77, 0x54, 0xc5, 0x2b, 0xec, 0x47, 0x26, 0x7b, 0xb4, + 0xcc, 0x30, 0xd4, 0x3e, 0xf2, 0x01, 0x9a, 0xeb, 0xa6, 0xc7, 0x2c, 0xd6, 0xe9, 0x1a, 0xbd, 0x67, + 0x1b, 0x75, 0xbe, 0x1b, 0x36, 0xd6, 0x46, 0x3f, 0x26, 0xef, 0x60, 0x87, 0xa9, 0x58, 0x3a, 0x77, + 0xa3, 0xf7, 0x62, 0xb3, 0x40, 0xfd, 0x0d, 0x2b, 0x93, 0xea, 0x53, 0x11, 0x13, 0x0b, 0xd9, 0xa9, + 0x1f, 0x1b, 0x27, 0x3b, 0xe1, 0x6a, 0x6b, 0x7d, 0x82, 0xba, 0x4a, 0x43, 0x5a, 0x70, 0x70, 0x33, + 0x74, 0xbd, 0x0b, 0x7f, 0xe8, 0xb9, 0xe6, 0x16, 0x01, 0xd8, 0xbd, 0x0c, 0x06, 0xce, 0xf0, 0xd2, + 0x34, 0xc8, 0x3e, 0xd4, 0x87, 0x81, 0xeb, 0x99, 0xdb, 0x64, 0x0f, 0x6a, 0x7d, 0x27, 0x34, 0x6b, + 0x4a, 0xfa, 0xec, 0x7c, 0x73, 0xcc, 0xba, 0xf5, 0x7b, 0x1b, 0x5e, 0xae, 0xef, 0x74, 0x31, 0x4b, + 0xc5, 0x72, 0x8e, 0x5c, 0x6a, 0x16, 0x1f, 0xa1, 0x7d, 0xdf, 0x5b, 0x91, 0x61, 0xa4, 0xa9, 0x34, + 0x7a, 0xcf, 0x9f, 0xa4, 0x12, 0xb6, 0xa2, 0x47, 0x24, 0x1d, 0x68, 0xe3, 0x74, 0x8a, 0x91, 0x64, + 0x25, 0x8e, 0x63, 0x2a, 0xf1, 0x8e, 0xcd, 0x91, 0x5d, 0x0d, 0x83, 0xbd, 0x1a, 0x06, 0x7b, 0xb4, + 0x1a, 0x86, 0xb0, 0xb5, 0xae, 0x70, 0xa9, 0x44, 0xf2, 0x1a, 0x9a, 0xfa, 0xee, 0x8c, 0x46, 0x3f, + 0x69, 0x82, 0x9a, 0x55, 0x33, 0x6c, 0x28, 0xed, 0xaa, 0x92, 0x48, 0x00, 0xfb, 0x78, 0x8b, 0xd1, + 0x18, 0x79, 0xa9, 0xd1, 0xb4, 0x7b, 0x67, 0x1b, 0xe9, 0x1e, 0xb7, 0x65, 0x7b, 0xb7, 0x18, 0x2d, + 0x24, 0x13, 0xdc, 0xe3, 0x25, 0xcb, 0x05, 0x57, 0x3f, 0xc2, 0x3d, 0x75, 0x8a, 0xc7, 0x4b, 0xcb, + 0x86, 0xc3, 0xa7, 0x0c, 0x8a, 0xa8, 0x1b, 0xf4, 0xbf, 0x78, 0x61, 0x45, 0xf7, 0xfa, 0xfb, 0xf5, + 0xc8, 0xfb, 0x6a, 0x1a, 0xd6, 0x2f, 0xe3, 0x01, 0x40, 0x9f, 0x97, 0x22, 0xa2, 0xaa, 0xf4, 0x1f, + 0x00, 0x3c, 0x85, 0xff, 0x59, 0x3c, 0x4e, 0x90, 0x63, 0xae, 0x8f, 0x1c, 0xd3, 0x34, 0xb9, 0x9b, + 0xfe, 0xff, 0x58, 0x7c, 0xb9, 0xd6, 0x9d, 0x34, 0x39, 0x3d, 0x83, 0xc3, 0xbe, 0xe0, 0x53, 0x16, + 0x23, 0x97, 0x8c, 0xa6, 0x4c, 0x2e, 0x07, 0x58, 0x62, 0xaa, 0x92, 0x5e, 0xdd, 0x9c, 0x0f, 0xfc, + 0xbe, 0xb9, 0x45, 0x4c, 0x68, 0xf6, 0x83, 0xe1, 0x85, 0xef, 0x7a, 0xc3, 0x91, 0xef, 0x0c, 0x4c, + 0xe3, 0x3c, 0x00, 0x4b, 0xe4, 0x89, 0x3d, 0x5b, 0x66, 0x98, 0xa7, 0x18, 0x27, 0x98, 0xdb, 0x53, + 0x3a, 0xc9, 0x59, 0xb4, 0xca, 0xa7, 0x1e, 0xf5, 0x8f, 0xb7, 0x09, 0x93, 0xb3, 0xc5, 0xc4, 0x8e, + 0xc4, 0xbc, 0xfb, 0xc0, 0xda, 0xad, 0xac, 0xd5, 0x9b, 0x2e, 0xba, 0xca, 0x3a, 0xa9, 0xde, 0xfb, + 0xfb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x05, 0x18, 0x06, 0x44, 0x0e, 0x04, 0x00, 0x00, } diff --git a/protos/peer/chaincode.proto b/protos/peer/chaincode.proto index 38c55878e60..ec6e1bb72f0 100644 --- a/protos/peer/chaincode.proto +++ b/protos/peer/chaincode.proto @@ -1,5 +1,5 @@ /* -Copyright IBM Corp. 2016 All Rights Reserved. +Copyright IBM Corp. 2017 All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ limitations under the License. syntax = "proto3"; package protos; -option java_package = "org.hyperledger.protos"; +option java_package = "org.hyperledger.fabric.protos.peer"; option go_package = "github.com/hyperledger/fabric/protos/peer"; import "google/protobuf/timestamp.proto"; @@ -102,4 +102,4 @@ message ChaincodeInvocationSpec { // 2, a decoding used to decode user (string) input to bytes // Currently, SHA256 with BASE64 is supported (e.g. idGenerationAlg='sha256base64') string id_generation_alg = 2; -} \ No newline at end of file +} diff --git a/protos/peer/chaincodeevent.pb.go b/protos/peer/chaincode_event.pb.go similarity index 63% rename from protos/peer/chaincodeevent.pb.go rename to protos/peer/chaincode_event.pb.go index 74785879408..169c03d2851 100644 --- a/protos/peer/chaincodeevent.pb.go +++ b/protos/peer/chaincode_event.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. -// source: peer/chaincodeevent.proto +// source: peer/chaincode_event.proto // DO NOT EDIT! package peer @@ -31,21 +31,22 @@ func init() { proto.RegisterType((*ChaincodeEvent)(nil), "protos.ChaincodeEvent") } -func init() { proto.RegisterFile("peer/chaincodeevent.proto", fileDescriptor2) } +func init() { proto.RegisterFile("peer/chaincode_event.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 200 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, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x53, 0xc5, 0x4a, 0x8d, 0x8c, 0x5c, 0x7c, 0xce, - 0x30, 0x05, 0xae, 0x20, 0x05, 0x42, 0x8a, 0x5c, 0x3c, 0x70, 0x2d, 0xf1, 0x99, 0x29, 0x12, 0x8c, + // 218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2a, 0x48, 0x4d, 0x2d, + 0xd2, 0x4f, 0xce, 0x48, 0xcc, 0xcc, 0x4b, 0xce, 0x4f, 0x49, 0x8d, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, + 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x03, 0x53, 0xc5, 0x4a, 0x8d, 0x8c, 0x5c, 0x7c, + 0xce, 0x30, 0x15, 0xae, 0x20, 0x05, 0x42, 0x8a, 0x5c, 0x3c, 0x08, 0x3d, 0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0xdc, 0x70, 0x31, 0xcf, 0x14, 0x21, 0x61, 0x2e, 0xd6, 0x92, 0x0a, 0x90, 0x1c, 0x13, 0x58, 0x8e, 0xa5, 0xa4, 0xc2, 0x33, 0x45, 0x48, 0x96, 0x8b, 0x0b, 0x6c, 0x43, 0x7c, 0x5e, 0x62, 0x6e, 0xaa, 0x04, 0x33, 0x58, 0x86, 0x13, 0x2c, 0xe2, 0x97, 0x98, 0x9b, 0x2a, 0x24, 0xc1, 0xc5, 0x5e, 0x90, 0x58, 0x99, 0x93, 0x9f, 0x98, 0x22, 0xc1, 0xa2, 0xc0, 0xa8, 0xc1, - 0x13, 0x04, 0xe3, 0x3a, 0x39, 0x73, 0x89, 0xe5, 0x17, 0xa5, 0xeb, 0x65, 0x54, 0x16, 0xa4, 0x16, - 0xe5, 0xa4, 0xa6, 0xa4, 0xa7, 0x16, 0x41, 0x1c, 0x59, 0x1c, 0xa5, 0x99, 0x9e, 0x59, 0x92, 0x51, - 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, 0x24, 0xad, 0x9f, 0x96, 0x98, 0x54, 0x94, 0x99, 0xac, - 0x0f, 0x51, 0xa5, 0x0f, 0xf2, 0x65, 0x12, 0xc4, 0x43, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x42, 0xfc, 0xb9, 0xec, 0xf4, 0x00, 0x00, 0x00, + 0x13, 0x04, 0xe3, 0x3a, 0xa5, 0x71, 0x29, 0xe5, 0x17, 0xa5, 0xeb, 0x65, 0x54, 0x16, 0xa4, 0x16, + 0xe5, 0xa4, 0xa6, 0xa4, 0xa7, 0x16, 0xe9, 0xa5, 0x25, 0x26, 0x15, 0x65, 0x26, 0x43, 0xdc, 0x5a, + 0xac, 0x07, 0xf2, 0x87, 0x93, 0x28, 0xaa, 0x33, 0x03, 0x12, 0x93, 0xb3, 0x13, 0xd3, 0x53, 0xa3, + 0x34, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x91, 0x4c, 0xd0, 0x87, + 0x98, 0xa0, 0x0f, 0x31, 0x41, 0x1f, 0x64, 0x42, 0x12, 0xc4, 0xcf, 0xc6, 0x80, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x4a, 0x9d, 0xa8, 0x17, 0x18, 0x01, 0x00, 0x00, } diff --git a/protos/peer/chaincodeevent.proto b/protos/peer/chaincode_event.proto similarity index 84% rename from protos/peer/chaincodeevent.proto rename to protos/peer/chaincode_event.proto index c11786555ef..87d2a4020b4 100644 --- a/protos/peer/chaincodeevent.proto +++ b/protos/peer/chaincode_event.proto @@ -1,5 +1,5 @@ /* -Copyright IBM Corp. 2016 All Rights Reserved. +Copyright IBM Corp. 2017 All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ limitations under the License. */ syntax = "proto3"; package protos; -option java_package = "org.hyperledger.protos"; +option java_package = "org.hyperledger.fabric.protos.peer"; +option java_outer_classname = "ChaincodeEventPackage"; option go_package = "github.com/hyperledger/fabric/protos/peer"; diff --git a/protos/peer/chaincodeshim.pb.go b/protos/peer/chaincode_shim.pb.go similarity index 72% rename from protos/peer/chaincodeshim.pb.go rename to protos/peer/chaincode_shim.pb.go index 9aae6dc8822..db931a1ef4b 100644 --- a/protos/peer/chaincodeshim.pb.go +++ b/protos/peer/chaincode_shim.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. -// source: peer/chaincodeshim.proto +// source: peer/chaincode_shim.proto // DO NOT EDIT! package peer @@ -330,57 +330,57 @@ var _ChaincodeSupport_serviceDesc = grpc.ServiceDesc{ Metadata: fileDescriptor3, } -func init() { proto.RegisterFile("peer/chaincodeshim.proto", fileDescriptor3) } +func init() { proto.RegisterFile("peer/chaincode_shim.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 777 bytes of a gzipped FileDescriptorProto + // 779 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x94, 0xdd, 0x6e, 0xe2, 0x46, 0x14, 0xc7, 0xd7, 0x40, 0x12, 0x38, 0x49, 0x60, 0x76, 0xb2, 0x4d, 0xbd, 0x48, 0x55, 0xa9, 0x55, - 0x55, 0x54, 0xaa, 0xa0, 0x4d, 0xa5, 0xaa, 0x17, 0x95, 0x2a, 0x02, 0x13, 0x62, 0x41, 0x6c, 0x76, - 0xec, 0x44, 0x4b, 0x6f, 0x2c, 0x07, 0x4f, 0xc0, 0x5a, 0x60, 0x5c, 0xcf, 0xb0, 0x5a, 0x5f, 0xf7, - 0xe1, 0xfa, 0x26, 0x7d, 0x8e, 0x6a, 0xc6, 0x36, 0xc9, 0x36, 0x8a, 0xd4, 0x2b, 0xcf, 0xff, 0x9c, - 0xdf, 0xf9, 0x1a, 0x8d, 0x0f, 0x98, 0x09, 0x63, 0x69, 0x7f, 0xb1, 0x0a, 0xe3, 0xed, 0x82, 0x47, - 0x4c, 0xac, 0xe2, 0x4d, 0x2f, 0x49, 0xb9, 0xe4, 0xf8, 0x50, 0x7f, 0x44, 0xfb, 0xed, 0xe7, 0x04, - 0xfb, 0xc8, 0xb6, 0x32, 0x47, 0xda, 0x67, 0xda, 0x95, 0xa4, 0x3c, 0xe1, 0x22, 0x5c, 0x17, 0xc6, - 0xaf, 0x97, 0x9c, 0x2f, 0xd7, 0xac, 0xaf, 0xd5, 0xfd, 0xee, 0xa1, 0x2f, 0xe3, 0x0d, 0x13, 0x32, - 0xdc, 0x24, 0x39, 0x60, 0xfd, 0x53, 0x03, 0x34, 0x2c, 0xd3, 0xdd, 0x30, 0x21, 0xc2, 0x25, 0xc3, - 0x3f, 0x41, 0x4d, 0x66, 0x09, 0x33, 0x8d, 0x8e, 0xd1, 0x6d, 0x5e, 0x7c, 0x95, 0xa3, 0xa2, 0xf7, - 0x5f, 0xae, 0xe7, 0x67, 0x09, 0xa3, 0x1a, 0xc5, 0xbf, 0x42, 0x63, 0x9f, 0xda, 0xac, 0x74, 0x8c, - 0xee, 0xf1, 0x45, 0xbb, 0x97, 0x17, 0xef, 0x95, 0xc5, 0x7b, 0x7e, 0x49, 0xd0, 0x47, 0x18, 0x9b, - 0x70, 0x94, 0x84, 0xd9, 0x9a, 0x87, 0x91, 0x59, 0xed, 0x18, 0xdd, 0x13, 0x5a, 0x4a, 0x8c, 0xa1, - 0x26, 0x3f, 0xc5, 0x91, 0x59, 0xeb, 0x18, 0xdd, 0x06, 0xd5, 0x67, 0xfc, 0x03, 0xd4, 0xcb, 0x11, - 0xcd, 0x03, 0x5d, 0x06, 0x95, 0xed, 0xcd, 0x0a, 0x3b, 0xdd, 0x13, 0xf8, 0x77, 0x68, 0xed, 0xef, - 0x2a, 0xd0, 0x97, 0x65, 0x1e, 0xea, 0xa0, 0xf3, 0x67, 0x33, 0x11, 0xe5, 0xa5, 0xcd, 0xc5, 0x67, - 0xda, 0xfa, 0xbb, 0x02, 0x35, 0x35, 0x25, 0x3e, 0x85, 0xc6, 0xad, 0x33, 0x22, 0x57, 0xb6, 0x43, - 0x46, 0xe8, 0x15, 0x3e, 0x81, 0x3a, 0x25, 0x63, 0xdb, 0xf3, 0x09, 0x45, 0x06, 0x6e, 0x02, 0x94, - 0x8a, 0x8c, 0x50, 0x05, 0xd7, 0xa1, 0x66, 0x3b, 0xb6, 0x8f, 0xaa, 0xb8, 0x01, 0x07, 0x94, 0x0c, - 0x46, 0x73, 0x54, 0xc3, 0x2d, 0x38, 0xf6, 0xe9, 0xc0, 0xf1, 0x06, 0x43, 0xdf, 0x76, 0x1d, 0x74, - 0xa0, 0x52, 0x0e, 0xdd, 0x9b, 0xd9, 0x94, 0xf8, 0x64, 0x84, 0x0e, 0x15, 0x4a, 0x28, 0x75, 0x29, - 0x3a, 0x52, 0x9e, 0x31, 0xf1, 0x03, 0xcf, 0x1f, 0xf8, 0x04, 0xd5, 0x95, 0x9c, 0xdd, 0x96, 0xb2, - 0xa1, 0xe4, 0x88, 0x4c, 0x0b, 0x09, 0xf8, 0x0d, 0x20, 0xdb, 0xb9, 0x73, 0x27, 0x24, 0x18, 0x5e, - 0x0f, 0x6c, 0x67, 0xe8, 0x8e, 0x08, 0x3a, 0xce, 0x1b, 0xf4, 0x66, 0xae, 0xe3, 0x11, 0x74, 0x8a, - 0xcf, 0x01, 0xef, 0x13, 0x06, 0x97, 0xf3, 0x80, 0x0e, 0x9c, 0x31, 0x41, 0x4d, 0x15, 0xab, 0xec, - 0xef, 0x6e, 0x09, 0x9d, 0x07, 0x94, 0x78, 0xb7, 0x53, 0x1f, 0xb5, 0x94, 0x35, 0xb7, 0xe4, 0xbc, - 0x43, 0xde, 0xfb, 0x08, 0xe1, 0x2f, 0xe0, 0xf5, 0x53, 0xeb, 0x70, 0xea, 0x7a, 0x04, 0xbd, 0x56, - 0xdd, 0x4c, 0x08, 0x99, 0x0d, 0xa6, 0xf6, 0x1d, 0x41, 0x18, 0x7f, 0x09, 0x67, 0x2a, 0xe3, 0xb5, - 0xed, 0xf9, 0x2e, 0x9d, 0x07, 0x57, 0x2e, 0x0d, 0x26, 0x64, 0x8e, 0xce, 0xac, 0x5f, 0xe0, 0x64, - 0xb6, 0x93, 0x9e, 0x0c, 0x25, 0xb3, 0xb7, 0x0f, 0x1c, 0x23, 0xa8, 0x7e, 0x60, 0x99, 0x7e, 0x62, - 0x0d, 0xaa, 0x8e, 0xf8, 0x0d, 0x1c, 0x7c, 0x0c, 0xd7, 0x3b, 0xa6, 0x9f, 0xcf, 0x09, 0xcd, 0x85, - 0x45, 0xa0, 0x35, 0x66, 0x79, 0xdc, 0x65, 0x46, 0xc3, 0xed, 0x92, 0xe1, 0x36, 0xd4, 0x85, 0x0c, - 0x53, 0x39, 0xd9, 0xc7, 0xef, 0x35, 0x3e, 0x87, 0x43, 0xb6, 0x8d, 0x94, 0xa7, 0xa2, 0x3d, 0x85, - 0xb2, 0xbe, 0x83, 0xe6, 0x98, 0xc9, 0x77, 0x3b, 0x96, 0x66, 0x94, 0x89, 0xdd, 0x5a, 0xaa, 0x72, - 0x7f, 0x2a, 0x59, 0xa4, 0xc8, 0x85, 0xf5, 0x2d, 0xa0, 0x31, 0x93, 0xd7, 0xb1, 0x90, 0x3c, 0xcd, - 0xae, 0x78, 0xaa, 0x72, 0x3e, 0x6b, 0xd5, 0xea, 0x40, 0x53, 0xa7, 0xd2, 0x6d, 0x39, 0xec, 0x93, - 0xc4, 0x4d, 0xa8, 0xc4, 0x51, 0x81, 0x54, 0xe2, 0xc8, 0xfa, 0x06, 0x5a, 0x8f, 0xc4, 0x70, 0xcd, - 0x05, 0x7b, 0x86, 0xfc, 0x06, 0xf8, 0x11, 0x99, 0xb0, 0xec, 0x4e, 0xcd, 0xfb, 0xbf, 0xef, 0xe5, - 0x2f, 0xe3, 0x69, 0x38, 0x65, 0x22, 0xe1, 0x5b, 0xc1, 0xf0, 0x25, 0xb4, 0x3e, 0xb0, 0x4c, 0x04, - 0xe1, 0x36, 0x0a, 0x34, 0x28, 0x4c, 0xa3, 0x53, 0xd5, 0x7f, 0x63, 0xf1, 0xe2, 0x9f, 0xd7, 0xa4, - 0xa7, 0x2a, 0x64, 0xb0, 0x8d, 0xb4, 0x12, 0xf8, 0x2d, 0xd4, 0x57, 0xa1, 0x08, 0x36, 0x3c, 0xcd, - 0x6b, 0xd6, 0xe9, 0xd1, 0x2a, 0x14, 0x37, 0x3c, 0x2d, 0x67, 0xa8, 0x96, 0x33, 0x5c, 0xbc, 0x7f, - 0xb2, 0x3d, 0xbc, 0x5d, 0x92, 0xf0, 0x54, 0xe2, 0x11, 0xd4, 0x29, 0x5b, 0xc6, 0x42, 0xb2, 0x14, - 0x9b, 0x2f, 0xed, 0x8e, 0xf6, 0x8b, 0x1e, 0xeb, 0x55, 0xd7, 0xf8, 0xd1, 0xb8, 0x1c, 0xc2, 0x39, - 0x4f, 0x97, 0xbd, 0x55, 0x96, 0xb0, 0x74, 0xcd, 0xa2, 0x25, 0x4b, 0x8b, 0x80, 0x3f, 0xbe, 0x5f, - 0xc6, 0x72, 0xb5, 0xbb, 0xef, 0x2d, 0xf8, 0xa6, 0xff, 0xc4, 0xdd, 0x7f, 0x08, 0xef, 0xd3, 0x78, - 0x91, 0xaf, 0x3a, 0xd1, 0x57, 0xdb, 0xf0, 0x3e, 0x5f, 0x9b, 0x3f, 0xff, 0x1b, 0x00, 0x00, 0xff, - 0xff, 0xfb, 0x9f, 0x18, 0xb2, 0x59, 0x05, 0x00, 0x00, + 0x55, 0x54, 0xaa, 0x4c, 0x9b, 0x4a, 0x55, 0x2f, 0x2a, 0x55, 0x04, 0x26, 0xc4, 0x82, 0xd8, 0xec, + 0xd8, 0x89, 0x96, 0xde, 0x58, 0x0e, 0x9e, 0x18, 0x6b, 0xc1, 0xe3, 0x7a, 0x86, 0xd5, 0xfa, 0xba, + 0x0f, 0xd7, 0x37, 0xe9, 0x73, 0x54, 0x63, 0x63, 0x92, 0x26, 0x5a, 0xa9, 0x57, 0x9e, 0xff, 0x39, + 0xbf, 0xf3, 0x35, 0x1a, 0x1f, 0x78, 0x9b, 0x32, 0x96, 0x0d, 0x96, 0xab, 0x20, 0x4e, 0x96, 0x3c, + 0x64, 0xbe, 0x58, 0xc5, 0x1b, 0x33, 0xcd, 0xb8, 0xe4, 0xf8, 0xb0, 0xf8, 0x88, 0x6e, 0xf7, 0x19, + 0xc2, 0x3e, 0xb2, 0x44, 0x96, 0x4c, 0xf7, 0xac, 0xf0, 0xa5, 0x19, 0x4f, 0xb9, 0x08, 0xd6, 0x3b, + 0xe3, 0xd7, 0x11, 0xe7, 0xd1, 0x9a, 0x0d, 0x0a, 0x75, 0xbf, 0x7d, 0x18, 0xc8, 0x78, 0xc3, 0x84, + 0x0c, 0x36, 0x69, 0x09, 0x18, 0xff, 0x34, 0x00, 0x8d, 0xaa, 0x7c, 0x37, 0x4c, 0x88, 0x20, 0x62, + 0xf8, 0x27, 0x68, 0xc8, 0x3c, 0x65, 0xba, 0xd6, 0xd3, 0xfa, 0xed, 0x8b, 0xaf, 0x4a, 0x54, 0x98, + 0xcf, 0x39, 0xd3, 0xcb, 0x53, 0x46, 0x0b, 0x14, 0xff, 0x0a, 0xad, 0x7d, 0x6a, 0xbd, 0xd6, 0xd3, + 0xfa, 0xc7, 0x17, 0x5d, 0xb3, 0x2c, 0x6e, 0x56, 0xc5, 0x4d, 0xaf, 0x22, 0xe8, 0x23, 0x8c, 0x75, + 0x38, 0x4a, 0x83, 0x7c, 0xcd, 0x83, 0x50, 0xaf, 0xf7, 0xb4, 0xfe, 0x09, 0xad, 0x24, 0xc6, 0xd0, + 0x90, 0x9f, 0xe2, 0x50, 0x6f, 0xf4, 0xb4, 0x7e, 0x8b, 0x16, 0x67, 0xfc, 0x03, 0x34, 0xab, 0x11, + 0xf5, 0x83, 0xa2, 0x0c, 0xaa, 0xda, 0x9b, 0xef, 0xec, 0x74, 0x4f, 0xe0, 0xdf, 0xa1, 0xf3, 0xec, + 0xb2, 0xf4, 0xc3, 0x22, 0xe8, 0xfc, 0xc5, 0x4c, 0x44, 0x79, 0x69, 0x7b, 0xf9, 0x1f, 0x6d, 0xfc, + 0x5d, 0x83, 0x86, 0x9a, 0x12, 0x9f, 0x42, 0xeb, 0xd6, 0x1e, 0x93, 0x2b, 0xcb, 0x26, 0x63, 0xf4, + 0x0a, 0x9f, 0x40, 0x93, 0x92, 0x89, 0xe5, 0x7a, 0x84, 0x22, 0x0d, 0xb7, 0x01, 0x2a, 0x45, 0xc6, + 0xa8, 0x86, 0x9b, 0xd0, 0xb0, 0x6c, 0xcb, 0x43, 0x75, 0xdc, 0x82, 0x03, 0x4a, 0x86, 0xe3, 0x05, + 0x6a, 0xe0, 0x0e, 0x1c, 0x7b, 0x74, 0x68, 0xbb, 0xc3, 0x91, 0x67, 0x39, 0x36, 0x3a, 0x50, 0x29, + 0x47, 0xce, 0xcd, 0x7c, 0x46, 0x3c, 0x32, 0x46, 0x87, 0x0a, 0x25, 0x94, 0x3a, 0x14, 0x1d, 0x29, + 0xcf, 0x84, 0x78, 0xbe, 0xeb, 0x0d, 0x3d, 0x82, 0x9a, 0x4a, 0xce, 0x6f, 0x2b, 0xd9, 0x52, 0x72, + 0x4c, 0x66, 0x3b, 0x09, 0xf8, 0x0d, 0x20, 0xcb, 0xbe, 0x73, 0xa6, 0xc4, 0x1f, 0x5d, 0x0f, 0x2d, + 0x7b, 0xe4, 0x8c, 0x09, 0x3a, 0x2e, 0x1b, 0x74, 0xe7, 0x8e, 0xed, 0x12, 0x74, 0x8a, 0xcf, 0x01, + 0xef, 0x13, 0xfa, 0x97, 0x0b, 0x9f, 0x0e, 0xed, 0x09, 0x41, 0x6d, 0x15, 0xab, 0xec, 0xef, 0x6e, + 0x09, 0x5d, 0xf8, 0x94, 0xb8, 0xb7, 0x33, 0x0f, 0x75, 0x94, 0xb5, 0xb4, 0x94, 0xbc, 0x4d, 0xde, + 0x7b, 0x08, 0xe1, 0x2f, 0xe0, 0xf5, 0x53, 0xeb, 0x68, 0xe6, 0xb8, 0x04, 0xbd, 0x56, 0xdd, 0x4c, + 0x09, 0x99, 0x0f, 0x67, 0xd6, 0x1d, 0x41, 0x18, 0x7f, 0x09, 0x67, 0x2a, 0xe3, 0xb5, 0xe5, 0x7a, + 0x0e, 0x5d, 0xf8, 0x57, 0x0e, 0xf5, 0xa7, 0x64, 0x81, 0xce, 0x8c, 0x5f, 0xe0, 0x64, 0xbe, 0x95, + 0xae, 0x0c, 0x24, 0xb3, 0x92, 0x07, 0x8e, 0x11, 0xd4, 0x3f, 0xb0, 0xbc, 0x78, 0x62, 0x2d, 0xaa, + 0x8e, 0xf8, 0x0d, 0x1c, 0x7c, 0x0c, 0xd6, 0x5b, 0x56, 0x3c, 0x9f, 0x13, 0x5a, 0x0a, 0x83, 0x40, + 0x67, 0xc2, 0xca, 0xb8, 0xcb, 0x9c, 0x06, 0x49, 0xc4, 0x70, 0x17, 0x9a, 0x42, 0x06, 0x99, 0x9c, + 0xee, 0xe3, 0xf7, 0x1a, 0x9f, 0xc3, 0x21, 0x4b, 0x42, 0xe5, 0xa9, 0x15, 0x9e, 0x9d, 0x32, 0xbe, + 0x83, 0xf6, 0x84, 0xc9, 0x77, 0x5b, 0x96, 0xe5, 0x94, 0x89, 0xed, 0x5a, 0xaa, 0x72, 0x7f, 0x2a, + 0xb9, 0x4b, 0x51, 0x0a, 0xe3, 0x5b, 0x40, 0x13, 0x26, 0xaf, 0x63, 0x21, 0x79, 0x96, 0x5f, 0xf1, + 0x4c, 0xe5, 0x7c, 0xd1, 0xaa, 0xd1, 0x83, 0x76, 0x91, 0xaa, 0x68, 0xcb, 0x66, 0x9f, 0x24, 0x6e, + 0x43, 0x2d, 0x0e, 0x77, 0x48, 0x2d, 0x0e, 0x8d, 0x6f, 0xa0, 0xf3, 0x48, 0x8c, 0xd6, 0x5c, 0xb0, + 0x17, 0xc8, 0x6f, 0x80, 0x1f, 0x91, 0x29, 0xcb, 0xef, 0xd4, 0xbc, 0xff, 0xfb, 0x5e, 0xfe, 0xd2, + 0x9e, 0x86, 0x53, 0x26, 0x52, 0x9e, 0x08, 0x86, 0x2f, 0xa1, 0xf3, 0x81, 0xe5, 0xc2, 0x0f, 0x92, + 0xd0, 0x2f, 0x40, 0xa1, 0x6b, 0xbd, 0x7a, 0xf1, 0x37, 0xee, 0x5e, 0xfc, 0xcb, 0x9a, 0xf4, 0x54, + 0x85, 0x0c, 0x93, 0xb0, 0x50, 0x02, 0xbf, 0x85, 0xe6, 0x2a, 0x10, 0xfe, 0x86, 0x67, 0x65, 0xcd, + 0x26, 0x3d, 0x5a, 0x05, 0xe2, 0x86, 0x67, 0xd5, 0x0c, 0xf5, 0x6a, 0x86, 0x8b, 0xf7, 0x4f, 0xb6, + 0x87, 0xbb, 0x4d, 0x53, 0x9e, 0x49, 0x3c, 0x86, 0x26, 0x65, 0x51, 0x2c, 0x24, 0xcb, 0xb0, 0xfe, + 0xb9, 0xdd, 0xd1, 0xfd, 0xac, 0xc7, 0x78, 0xd5, 0xd7, 0x7e, 0xd4, 0x2e, 0x1d, 0x30, 0x78, 0x16, + 0x99, 0xab, 0x3c, 0x65, 0xd9, 0x9a, 0x85, 0x11, 0xcb, 0xcc, 0x87, 0xe0, 0x3e, 0x8b, 0x97, 0x55, + 0x9c, 0x5a, 0x77, 0x7f, 0x7c, 0x1f, 0xc5, 0x72, 0xb5, 0xbd, 0x37, 0x97, 0x7c, 0x33, 0x78, 0x82, + 0x0e, 0x4a, 0xb4, 0x5c, 0x7b, 0x62, 0xa0, 0xd0, 0xfb, 0x72, 0x87, 0xfe, 0xfc, 0x6f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xf8, 0xf5, 0x06, 0x38, 0x67, 0x05, 0x00, 0x00, } diff --git a/protos/peer/chaincodeshim.proto b/protos/peer/chaincode_shim.proto similarity index 94% rename from protos/peer/chaincodeshim.proto rename to protos/peer/chaincode_shim.proto index 67111b0b6ff..56215f62666 100644 --- a/protos/peer/chaincodeshim.proto +++ b/protos/peer/chaincode_shim.proto @@ -1,5 +1,5 @@ /* -Copyright IBM Corp. 2016 All Rights Reserved. +Copyright IBM Corp. 2017 All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ limitations under the License. syntax = "proto3"; package protos; -option java_package = "org.hyperledger.protos"; +option java_package = "org.hyperledger.fabric.protos.peer"; option go_package = "github.com/hyperledger/fabric/protos/peer"; -import "peer/chaincodeevent.proto"; +import "peer/chaincode_event.proto"; import "peer/proposal.proto"; import "google/protobuf/timestamp.proto"; diff --git a/protos/peer/configuration.pb.go b/protos/peer/configuration.pb.go index 50ea86db67e..408c535418f 100644 --- a/protos/peer/configuration.pb.go +++ b/protos/peer/configuration.pb.go @@ -52,17 +52,17 @@ func init() { func init() { proto.RegisterFile("peer/configuration.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 179 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x44, 0x8e, 0xbd, 0x0a, 0xc2, 0x30, - 0x10, 0xc7, 0x89, 0x5f, 0x60, 0xea, 0x94, 0x29, 0x63, 0xe9, 0x54, 0x11, 0x1a, 0xf0, 0xe3, 0x01, - 0x14, 0x1f, 0x40, 0x3a, 0xba, 0x48, 0x1a, 0xaf, 0x4d, 0x40, 0x7b, 0xe1, 0x92, 0x0e, 0xbe, 0xbd, - 0x34, 0x1d, 0x3a, 0xdd, 0xff, 0x3e, 0x7e, 0xdc, 0x8f, 0x4b, 0x0f, 0x40, 0xca, 0x60, 0xdf, 0xba, - 0x6e, 0x20, 0x1d, 0x1d, 0xf6, 0x95, 0x27, 0x8c, 0x28, 0x36, 0xa9, 0x84, 0xe2, 0xce, 0xb3, 0x6b, - 0x6f, 0x2c, 0xd2, 0x03, 0x80, 0x82, 0xb8, 0xf0, 0x9d, 0x4e, 0xed, 0x6b, 0x24, 0x83, 0x64, 0xf9, - 0xb2, 0xcc, 0x8e, 0x62, 0x82, 0x42, 0x35, 0x9f, 0xd6, 0x99, 0x9e, 0xb1, 0xe2, 0xcc, 0xf9, 0xbc, - 0x12, 0x82, 0xaf, 0x2c, 0x86, 0x28, 0x59, 0xce, 0xca, 0x6d, 0x9d, 0xf2, 0x38, 0xf3, 0x48, 0x51, - 0x2e, 0x72, 0x56, 0xae, 0xeb, 0x94, 0x6f, 0x87, 0xe7, 0xbe, 0x73, 0xd1, 0x0e, 0x4d, 0x65, 0xf0, - 0xab, 0xec, 0xcf, 0x03, 0x7d, 0xe0, 0xdd, 0x01, 0xa9, 0x56, 0x37, 0xe4, 0x8c, 0x9a, 0xbe, 0xaa, - 0x51, 0xa5, 0x99, 0x84, 0x4f, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xcc, 0xfb, 0x23, 0xd3, - 0x00, 0x00, 0x00, + // 192 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8f, 0x3d, 0x8f, 0xc3, 0x20, + 0x0c, 0x86, 0xc5, 0x7d, 0x49, 0x47, 0x6e, 0x62, 0x62, 0x8c, 0x32, 0xe5, 0x16, 0x90, 0xee, 0xe3, + 0x07, 0xb4, 0xea, 0xde, 0x2a, 0x63, 0x97, 0x8a, 0x50, 0x02, 0x48, 0x6d, 0x8c, 0x0c, 0x19, 0xfa, + 0xef, 0x2b, 0x40, 0x55, 0x3a, 0xf1, 0x62, 0x3f, 0x8f, 0x6c, 0x53, 0x1e, 0x8c, 0x41, 0xa9, 0x61, + 0x9e, 0xbc, 0x5d, 0x50, 0x25, 0x0f, 0xb3, 0x08, 0x08, 0x09, 0xd8, 0x47, 0x79, 0x62, 0xb7, 0xa3, + 0xcd, 0x66, 0xd6, 0x0e, 0xf0, 0x60, 0x0c, 0x46, 0xf6, 0x4f, 0xbf, 0x54, 0xf9, 0x9e, 0xb2, 0x19, + 0x39, 0x69, 0x5f, 0xfb, 0xe6, 0x87, 0x55, 0x29, 0x8a, 0x15, 0x1d, 0x1a, 0xb5, 0x6a, 0xdd, 0x1f, + 0xa5, 0x6b, 0x8b, 0x31, 0xfa, 0xe6, 0x20, 0x26, 0x4e, 0x5a, 0xd2, 0x7f, 0x0e, 0x25, 0xe7, 0x5a, + 0x00, 0x4c, 0xfc, 0xa5, 0x25, 0xfd, 0xfb, 0x50, 0xf2, 0x76, 0x4f, 0x3b, 0x40, 0x2b, 0xdc, 0x2d, + 0x18, 0xbc, 0x98, 0xb3, 0x35, 0x28, 0x26, 0x35, 0xa2, 0xd7, 0x8f, 0x71, 0x79, 0x87, 0xe3, 0xb7, + 0xf5, 0xc9, 0x2d, 0xa3, 0xd0, 0x70, 0x95, 0x4f, 0xa8, 0xac, 0xa8, 0xac, 0xa8, 0xcc, 0xe8, 0x58, + 0x8f, 0xfa, 0xbd, 0x07, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xf2, 0x7b, 0x6f, 0xf7, 0x00, 0x00, 0x00, } diff --git a/protos/peer/configuration.proto b/protos/peer/configuration.proto index 8d43f00b1d0..65789101518 100644 --- a/protos/peer/configuration.proto +++ b/protos/peer/configuration.proto @@ -16,6 +16,7 @@ limitations under the License. syntax = "proto3"; +option java_package = "org.hyperledger.fabric.protos.peer"; option go_package = "github.com/hyperledger/fabric/protos/peer"; package protos; diff --git a/protos/peer/events.pb.go b/protos/peer/events.pb.go index 3bde7f63bb3..61fb817806a 100644 --- a/protos/peer/events.pb.go +++ b/protos/peer/events.pb.go @@ -562,42 +562,43 @@ var _Events_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("peer/events.proto", fileDescriptor5) } var fileDescriptor5 = []byte{ - // 587 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0xd3, 0x4e, - 0x10, 0xb5, 0xd3, 0x26, 0x8d, 0x27, 0x69, 0x7f, 0xe9, 0xf6, 0xa7, 0xca, 0x94, 0x3f, 0x2a, 0x46, - 0x48, 0xa1, 0x48, 0x49, 0x09, 0x15, 0xf7, 0xda, 0xb5, 0xb0, 0x29, 0x6d, 0xd1, 0x36, 0x5c, 0xb8, - 0x44, 0x8e, 0x33, 0x75, 0x0c, 0x8d, 0x1d, 0xad, 0xb7, 0xa8, 0xf9, 0x44, 0x9c, 0xf8, 0x8e, 0xc8, - 0x63, 0xaf, 0x9d, 0x88, 0x13, 0x27, 0x67, 0xde, 0xbc, 0xb7, 0xfb, 0xf6, 0xcd, 0x6e, 0x60, 0x7f, - 0x89, 0x28, 0x86, 0xf8, 0x13, 0x13, 0x99, 0x0d, 0x96, 0x22, 0x95, 0x29, 0x6b, 0xd1, 0x27, 0x3b, - 0x3a, 0x08, 0xd3, 0xc5, 0x22, 0x4d, 0x86, 0xc5, 0xa7, 0x68, 0x1e, 0x3d, 0x21, 0x7e, 0x38, 0x0f, - 0xe2, 0x24, 0x4c, 0x67, 0x48, 0xc2, 0xb2, 0x75, 0x48, 0x2d, 0x29, 0x82, 0x24, 0x0b, 0x42, 0x19, - 0x2b, 0x89, 0xf5, 0x05, 0xba, 0x8e, 0xe2, 0x73, 0x8c, 0xd8, 0x4b, 0xe8, 0x56, 0xfa, 0x49, 0x3c, - 0x33, 0xf5, 0x63, 0xbd, 0x6f, 0xf0, 0x4e, 0x85, 0xf9, 0x33, 0xf6, 0x1c, 0x80, 0x56, 0x9e, 0x24, - 0xc1, 0x02, 0xcd, 0x06, 0x11, 0x0c, 0x42, 0xae, 0x83, 0x05, 0x5a, 0xbf, 0x74, 0x68, 0xfb, 0x89, - 0x44, 0x81, 0x99, 0x64, 0xa7, 0x8a, 0x2b, 0x57, 0x4b, 0xa4, 0xc5, 0xf6, 0x46, 0xfb, 0xc5, 0xd6, - 0xd9, 0xc0, 0xcd, 0x3b, 0xe3, 0xd5, 0x12, 0x4b, 0x79, 0xfe, 0x93, 0x5d, 0x00, 0xab, 0x0d, 0x08, - 0x8c, 0x26, 0x71, 0x72, 0x97, 0xd2, 0x2e, 0x9d, 0xd1, 0xff, 0x4a, 0xb9, 0x6e, 0xd9, 0xd3, 0x78, - 0x2f, 0x5c, 0xab, 0xfd, 0xe4, 0x2e, 0x65, 0x26, 0xec, 0x10, 0xe6, 0x5f, 0x98, 0x5b, 0x64, 0x50, - 0x95, 0xb6, 0x01, 0x3b, 0x25, 0xc9, 0x3a, 0x83, 0x36, 0xc7, 0x28, 0xce, 0x24, 0x0a, 0xd6, 0x87, - 0x56, 0x91, 0xb3, 0xa9, 0x1f, 0x6f, 0xf5, 0x3b, 0xa3, 0x9e, 0xda, 0x4a, 0x1d, 0x85, 0x97, 0x7d, - 0xeb, 0x0a, 0x0c, 0x8e, 0xdf, 0x91, 0x42, 0x64, 0xaf, 0xa0, 0x21, 0x1f, 0xe9, 0x5c, 0x9d, 0xd1, - 0x81, 0x92, 0x8c, 0xeb, 0x94, 0x79, 0x43, 0x3e, 0xb2, 0xa7, 0x60, 0xa0, 0x10, 0xa9, 0x98, 0x2c, - 0xb2, 0xa8, 0xcc, 0xab, 0x4d, 0xc0, 0x55, 0x16, 0x59, 0x1f, 0x00, 0xbe, 0x26, 0xe2, 0xdf, 0x6d, - 0x5c, 0x42, 0xe7, 0x36, 0x8e, 0x12, 0x9c, 0x51, 0x8a, 0xec, 0x19, 0x18, 0x59, 0x1c, 0x25, 0x81, - 0x7c, 0x10, 0x45, 0xce, 0x5d, 0x5e, 0x03, 0xec, 0x45, 0x39, 0x06, 0x7b, 0x25, 0x31, 0x23, 0x0b, - 0x5d, 0xbe, 0x86, 0x58, 0xbf, 0x1b, 0xd0, 0x2c, 0xd6, 0x19, 0x40, 0x5b, 0x99, 0x29, 0x8f, 0x55, - 0x59, 0x50, 0x59, 0x79, 0x1a, 0xaf, 0x38, 0xec, 0x35, 0x34, 0xa7, 0xf7, 0x69, 0xf8, 0xa3, 0x9c, - 0xd0, 0xee, 0xa0, 0xbc, 0x90, 0x76, 0x0e, 0x7a, 0x1a, 0x2f, 0xba, 0xec, 0x1c, 0xfe, 0xab, 0xa7, - 0x4a, 0x1b, 0xd3, 0x5c, 0x3a, 0xa3, 0xc3, 0xbf, 0x46, 0x4a, 0x3e, 0x3c, 0x8d, 0xef, 0x85, 0x1b, - 0x08, 0x7b, 0x07, 0x86, 0x50, 0xb9, 0x9b, 0xdb, 0x24, 0xde, 0xaf, 0xad, 0x95, 0x0d, 0x4f, 0xe3, - 0x35, 0x8b, 0x9d, 0x01, 0x3c, 0x54, 0xd9, 0x9a, 0x4d, 0xd2, 0x30, 0xa5, 0xa9, 0x53, 0xf7, 0x34, - 0xbe, 0xc6, 0xa3, 0xbb, 0x23, 0x30, 0x90, 0xa9, 0x30, 0x5b, 0x94, 0x94, 0x2a, 0xed, 0x9d, 0x32, - 0xa5, 0x13, 0x1b, 0x8c, 0xea, 0xf2, 0xb2, 0x2e, 0xb4, 0xb9, 0xfb, 0xd1, 0xbf, 0x1d, 0xbb, 0xbc, - 0xa7, 0x31, 0x03, 0x9a, 0xf6, 0xe7, 0x1b, 0xe7, 0xb2, 0xa7, 0xb3, 0x5d, 0x30, 0x1c, 0xef, 0xdc, - 0xbf, 0x76, 0x6e, 0x2e, 0xdc, 0x5e, 0x23, 0x2f, 0xb9, 0xfb, 0xc9, 0x75, 0xc6, 0xfe, 0xcd, 0x75, - 0x6f, 0x6b, 0x74, 0x06, 0x2d, 0x5a, 0x23, 0x63, 0x27, 0xb0, 0xed, 0xcc, 0x03, 0xc9, 0x76, 0x37, - 0x1e, 0xc6, 0xd1, 0x66, 0x69, 0x69, 0x7d, 0xfd, 0x54, 0xb7, 0xdf, 0x7e, 0x7b, 0x13, 0xc5, 0x72, - 0xfe, 0x30, 0xcd, 0x83, 0x1e, 0xce, 0x57, 0x4b, 0x14, 0xf7, 0x38, 0x8b, 0x50, 0x0c, 0xef, 0x82, - 0xa9, 0x88, 0xc3, 0x61, 0xa1, 0x19, 0xe6, 0xcf, 0x7d, 0x5a, 0xfc, 0x59, 0xbc, 0xff, 0x13, 0x00, - 0x00, 0xff, 0xff, 0x82, 0xc7, 0xec, 0x4d, 0x48, 0x04, 0x00, 0x00, + // 607 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0x9b, 0x4e, + 0x10, 0x05, 0x27, 0x76, 0xcc, 0xd8, 0xce, 0x8f, 0x6c, 0x7e, 0x8a, 0x90, 0xfb, 0x47, 0x29, 0x55, + 0x25, 0x37, 0x07, 0x48, 0x69, 0xd4, 0x7b, 0x20, 0xa8, 0xd0, 0x34, 0x7f, 0xb4, 0x71, 0x2f, 0x3d, + 0xd4, 0xc2, 0x78, 0x82, 0x69, 0x62, 0xb0, 0x96, 0x4d, 0x15, 0x7f, 0xa2, 0x9e, 0xfa, 0x1d, 0x2b, + 0x16, 0xd6, 0x38, 0xed, 0xa9, 0x27, 0x3c, 0x33, 0xef, 0xcd, 0xbe, 0x7d, 0x33, 0x6b, 0xd8, 0x5b, + 0x22, 0x32, 0x1b, 0x7f, 0x60, 0xc6, 0x0b, 0x6b, 0xc9, 0x72, 0x9e, 0x93, 0x8e, 0xf8, 0x14, 0xc3, + 0xfd, 0x38, 0x5f, 0x2c, 0xf2, 0xcc, 0xae, 0x3e, 0x55, 0x71, 0x38, 0x14, 0xf8, 0x78, 0x1e, 0xa5, + 0x59, 0x9c, 0xcf, 0x70, 0x22, 0x98, 0x75, 0xed, 0x40, 0xd4, 0x38, 0x8b, 0xb2, 0x22, 0x8a, 0x79, + 0x2a, 0x39, 0xe6, 0x35, 0xf4, 0x3d, 0x49, 0xa0, 0x98, 0x90, 0x57, 0xd0, 0x6f, 0x1a, 0xa4, 0x33, + 0x43, 0x3d, 0x54, 0x47, 0x1a, 0xed, 0xad, 0x73, 0xe1, 0x8c, 0xbc, 0x00, 0x10, 0x9d, 0x27, 0x59, + 0xb4, 0x40, 0xa3, 0x25, 0x00, 0x9a, 0xc8, 0x5c, 0x46, 0x0b, 0x34, 0x7f, 0xaa, 0xd0, 0x0d, 0x33, + 0x8e, 0x0c, 0x0b, 0x4e, 0x8e, 0x25, 0x96, 0xaf, 0x96, 0x28, 0x9a, 0xed, 0x3a, 0x7b, 0xd5, 0xd1, + 0x85, 0xe5, 0x97, 0x95, 0xf1, 0x6a, 0x89, 0x35, 0xbd, 0xfc, 0x49, 0xce, 0x80, 0x34, 0x02, 0x18, + 0x26, 0x93, 0x34, 0xbb, 0xcd, 0xc5, 0x29, 0x3d, 0xe7, 0x7f, 0xc9, 0xdc, 0x94, 0x1c, 0x28, 0x54, + 0x8f, 0x37, 0xe2, 0x30, 0xbb, 0xcd, 0x89, 0x01, 0x3b, 0x22, 0x17, 0x9e, 0x19, 0x5b, 0x42, 0xa0, + 0x0c, 0x5d, 0x0d, 0x76, 0x6a, 0x90, 0x79, 0x02, 0x5d, 0x8a, 0x49, 0x5a, 0x70, 0x64, 0x64, 0x04, + 0x9d, 0xca, 0x68, 0x43, 0x3d, 0xdc, 0x1a, 0xf5, 0x1c, 0x5d, 0x1e, 0x25, 0xaf, 0x42, 0xeb, 0xba, + 0x79, 0x01, 0x1a, 0xc5, 0xef, 0x28, 0x4c, 0x24, 0xaf, 0xa1, 0xc5, 0x1f, 0xc5, 0xbd, 0x7a, 0xce, + 0xbe, 0xa4, 0x8c, 0x1b, 0x97, 0x69, 0x8b, 0x3f, 0x92, 0x67, 0xa0, 0x21, 0x63, 0x39, 0x9b, 0x2c, + 0x8a, 0xa4, 0xf6, 0xab, 0x2b, 0x12, 0x17, 0x45, 0x62, 0x7e, 0x00, 0xf8, 0x92, 0xb1, 0x7f, 0x97, + 0x71, 0x0e, 0xbd, 0x9b, 0x34, 0xc9, 0x70, 0x26, 0x5c, 0x24, 0xcf, 0x41, 0x2b, 0xd2, 0x24, 0x8b, + 0xf8, 0x03, 0xab, 0x7c, 0xee, 0xd3, 0x26, 0x41, 0x5e, 0xd6, 0x63, 0x70, 0x57, 0x1c, 0x0b, 0x21, + 0xa1, 0x4f, 0x37, 0x32, 0xe6, 0xaf, 0x16, 0xb4, 0xab, 0x3e, 0x16, 0x74, 0xa5, 0x98, 0xfa, 0x5a, + 0x6b, 0x09, 0xd2, 0xab, 0x40, 0xa1, 0x6b, 0x0c, 0x79, 0x03, 0xed, 0xe9, 0x7d, 0x1e, 0xdf, 0xd5, + 0x13, 0x1a, 0x58, 0xf5, 0x46, 0xba, 0x65, 0x32, 0x50, 0x68, 0x55, 0x25, 0xa7, 0xf0, 0xdf, 0x1f, + 0x7b, 0x29, 0xe6, 0xd2, 0x73, 0x0e, 0xfe, 0x1a, 0xa9, 0xd0, 0x11, 0x28, 0x74, 0x37, 0x7e, 0x92, + 0x21, 0xef, 0x40, 0x63, 0xd2, 0x77, 0x63, 0x5b, 0x90, 0xf7, 0x1a, 0x69, 0x75, 0x21, 0x50, 0x68, + 0x83, 0x22, 0x27, 0x00, 0x0f, 0x6b, 0x6f, 0x8d, 0xb6, 0xe0, 0x10, 0xc9, 0x69, 0x5c, 0x0f, 0x14, + 0xba, 0x81, 0x13, 0xbb, 0xc3, 0x30, 0xe2, 0x39, 0x33, 0x3a, 0xc2, 0x29, 0x19, 0xba, 0x3b, 0xb5, + 0x4b, 0x47, 0x2e, 0x68, 0xeb, 0xe5, 0x25, 0x7d, 0xe8, 0x52, 0xff, 0x63, 0x78, 0x33, 0xf6, 0xa9, + 0xae, 0x10, 0x0d, 0xda, 0xee, 0xe7, 0x2b, 0xef, 0x5c, 0x57, 0xc9, 0x00, 0x34, 0x2f, 0x38, 0x0d, + 0x2f, 0xbd, 0xab, 0x33, 0x5f, 0x6f, 0x95, 0x21, 0xf5, 0x3f, 0xf9, 0xde, 0x38, 0xbc, 0xba, 0xd4, + 0xb7, 0x9c, 0x13, 0xe8, 0x88, 0x1e, 0x05, 0x39, 0x82, 0x6d, 0x6f, 0x1e, 0x71, 0x32, 0x78, 0xf2, + 0x30, 0x86, 0x4f, 0x43, 0x53, 0x19, 0xa9, 0xc7, 0xaa, 0xfb, 0x0d, 0xcc, 0x9c, 0x25, 0xd6, 0x7c, + 0xb5, 0x44, 0x76, 0x8f, 0xb3, 0x04, 0x99, 0x75, 0x1b, 0x4d, 0x59, 0x1a, 0x4b, 0x70, 0xf9, 0xce, + 0xdd, 0x41, 0xd5, 0xf9, 0x3a, 0x8a, 0xef, 0xa2, 0x04, 0xbf, 0xbe, 0x4d, 0x52, 0x3e, 0x7f, 0x98, + 0x96, 0xb3, 0xb1, 0x37, 0x98, 0x76, 0xc5, 0xb4, 0x2b, 0xa6, 0x5d, 0x32, 0xa7, 0xd5, 0x1f, 0xcc, + 0xfb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x61, 0x6b, 0x1a, 0x7c, 0x04, 0x00, 0x00, } diff --git a/protos/peer/events.proto b/protos/peer/events.proto index 7841db36655..b1ed3b8e5e9 100644 --- a/protos/peer/events.proto +++ b/protos/peer/events.proto @@ -17,9 +17,11 @@ limitations under the License. syntax = "proto3"; import "common/common.proto"; -import "peer/chaincodeevent.proto"; +import "peer/chaincode_event.proto"; import "peer/transaction.proto"; +option java_package = "org.hyperledger.fabric.protos.peer"; +option java_outer_classname = "EventsPackage"; option go_package = "github.com/hyperledger/fabric/protos/peer"; package protos; diff --git a/protos/peer/peer.pb.go b/protos/peer/peer.pb.go index 4f91d91edc4..006b69b5b58 100644 --- a/protos/peer/peer.pb.go +++ b/protos/peer/peer.pb.go @@ -124,20 +124,21 @@ var _Endorser_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("peer/peer.proto", fileDescriptor6) } var fileDescriptor6 = []byte{ - // 234 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x90, 0x4f, 0x4b, 0xc3, 0x40, - 0x10, 0xc5, 0x6d, 0x90, 0xaa, 0xa3, 0x58, 0x58, 0x41, 0x42, 0x28, 0x22, 0x39, 0x29, 0x42, 0x02, - 0xf5, 0x1b, 0x88, 0x01, 0xbd, 0xc5, 0x78, 0xf3, 0x22, 0x49, 0x66, 0x4c, 0x17, 0xda, 0x9d, 0x65, - 0x26, 0x1e, 0xfc, 0xf6, 0xd2, 0xdd, 0x44, 0xf0, 0xb2, 0x7f, 0xde, 0x6f, 0xe7, 0xed, 0xe3, 0xc1, - 0xca, 0x13, 0x49, 0x79, 0x58, 0x0a, 0x2f, 0x3c, 0xb2, 0x59, 0x86, 0x4d, 0xb3, 0xab, 0x08, 0x84, - 0x3d, 0x6b, 0xbb, 0x8b, 0x30, 0x5b, 0xff, 0x13, 0x3f, 0x85, 0xd4, 0xb3, 0x53, 0x8a, 0x34, 0x5f, - 0xc3, 0xb2, 0x26, 0x92, 0xd7, 0x67, 0x63, 0xe0, 0xd8, 0xb5, 0x7b, 0x4a, 0x17, 0xb7, 0x8b, 0xbb, - 0xb3, 0x26, 0x9c, 0xf3, 0x17, 0xb8, 0x38, 0xd0, 0xca, 0xa1, 0x67, 0xeb, 0x46, 0x73, 0x03, 0x89, - 0xc5, 0xf0, 0xe2, 0x7c, 0x73, 0x19, 0x1d, 0xb4, 0x88, 0xf3, 0x4d, 0x62, 0xd1, 0xa4, 0x70, 0xd2, - 0x22, 0x0a, 0xa9, 0xa6, 0x49, 0xb0, 0x99, 0xaf, 0x9b, 0x37, 0x38, 0xad, 0x1c, 0xb2, 0x28, 0x89, - 0xa9, 0x60, 0x55, 0x0b, 0xf7, 0xa4, 0x5a, 0x4f, 0xa9, 0xcc, 0xf5, 0x6c, 0xf6, 0x6e, 0x07, 0x47, - 0x38, 0xeb, 0x59, 0xfa, 0xf7, 0xc9, 0xa4, 0x34, 0x53, 0xfc, 0xfc, 0xe8, 0xe9, 0xe1, 0xe3, 0x7e, - 0xb0, 0xe3, 0xf6, 0xbb, 0x2b, 0x7a, 0xde, 0x97, 0xdb, 0x1f, 0x4f, 0xb2, 0x23, 0x1c, 0x48, 0xca, - 0xaf, 0xb6, 0x13, 0xdb, 0x97, 0x71, 0x34, 0x14, 0xd5, 0xc5, 0x8a, 0x1e, 0x7f, 0x03, 0x00, 0x00, - 0xff, 0xff, 0x38, 0x9b, 0xb5, 0xcd, 0x3c, 0x01, 0x00, 0x00, + // 246 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x90, 0x4f, 0x4b, 0xc4, 0x30, + 0x10, 0xc5, 0xdd, 0x22, 0xab, 0x8e, 0xe2, 0x42, 0x04, 0x29, 0x65, 0x11, 0xe9, 0x49, 0x2f, 0x29, + 0xac, 0xdf, 0x40, 0x2c, 0xe8, 0xc9, 0x5a, 0x6f, 0x5e, 0xa4, 0x6d, 0xc6, 0x6e, 0x60, 0x37, 0x13, + 0x66, 0xea, 0xc1, 0x6f, 0x2f, 0x4d, 0x5a, 0x71, 0x2f, 0xf9, 0xf3, 0xde, 0x6f, 0x5e, 0x26, 0x03, + 0x2b, 0x8f, 0xc8, 0xc5, 0xb8, 0x68, 0xcf, 0x34, 0x90, 0x5a, 0x86, 0x4d, 0xb2, 0xab, 0x68, 0x30, + 0x79, 0x92, 0x66, 0x17, 0xcd, 0x6c, 0x7d, 0x20, 0x7e, 0x32, 0x8a, 0x27, 0x27, 0x18, 0xdd, 0x7c, + 0x0d, 0xcb, 0x0a, 0x91, 0x5f, 0x9e, 0x94, 0x82, 0x63, 0xd7, 0xec, 0x31, 0x5d, 0xdc, 0x2e, 0xee, + 0xce, 0xea, 0x70, 0xce, 0x9f, 0xe1, 0x62, 0x74, 0x4b, 0x67, 0x3c, 0x59, 0x37, 0xa8, 0x1b, 0x48, + 0xac, 0x09, 0xc4, 0xf9, 0xe6, 0x32, 0x26, 0x88, 0x8e, 0xf5, 0x75, 0x62, 0x8d, 0x4a, 0xe1, 0xa4, + 0x31, 0x86, 0x51, 0x24, 0x4d, 0x42, 0xcc, 0x7c, 0xdd, 0xbc, 0xc1, 0x69, 0xe9, 0x0c, 0xb1, 0x20, + 0xab, 0x12, 0x56, 0x15, 0x53, 0x87, 0x22, 0xd5, 0xd4, 0x95, 0xba, 0x9e, 0xc3, 0xde, 0x6d, 0xef, + 0xd0, 0xcc, 0x7a, 0x96, 0xfe, 0x3d, 0x32, 0x29, 0xf5, 0xd4, 0x7e, 0x7e, 0xf4, 0xf8, 0x0a, 0x39, + 0x71, 0xaf, 0xb7, 0x3f, 0x1e, 0x79, 0x87, 0xa6, 0x47, 0xd6, 0x5f, 0x4d, 0xcb, 0xb6, 0x9b, 0x6b, + 0xc6, 0x8f, 0x7f, 0xdc, 0xf7, 0x76, 0xd8, 0x7e, 0xb7, 0xba, 0xa3, 0x7d, 0xf1, 0x0f, 0x2d, 0x22, + 0x5a, 0x44, 0x34, 0x0c, 0xb3, 0x8d, 0x63, 0x7c, 0xf8, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xef, 0x32, + 0xf2, 0x1f, 0x60, 0x01, 0x00, 0x00, } diff --git a/protos/peer/peer.proto b/protos/peer/peer.proto index 37d0d23ed88..7d529dfe93b 100644 --- a/protos/peer/peer.proto +++ b/protos/peer/peer.proto @@ -15,6 +15,7 @@ limitations under the License. */ syntax = "proto3"; +option java_package = "org.hyperledger.fabric.protos.peer"; option go_package = "github.com/hyperledger/fabric/protos/peer"; package protos; diff --git a/protos/peer/proposal.pb.go b/protos/peer/proposal.pb.go index 50de3b46049..82f4acc1d7e 100644 --- a/protos/peer/proposal.pb.go +++ b/protos/peer/proposal.pb.go @@ -181,32 +181,33 @@ func init() { func init() { proto.RegisterFile("peer/proposal.proto", fileDescriptor7) } var fileDescriptor7 = []byte{ - // 419 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x52, 0xdf, 0x6b, 0xd4, 0x40, - 0x10, 0xe6, 0xee, 0xb0, 0x3f, 0x26, 0x67, 0x6d, 0xb7, 0x45, 0xc2, 0xd1, 0x87, 0x12, 0x10, 0x2a, - 0x6a, 0x02, 0x11, 0x44, 0x7c, 0x11, 0xab, 0x05, 0xfb, 0x20, 0x94, 0xa8, 0x7d, 0xe8, 0xcb, 0xb1, - 0x49, 0xc6, 0x64, 0x31, 0xee, 0xae, 0xbb, 0x9b, 0xc3, 0x3c, 0xfa, 0xe7, 0xf9, 0x5f, 0x49, 0xb2, - 0x3f, 0x6c, 0xbd, 0xa7, 0xe4, 0x9b, 0xef, 0x9b, 0x6f, 0x66, 0x76, 0x06, 0x8e, 0x25, 0xa2, 0xca, - 0xa4, 0x12, 0x52, 0x68, 0xda, 0xa5, 0x52, 0x09, 0x23, 0xc8, 0xce, 0xf4, 0xd1, 0xab, 0x93, 0x89, - 0xac, 0x5a, 0xca, 0x78, 0x25, 0x6a, 0xb4, 0xec, 0xea, 0xf4, 0x5e, 0xca, 0x5a, 0xa1, 0x96, 0x82, - 0x6b, 0xc7, 0x26, 0x5f, 0xe1, 0xe0, 0x33, 0x6b, 0x38, 0xd6, 0xd7, 0x4e, 0x40, 0x9e, 0xc0, 0x41, - 0x10, 0x97, 0x83, 0x41, 0x1d, 0xcf, 0xce, 0x66, 0xe7, 0xcb, 0xe2, 0xa1, 0x8f, 0x5e, 0x8c, 0x41, - 0x72, 0x0a, 0xfb, 0x9a, 0x35, 0x9c, 0x9a, 0x5e, 0x61, 0x3c, 0x9f, 0x14, 0xff, 0x02, 0xc9, 0x2d, - 0xec, 0x05, 0xc3, 0xc7, 0xb0, 0xd3, 0x22, 0xad, 0x51, 0x39, 0x23, 0x87, 0x48, 0x0c, 0xbb, 0x92, - 0x0e, 0x9d, 0xa0, 0xb5, 0xcb, 0xf7, 0x70, 0xf4, 0xc6, 0x5f, 0x06, 0xb9, 0x66, 0x82, 0xc7, 0x0b, - 0xeb, 0x1d, 0x02, 0xc9, 0xef, 0x19, 0xc4, 0xef, 0xfd, 0x90, 0x1f, 0x27, 0xaf, 0x4b, 0x4f, 0x92, - 0x17, 0x40, 0x9c, 0xcb, 0x7a, 0xc3, 0x34, 0x2b, 0x59, 0xc7, 0xcc, 0xe0, 0x0a, 0x1f, 0x39, 0xe6, - 0x26, 0x10, 0xe4, 0x15, 0x2c, 0xc3, 0x7b, 0xad, 0x99, 0x6d, 0x24, 0xca, 0x8f, 0xed, 0xe3, 0xe8, - 0x34, 0x94, 0xb9, 0xfa, 0x50, 0x44, 0x41, 0x78, 0x55, 0x27, 0x7f, 0xee, 0xf6, 0xe0, 0x27, 0xbd, - 0x76, 0xed, 0x9f, 0xc0, 0x03, 0xc6, 0x65, 0x6f, 0x5c, 0x59, 0x0b, 0xc8, 0x0d, 0x2c, 0xbf, 0x28, - 0xca, 0x35, 0x43, 0x6e, 0x3e, 0x51, 0x19, 0xcf, 0xcf, 0x16, 0xe7, 0x51, 0x9e, 0x6f, 0x95, 0xfa, - 0xcf, 0x2d, 0xbd, 0x9b, 0x74, 0xc9, 0x8d, 0x1a, 0x8a, 0x7b, 0x3e, 0xab, 0xb7, 0x70, 0xb4, 0x25, - 0x21, 0x87, 0xb0, 0xf8, 0x8e, 0x76, 0xee, 0xfd, 0x62, 0xfc, 0x1d, 0x9b, 0xda, 0xd0, 0xae, 0xf7, - 0xbb, 0xb2, 0xe0, 0xcd, 0xfc, 0xf5, 0x2c, 0xf9, 0x09, 0x8f, 0x42, 0xf1, 0x77, 0x95, 0x19, 0x5f, - 0x31, 0x86, 0x5d, 0x85, 0xba, 0xef, 0x8c, 0x5f, 0xbe, 0x87, 0xe3, 0x32, 0x71, 0x83, 0xdc, 0x68, - 0xe7, 0xe3, 0x10, 0x79, 0x0e, 0x7b, 0xfe, 0xb2, 0xa6, 0x8d, 0x45, 0xf9, 0xa1, 0x9f, 0xac, 0x70, - 0xf1, 0x22, 0x28, 0x2e, 0x9e, 0xdd, 0x3e, 0x6d, 0x98, 0x69, 0xfb, 0x32, 0xad, 0xc4, 0x8f, 0xac, - 0x1d, 0x24, 0xaa, 0x0e, 0xeb, 0x06, 0x55, 0xf6, 0x8d, 0x96, 0x8a, 0x55, 0x99, 0x4d, 0xcd, 0xc6, - 0xd3, 0x2d, 0xed, 0x79, 0xbf, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x28, 0x14, 0xac, 0x8e, 0xfc, - 0x02, 0x00, 0x00, + // 438 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x53, 0x5b, 0x6b, 0xd4, 0x40, + 0x14, 0x66, 0x77, 0xb1, 0x97, 0xb3, 0x6b, 0x2f, 0xd3, 0x22, 0x61, 0xe9, 0x43, 0x09, 0x08, 0x15, + 0x34, 0x81, 0x15, 0x44, 0x7c, 0x11, 0x57, 0x0b, 0xf6, 0x41, 0x28, 0x51, 0xfb, 0xd0, 0x97, 0x75, + 0x92, 0x1c, 0x93, 0xa1, 0x71, 0x66, 0x9c, 0x99, 0x2c, 0xe6, 0xd1, 0x9f, 0xe7, 0xbf, 0x92, 0x64, + 0x2e, 0xdd, 0x76, 0x9f, 0x76, 0xcf, 0xf9, 0x2e, 0xe7, 0x36, 0x81, 0x13, 0x89, 0xa8, 0x52, 0xa9, + 0x84, 0x14, 0x9a, 0x36, 0x89, 0x54, 0xc2, 0x08, 0xb2, 0x33, 0xfc, 0xe8, 0xf9, 0xe9, 0x00, 0x16, + 0x35, 0x65, 0xbc, 0x10, 0x25, 0x5a, 0x74, 0x7e, 0xf6, 0x40, 0xb2, 0x52, 0xa8, 0xa5, 0xe0, 0xda, + 0xa1, 0xf1, 0x77, 0x38, 0xf8, 0xca, 0x2a, 0x8e, 0xe5, 0xb5, 0x23, 0x90, 0xe7, 0x70, 0x10, 0xc8, + 0x79, 0x67, 0x50, 0x47, 0xa3, 0xf3, 0xd1, 0xc5, 0x2c, 0x7b, 0xea, 0xb3, 0xcb, 0x3e, 0x49, 0xce, + 0x60, 0x5f, 0xb3, 0x8a, 0x53, 0xd3, 0x2a, 0x8c, 0xc6, 0x03, 0xe3, 0x3e, 0x11, 0xdf, 0xc2, 0x5e, + 0x30, 0x7c, 0x06, 0x3b, 0x35, 0xd2, 0x12, 0x95, 0x33, 0x72, 0x11, 0x89, 0x60, 0x57, 0xd2, 0xae, + 0x11, 0xb4, 0x74, 0x7a, 0x1f, 0xf6, 0xde, 0xf8, 0xc7, 0x20, 0xd7, 0x4c, 0xf0, 0x68, 0x62, 0xbd, + 0x43, 0x22, 0xfe, 0x3b, 0x82, 0xe8, 0xa3, 0x1f, 0xf2, 0xf3, 0xe0, 0x75, 0xe9, 0x41, 0xf2, 0x0a, + 0x88, 0x73, 0x59, 0xad, 0x99, 0x66, 0x39, 0x6b, 0x98, 0xe9, 0x5c, 0xe1, 0x63, 0x87, 0xdc, 0x04, + 0x80, 0xbc, 0x81, 0x59, 0xd8, 0xd7, 0x8a, 0xd9, 0x46, 0xa6, 0x8b, 0x13, 0xbb, 0x1c, 0x9d, 0x84, + 0x32, 0x57, 0x9f, 0xb2, 0x69, 0x20, 0x5e, 0x95, 0xf1, 0xbf, 0xcd, 0x1e, 0xfc, 0xa4, 0xd7, 0xae, + 0xfd, 0x53, 0x78, 0xc2, 0xb8, 0x6c, 0x8d, 0x2b, 0x6b, 0x03, 0x72, 0x03, 0xb3, 0x6f, 0x8a, 0x72, + 0xcd, 0x90, 0x9b, 0x2f, 0x54, 0x46, 0xe3, 0xf3, 0xc9, 0xc5, 0x74, 0xb1, 0xd8, 0x2a, 0xf5, 0xc8, + 0x2d, 0xd9, 0x14, 0x5d, 0x72, 0xa3, 0xba, 0xec, 0x81, 0xcf, 0xfc, 0x3d, 0x1c, 0x6f, 0x51, 0xc8, + 0x11, 0x4c, 0xee, 0xd0, 0xce, 0xbd, 0x9f, 0xf5, 0x7f, 0xfb, 0xa6, 0xd6, 0xb4, 0x69, 0xfd, 0xad, + 0x6c, 0xf0, 0x6e, 0xfc, 0x76, 0x14, 0xff, 0x86, 0xc3, 0x50, 0xfc, 0x43, 0x61, 0xfa, 0x2d, 0x46, + 0xb0, 0xab, 0x50, 0xb7, 0x8d, 0xf1, 0xc7, 0xf7, 0x61, 0x7f, 0x4c, 0x5c, 0x23, 0x37, 0xda, 0xf9, + 0xb8, 0x88, 0xbc, 0x84, 0x3d, 0xff, 0xb2, 0x86, 0x8b, 0x4d, 0x17, 0x47, 0x7e, 0xb2, 0xcc, 0xe5, + 0xb3, 0xc0, 0x58, 0xfe, 0x80, 0x58, 0xa8, 0x2a, 0xa9, 0x3b, 0x89, 0xaa, 0xc1, 0xb2, 0x42, 0x95, + 0xfc, 0xa4, 0xb9, 0x62, 0x85, 0xd7, 0xf4, 0x6f, 0x76, 0x79, 0x78, 0xbf, 0x8a, 0xe2, 0x8e, 0x56, + 0x78, 0xfb, 0xa2, 0x62, 0xa6, 0x6e, 0xf3, 0xa4, 0x10, 0xbf, 0xd2, 0x0d, 0x6d, 0x6a, 0xb5, 0xa9, + 0xd5, 0xa6, 0xbd, 0x36, 0xb7, 0xdf, 0xc4, 0xeb, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x47, 0x68, + 0x89, 0x7a, 0x31, 0x03, 0x00, 0x00, } diff --git a/protos/peer/proposal.proto b/protos/peer/proposal.proto index b6882884d02..a036712a153 100644 --- a/protos/peer/proposal.proto +++ b/protos/peer/proposal.proto @@ -17,6 +17,8 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/peer"; +option java_package = "org.hyperledger.fabric.protos.peer"; +option java_outer_classname = "ProposalPackage"; package protos; diff --git a/protos/peer/proposal_response.pb.go b/protos/peer/proposal_response.pb.go index 131820903c9..f09eabdb81e 100644 --- a/protos/peer/proposal_response.pb.go +++ b/protos/peer/proposal_response.pb.go @@ -147,27 +147,28 @@ func init() { func init() { proto.RegisterFile("peer/proposal_response.proto", fileDescriptor8) } var fileDescriptor8 = []byte{ - // 345 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x52, 0x5f, 0x4b, 0xfb, 0x30, - 0x14, 0xa5, 0xfb, 0xfd, 0x36, 0xb7, 0xbb, 0x09, 0xa3, 0x82, 0x96, 0x31, 0x70, 0xd4, 0x97, 0x89, - 0xd2, 0x82, 0x22, 0xf8, 0x2c, 0x88, 0x3e, 0x8e, 0x20, 0x3e, 0x88, 0x20, 0xe9, 0x76, 0xd7, 0x16, - 0xda, 0x26, 0xe4, 0xa6, 0xe2, 0x3e, 0xb0, 0xdf, 0x43, 0x9a, 0x26, 0xdd, 0xf4, 0xa9, 0x9c, 0xdb, - 0x93, 0xf3, 0x27, 0xb9, 0x30, 0x97, 0x88, 0x2a, 0x96, 0x4a, 0x48, 0x41, 0xbc, 0xf8, 0x50, 0x48, - 0x52, 0x54, 0x84, 0x91, 0x54, 0x42, 0x0b, 0x7f, 0x60, 0x3e, 0x34, 0x3b, 0x4f, 0x85, 0x48, 0x0b, - 0x8c, 0x0d, 0x4c, 0xea, 0x6d, 0xac, 0xf3, 0x12, 0x49, 0xf3, 0x52, 0xb6, 0xc4, 0xf0, 0xdb, 0x83, - 0xe9, 0xca, 0x8a, 0x30, 0xab, 0xe1, 0x07, 0x70, 0xf4, 0x89, 0x8a, 0x72, 0x51, 0x05, 0xde, 0xc2, - 0x5b, 0xf6, 0x99, 0x83, 0xfe, 0x3d, 0x8c, 0x3a, 0x85, 0xa0, 0xb7, 0xf0, 0x96, 0xe3, 0x9b, 0x59, - 0xd4, 0x7a, 0x44, 0xce, 0x23, 0x7a, 0x71, 0x0c, 0xb6, 0x27, 0xfb, 0xd7, 0x30, 0x74, 0x19, 0x83, - 0xff, 0xe6, 0xe0, 0xb4, 0x3d, 0x41, 0x91, 0xf3, 0x65, 0x1d, 0xa3, 0x49, 0x20, 0xf9, 0xae, 0x10, - 0x7c, 0x13, 0xf4, 0x17, 0xde, 0x72, 0xc2, 0x1c, 0xf4, 0xef, 0x60, 0x8c, 0xd5, 0x46, 0x28, 0xc2, - 0x12, 0x2b, 0x1d, 0x0c, 0x8c, 0xd4, 0x89, 0x93, 0x7a, 0xdc, 0xff, 0x62, 0x87, 0xbc, 0xf0, 0x15, - 0x86, 0x5d, 0xbd, 0x53, 0x18, 0x90, 0xe6, 0xba, 0x26, 0xdb, 0xce, 0xa2, 0xc6, 0xb4, 0x44, 0x22, - 0x9e, 0xa2, 0xa9, 0x36, 0x62, 0x0e, 0x1e, 0xc6, 0xf9, 0xf7, 0x2b, 0x4e, 0xf8, 0x0e, 0x67, 0x7f, - 0xaf, 0x6f, 0x65, 0x93, 0x5e, 0xc0, 0x71, 0xf7, 0x3c, 0x19, 0xa7, 0xcc, 0xb8, 0x4d, 0xd8, 0xc4, - 0x0d, 0x9f, 0x39, 0x65, 0xfe, 0x1c, 0x46, 0xf8, 0xa5, 0xb1, 0x32, 0x97, 0xdd, 0x33, 0x84, 0xfd, - 0x20, 0x7c, 0x82, 0xf1, 0x41, 0x23, 0x7f, 0x06, 0x43, 0xdb, 0x49, 0x59, 0xb1, 0x0e, 0x37, 0x42, - 0x94, 0xa7, 0x15, 0xd7, 0xb5, 0x42, 0x27, 0xd4, 0x0d, 0x1e, 0xae, 0xde, 0x2e, 0xd3, 0x5c, 0x67, - 0x75, 0x12, 0xad, 0x45, 0x19, 0x67, 0x3b, 0x89, 0xaa, 0xc0, 0x4d, 0x8a, 0x2a, 0xde, 0xf2, 0x44, - 0xe5, 0xeb, 0x76, 0x41, 0x28, 0x6e, 0x96, 0x2a, 0x69, 0x97, 0xe7, 0xf6, 0x27, 0x00, 0x00, 0xff, - 0xff, 0xe8, 0x57, 0x2f, 0xb2, 0x63, 0x02, 0x00, 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x92, 0x51, 0x4b, 0xfb, 0x30, + 0x14, 0xc5, 0xe9, 0xfe, 0xff, 0xcd, 0x2d, 0x9b, 0x30, 0x2a, 0x68, 0x19, 0x03, 0x47, 0x7d, 0x99, + 0x20, 0x29, 0x28, 0x82, 0xcf, 0x03, 0xd1, 0xc7, 0x11, 0xc4, 0x07, 0x11, 0x24, 0xdd, 0xee, 0xd2, + 0x62, 0xdb, 0x84, 0xdc, 0x54, 0xdc, 0x07, 0xf6, 0x7b, 0x48, 0xd3, 0xa6, 0xab, 0xe2, 0xd3, 0x38, + 0x77, 0x27, 0xbf, 0x7b, 0xcf, 0xed, 0x25, 0x73, 0x05, 0xa0, 0x23, 0xa5, 0xa5, 0x92, 0xc8, 0xb3, + 0x37, 0x0d, 0xa8, 0x64, 0x81, 0x40, 0x95, 0x96, 0x46, 0xfa, 0x03, 0xfb, 0x83, 0xb3, 0x73, 0x21, + 0xa5, 0xc8, 0x20, 0xb2, 0x32, 0x2e, 0x77, 0x91, 0x49, 0x73, 0x40, 0xc3, 0x73, 0x55, 0x1b, 0xc3, + 0x2f, 0x8f, 0x4c, 0xd7, 0x0d, 0x84, 0x35, 0x0c, 0x3f, 0x20, 0x47, 0x1f, 0xa0, 0x31, 0x95, 0x45, + 0xe0, 0x2d, 0xbc, 0x65, 0x9f, 0x39, 0xe9, 0xdf, 0x91, 0x51, 0x4b, 0x08, 0x7a, 0x0b, 0x6f, 0x39, + 0xbe, 0x9e, 0xd1, 0xba, 0x07, 0x75, 0x3d, 0xe8, 0x93, 0x73, 0xb0, 0x83, 0xd9, 0xbf, 0x22, 0x43, + 0x37, 0x63, 0xf0, 0xdf, 0x3e, 0x9c, 0xd6, 0x2f, 0x90, 0xba, 0xbe, 0xac, 0x75, 0x54, 0x13, 0x28, + 0xbe, 0xcf, 0x24, 0xdf, 0x06, 0xfd, 0x85, 0xb7, 0x9c, 0x30, 0x27, 0xfd, 0x5b, 0x32, 0x86, 0x62, + 0x2b, 0x35, 0x42, 0x0e, 0x85, 0x09, 0x06, 0x16, 0x75, 0xe2, 0x50, 0xf7, 0x87, 0xbf, 0x58, 0xd7, + 0x17, 0x3e, 0x93, 0x61, 0x1b, 0xef, 0x94, 0x0c, 0xd0, 0x70, 0x53, 0x62, 0x93, 0xae, 0x51, 0x55, + 0xd3, 0x1c, 0x10, 0xb9, 0x00, 0x1b, 0x6d, 0xc4, 0x9c, 0xec, 0x8e, 0xf3, 0xef, 0xc7, 0x38, 0xe1, + 0x2b, 0x39, 0xfb, 0xbd, 0xbe, 0x75, 0x33, 0xe9, 0x05, 0x39, 0x6e, 0x3f, 0x4f, 0xc2, 0x31, 0xb1, + 0xdd, 0x26, 0x6c, 0xe2, 0x8a, 0x8f, 0x1c, 0x13, 0x7f, 0x4e, 0x46, 0xf0, 0x69, 0xa0, 0xb0, 0xcb, + 0xee, 0x59, 0xc3, 0xa1, 0x10, 0x3e, 0x90, 0x71, 0x27, 0x91, 0x3f, 0x23, 0xc3, 0x26, 0x93, 0x6e, + 0x60, 0xad, 0xae, 0x40, 0x98, 0x8a, 0x82, 0x9b, 0x52, 0x83, 0x03, 0xb5, 0x85, 0x55, 0x42, 0x42, + 0xa9, 0x05, 0x4d, 0xf6, 0x0a, 0x74, 0x06, 0x5b, 0x01, 0x9a, 0xee, 0x78, 0xac, 0xd3, 0x8d, 0x5b, + 0x5c, 0x75, 0x4d, 0xab, 0x3f, 0xa2, 0x6c, 0xde, 0xb9, 0x80, 0x97, 0x4b, 0x91, 0x9a, 0xa4, 0x8c, + 0xe9, 0x46, 0xe6, 0x51, 0x87, 0x11, 0xd5, 0x8c, 0xfa, 0xba, 0x30, 0xaa, 0x18, 0x71, 0x7d, 0x79, + 0x37, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x52, 0x0b, 0x35, 0xa0, 0x02, 0x00, 0x00, } diff --git a/protos/peer/proposal_response.proto b/protos/peer/proposal_response.proto index 2b228d473f2..6cc84493b5b 100644 --- a/protos/peer/proposal_response.proto +++ b/protos/peer/proposal_response.proto @@ -17,6 +17,8 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/peer"; +option java_package = "org.hyperledger.fabric.protos.peer"; +option java_outer_classname = "ProposalResponsePackage"; package protos; diff --git a/protos/peer/query.pb.go b/protos/peer/query.pb.go index 84f824a2c99..463c31be3b0 100644 --- a/protos/peer/query.pb.go +++ b/protos/peer/query.pb.go @@ -95,23 +95,23 @@ func init() { func init() { proto.RegisterFile("peer/query.proto", fileDescriptor9) } var fileDescriptor9 = []byte{ - // 273 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x91, 0x5f, 0x4b, 0xc3, 0x30, - 0x14, 0xc5, 0xa9, 0xfb, 0xa3, 0xbb, 0x43, 0x90, 0x38, 0x25, 0x2f, 0xc2, 0xe8, 0xd3, 0x44, 0x69, - 0x40, 0xf1, 0x0b, 0xb8, 0x07, 0xd9, 0x93, 0xd8, 0x47, 0x5f, 0xa4, 0x4d, 0xef, 0xd6, 0xc0, 0x96, - 0xc4, 0xa4, 0x1d, 0xec, 0x53, 0xf8, 0x95, 0xe5, 0x26, 0xeb, 0xe8, 0x9e, 0x7a, 0xee, 0xef, 0x9c, - 0x4b, 0x39, 0xb9, 0x70, 0x63, 0x11, 0x9d, 0xf8, 0x6d, 0xd1, 0x1d, 0x32, 0xeb, 0x4c, 0x63, 0xd8, - 0x38, 0x7c, 0x7c, 0xfa, 0x09, 0xf7, 0xcb, 0xba, 0x50, 0x5a, 0x9a, 0x0a, 0xbf, 0xc8, 0xcf, 0xd1, - 0x5b, 0xa3, 0x3d, 0xb2, 0x37, 0x00, 0xd9, 0x39, 0x9e, 0x27, 0xf3, 0xc1, 0x62, 0xfa, 0x72, 0x17, - 0xb7, 0x7d, 0x76, 0xda, 0x59, 0xe9, 0xb5, 0xc9, 0x7b, 0xc1, 0xf4, 0x2f, 0x81, 0xeb, 0x33, 0x97, - 0x31, 0x18, 0xea, 0x62, 0x87, 0x3c, 0x99, 0x27, 0x8b, 0x49, 0x1e, 0x34, 0xe3, 0x70, 0xb9, 0x47, - 0xe7, 0x95, 0xd1, 0xfc, 0x22, 0xe0, 0x6e, 0xa4, 0xb4, 0x2d, 0x9a, 0x9a, 0x0f, 0x62, 0x9a, 0x34, - 0x9b, 0xc1, 0x48, 0x69, 0xdb, 0x36, 0x7c, 0x18, 0x60, 0x1c, 0x28, 0x89, 0x5e, 0x4a, 0x3e, 0x8a, - 0x49, 0xd2, 0xc4, 0xf6, 0xc4, 0xc6, 0x91, 0x91, 0x4e, 0x3f, 0x60, 0xb6, 0xac, 0x0b, 0xad, 0x71, - 0x7b, 0x5e, 0x50, 0xc0, 0x95, 0x8c, 0xbc, 0xab, 0x77, 0xdb, 0xab, 0x47, 0x3c, 0x94, 0x3b, 0x85, - 0xd2, 0x67, 0x98, 0xf6, 0x0c, 0xf6, 0x10, 0x1e, 0x88, 0xc6, 0x1f, 0x55, 0x1d, 0xdb, 0x4d, 0x8e, - 0x64, 0x55, 0xbd, 0x3f, 0x7d, 0x3f, 0x6e, 0x54, 0x53, 0xb7, 0x65, 0x26, 0xcd, 0x4e, 0xd4, 0x07, - 0x8b, 0x6e, 0x8b, 0xd5, 0x06, 0x9d, 0x58, 0x17, 0xa5, 0x53, 0x52, 0xc4, 0x7f, 0x09, 0x3a, 0x4d, - 0x19, 0xcf, 0xf1, 0xfa, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x71, 0x90, 0xfd, 0xa9, 0x01, 0x00, - 0x00, + // 284 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x91, 0xdf, 0x4a, 0xc3, 0x30, + 0x14, 0xc6, 0xa9, 0xfb, 0xa3, 0x3b, 0x43, 0x90, 0x38, 0x25, 0x37, 0xc2, 0xe8, 0xd5, 0x04, 0x69, + 0x40, 0xf1, 0x05, 0xdc, 0x85, 0xec, 0x6a, 0xb8, 0x4b, 0x6f, 0xa4, 0x4d, 0xcf, 0xda, 0xc0, 0x96, + 0xc4, 0xa4, 0x1d, 0xec, 0x29, 0x7c, 0x65, 0x39, 0xc9, 0x3a, 0xba, 0xab, 0x9e, 0xf3, 0xfb, 0x7e, + 0xa1, 0x7c, 0x09, 0xdc, 0x59, 0x44, 0x27, 0x7e, 0x5b, 0x74, 0xc7, 0xcc, 0x3a, 0xd3, 0x18, 0x36, + 0x0e, 0x1f, 0x9f, 0xae, 0xe1, 0x71, 0x59, 0xe7, 0x4a, 0x4b, 0x53, 0xe2, 0x17, 0xe5, 0x1b, 0xf4, + 0xd6, 0x68, 0x8f, 0xec, 0x1d, 0x40, 0x76, 0x89, 0xe7, 0xc9, 0x7c, 0xb0, 0x98, 0xbe, 0x3e, 0xc4, + 0xd3, 0x3e, 0x3b, 0x9f, 0x59, 0xe9, 0xad, 0xd9, 0xf4, 0xc4, 0xf4, 0x2f, 0x81, 0xdb, 0x8b, 0x94, + 0x31, 0x18, 0xea, 0x7c, 0x8f, 0x3c, 0x99, 0x27, 0x8b, 0xc9, 0x26, 0xcc, 0x8c, 0xc3, 0xf5, 0x01, + 0x9d, 0x57, 0x46, 0xf3, 0xab, 0x80, 0xbb, 0x95, 0x6c, 0x9b, 0x37, 0x35, 0x1f, 0x44, 0x9b, 0x66, + 0x36, 0x83, 0x91, 0xd2, 0xb6, 0x6d, 0xf8, 0x30, 0xc0, 0xb8, 0x90, 0x89, 0x5e, 0x4a, 0x3e, 0x8a, + 0x26, 0xcd, 0xc4, 0x0e, 0xc4, 0xc6, 0x91, 0xd1, 0x9c, 0x7e, 0xc2, 0x6c, 0x59, 0xe7, 0x5a, 0xe3, + 0xee, 0xb2, 0xa0, 0x80, 0x1b, 0x19, 0x79, 0x57, 0xef, 0xbe, 0x57, 0x8f, 0x78, 0x28, 0x77, 0x96, + 0xd2, 0x17, 0x98, 0xf6, 0x02, 0xf6, 0x14, 0x2e, 0x88, 0xd6, 0x1f, 0x55, 0x9e, 0xda, 0x4d, 0x4e, + 0x64, 0x55, 0x7e, 0xac, 0x21, 0x35, 0xae, 0xca, 0xea, 0xa3, 0x45, 0xb7, 0xc3, 0xb2, 0x42, 0x97, + 0x6d, 0xf3, 0xc2, 0x29, 0xd9, 0xfd, 0x84, 0xde, 0xe4, 0xfb, 0xb9, 0x52, 0x4d, 0xdd, 0x16, 0x99, + 0x34, 0x7b, 0xd1, 0x53, 0x45, 0x54, 0x45, 0x54, 0x05, 0xa9, 0x45, 0x7c, 0xb2, 0xb7, 0xff, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x56, 0xd1, 0xfe, 0x74, 0xcd, 0x01, 0x00, 0x00, } diff --git a/protos/peer/query.proto b/protos/peer/query.proto index 99d4da16bf3..e1b4d4cf825 100644 --- a/protos/peer/query.proto +++ b/protos/peer/query.proto @@ -16,6 +16,7 @@ limitations under the License. syntax = "proto3"; +option java_package = "org.hyperledger.fabric.protos.peer"; option go_package = "github.com/hyperledger/fabric/protos/peer"; package protos; diff --git a/protos/peer/transaction.pb.go b/protos/peer/transaction.pb.go index a9af25a88e2..14d9ccdcec9 100644 --- a/protos/peer/transaction.pb.go +++ b/protos/peer/transaction.pb.go @@ -239,51 +239,52 @@ func init() { func init() { proto.RegisterFile("peer/transaction.proto", fileDescriptor10) } var fileDescriptor10 = []byte{ - // 724 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0x4d, 0x6f, 0xe3, 0x36, - 0x14, 0xac, 0x93, 0x26, 0x69, 0x9e, 0xd3, 0x84, 0x61, 0xb2, 0x5e, 0xc7, 0x08, 0xba, 0x0b, 0x1f, - 0x8a, 0x6d, 0x17, 0x88, 0x81, 0xec, 0xa1, 0x40, 0xd1, 0x0b, 0x2d, 0x31, 0xb1, 0x50, 0x99, 0x14, - 0x28, 0x3a, 0x4d, 0x7a, 0x28, 0x21, 0x5b, 0x5c, 0x47, 0x80, 0x2d, 0x0a, 0x92, 0xb2, 0x68, 0xae, - 0xfd, 0x01, 0xed, 0x7f, 0xea, 0x1f, 0x6b, 0xa1, 0x2f, 0x7f, 0x64, 0xdb, 0x8b, 0x69, 0xce, 0x8c, - 0xde, 0xcc, 0x7b, 0x94, 0x08, 0x9d, 0x44, 0xeb, 0x74, 0x90, 0xa7, 0x41, 0x9c, 0x05, 0xb3, 0x3c, - 0x32, 0xf1, 0x55, 0x92, 0x9a, 0xdc, 0xe0, 0xfd, 0x72, 0xc9, 0x7a, 0x6f, 0xe6, 0xc6, 0xcc, 0x17, - 0x7a, 0x50, 0x6e, 0xa7, 0x4f, 0x1f, 0x07, 0x79, 0xb4, 0xd4, 0x59, 0x1e, 0x2c, 0x93, 0x4a, 0xd8, - 0xbb, 0x2c, 0x0b, 0x24, 0xa9, 0x49, 0x4c, 0x16, 0x2c, 0x54, 0xaa, 0xb3, 0xc4, 0xc4, 0x99, 0xae, - 0xd9, 0xb3, 0x99, 0x59, 0x2e, 0x4d, 0x3c, 0xa8, 0x96, 0x0a, 0xec, 0xff, 0x06, 0xa7, 0x7e, 0x34, - 0x8f, 0x75, 0x28, 0xd7, 0xb6, 0xf8, 0x3d, 0x9c, 0x6e, 0xa4, 0x50, 0xd3, 0xe7, 0x5c, 0x67, 0xdd, - 0xd6, 0xdb, 0xd6, 0xbb, 0x23, 0x81, 0x36, 0x88, 0x61, 0x81, 0xe3, 0x4b, 0x38, 0xcc, 0xa2, 0x79, - 0x1c, 0xe4, 0x4f, 0xa9, 0xee, 0xee, 0x94, 0xa2, 0x35, 0xd0, 0xff, 0xa3, 0x05, 0xe7, 0x5e, 0x6a, - 0x66, 0x3a, 0xcb, 0xb6, 0x3d, 0x86, 0x70, 0xb6, 0x51, 0x8a, 0xc6, 0x9f, 0xf4, 0xc2, 0x24, 0xba, - 0x74, 0x69, 0x5f, 0xa3, 0xab, 0x3a, 0x64, 0x83, 0x8b, 0xff, 0x12, 0xe3, 0x6f, 0xe1, 0xf8, 0x53, - 0xb0, 0x88, 0xc2, 0xa0, 0x40, 0x2d, 0x13, 0x56, 0xfe, 0x7b, 0xe2, 0x05, 0xda, 0x1f, 0x42, 0x7b, - 0xd3, 0xfa, 0x03, 0x1c, 0x54, 0xff, 0x8a, 0xa6, 0x76, 0xdf, 0xb5, 0xaf, 0x2f, 0xaa, 0x61, 0x64, - 0x57, 0x1b, 0x2a, 0x52, 0xfe, 0x8a, 0x46, 0xd9, 0xa7, 0x70, 0xfa, 0x19, 0x8b, 0x3b, 0xb0, 0xff, - 0xa8, 0x83, 0x50, 0xa7, 0xf5, 0x74, 0xea, 0x1d, 0xee, 0xc2, 0x41, 0x12, 0x3c, 0x2f, 0x4c, 0x10, - 0xd6, 0x13, 0x69, 0xb6, 0xfd, 0xbf, 0x5a, 0xd0, 0xb1, 0x1e, 0x83, 0x28, 0x9e, 0x99, 0x50, 0x57, - 0x55, 0xbc, 0x8a, 0xc2, 0x3f, 0x41, 0x6f, 0xd6, 0x30, 0x6a, 0x75, 0x88, 0x4d, 0x9d, 0xca, 0xa0, - 0xbb, 0x52, 0x78, 0xb5, 0xa0, 0x79, 0xfa, 0x07, 0xd8, 0xaf, 0xa2, 0x95, 0x8e, 0xed, 0xeb, 0x37, - 0x4d, 0x4f, 0x2b, 0x37, 0x1a, 0x87, 0x26, 0xcd, 0x74, 0x58, 0x77, 0x56, 0xcb, 0xfb, 0x7f, 0xb6, - 0xe0, 0xf5, 0xff, 0x68, 0xf0, 0x8f, 0x70, 0xf1, 0xd9, 0xdb, 0xf4, 0x22, 0xd1, 0xeb, 0x46, 0x20, - 0x6a, 0x7e, 0x1d, 0xe8, 0x48, 0x57, 0xd5, 0x96, 0x3a, 0xce, 0xb3, 0xee, 0x4e, 0x39, 0xea, 0xb3, - 0x26, 0x16, 0x5d, 0x73, 0x62, 0x4b, 0xf8, 0xfd, 0xdf, 0xbb, 0x80, 0xe4, 0xef, 0x77, 0x5b, 0x47, - 0x88, 0x0f, 0x61, 0xef, 0x8e, 0xb8, 0x8e, 0x8d, 0xbe, 0xc0, 0x08, 0x8e, 0x98, 0xe3, 0x2a, 0xca, - 0xee, 0xa8, 0xcb, 0x3d, 0x8a, 0x5a, 0xf8, 0x04, 0xda, 0x43, 0x62, 0x2b, 0x8f, 0x3c, 0xb8, 0x9c, - 0xd8, 0x68, 0x07, 0xbf, 0x82, 0xd3, 0x02, 0xb0, 0xf8, 0x78, 0xcc, 0x99, 0x1a, 0x51, 0x62, 0x53, - 0x81, 0x76, 0xf1, 0x05, 0xbc, 0x2a, 0x61, 0x41, 0x89, 0xe4, 0x42, 0xf9, 0xce, 0x2d, 0x23, 0x72, - 0x22, 0x28, 0xfa, 0x12, 0xbf, 0x85, 0x4b, 0x87, 0x95, 0x0e, 0x8a, 0x32, 0x9b, 0x0b, 0x9f, 0x0a, - 0x25, 0x05, 0x61, 0x3e, 0xb1, 0xa4, 0xc3, 0x19, 0xda, 0xc3, 0xdf, 0x40, 0xaf, 0x51, 0x58, 0x9c, - 0xdd, 0x38, 0xb7, 0x5b, 0xfc, 0x3e, 0xee, 0x41, 0x67, 0xc2, 0xfc, 0x89, 0xe7, 0x71, 0x21, 0xa9, - 0xad, 0xe4, 0xfd, 0x2a, 0xcf, 0x41, 0x93, 0xc7, 0x13, 0xdc, 0xe3, 0x3e, 0x71, 0x95, 0xbc, 0x77, - 0x6c, 0xf4, 0x15, 0xc6, 0x70, 0x6c, 0x4f, 0x3c, 0xd7, 0xb1, 0x88, 0xa4, 0x15, 0x76, 0x58, 0xd8, - 0xd4, 0x01, 0xc6, 0x94, 0x49, 0xe5, 0x71, 0xd7, 0xb1, 0x1e, 0xd4, 0x0d, 0x71, 0xdc, 0x22, 0x28, - 0xe0, 0x0e, 0xe0, 0xf1, 0x9d, 0x65, 0x29, 0x41, 0x49, 0x15, 0xc4, 0x75, 0x2c, 0x89, 0xda, 0x45, - 0x6f, 0xde, 0x88, 0x30, 0xc9, 0xc7, 0x2f, 0xa8, 0x23, 0x7c, 0x06, 0x27, 0x13, 0xf6, 0x33, 0xe3, - 0xbf, 0xb0, 0x22, 0x95, 0x7c, 0xf0, 0x28, 0xfa, 0xba, 0x88, 0x2b, 0x89, 0xb8, 0xa5, 0x52, 0x59, - 0x23, 0xe2, 0x30, 0xc5, 0xb8, 0x54, 0x37, 0x7c, 0xc2, 0x6c, 0x74, 0x8c, 0xcf, 0x01, 0x8d, 0x89, - 0xf0, 0x47, 0x65, 0x52, 0x45, 0x85, 0xe0, 0x02, 0x9d, 0x34, 0x73, 0x97, 0xf7, 0x75, 0xcb, 0x08, - 0x5f, 0xc0, 0x79, 0x33, 0x12, 0x2e, 0x47, 0x54, 0x14, 0xce, 0x3e, 0x67, 0xe8, 0x9f, 0xd6, 0xf0, - 0xfd, 0xaf, 0xdf, 0xcd, 0xa3, 0xfc, 0xf1, 0x69, 0x5a, 0x7c, 0xc9, 0x83, 0xc7, 0xe7, 0x44, 0xa7, - 0x0b, 0x1d, 0xce, 0x75, 0x3a, 0xf8, 0x18, 0x4c, 0xd3, 0x68, 0x56, 0x5d, 0x62, 0xd9, 0xa0, 0xb8, - 0xb1, 0xa6, 0xd5, 0x05, 0xf7, 0xe1, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x6e, 0x52, 0x79, - 0x01, 0x05, 0x00, 0x00, + // 748 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0x51, 0x4f, 0xeb, 0x36, + 0x18, 0x5d, 0x61, 0xc0, 0xf8, 0xca, 0xc0, 0x18, 0x6e, 0x6f, 0xa9, 0xd0, 0xee, 0x55, 0x1f, 0xa6, + 0xbb, 0x4d, 0x6a, 0x25, 0xee, 0xc3, 0xa4, 0x69, 0x2f, 0x6e, 0x62, 0x68, 0xb4, 0xd4, 0x8e, 0x5c, + 0x97, 0xc1, 0x1e, 0x66, 0xa5, 0x8d, 0x6f, 0x89, 0xd6, 0xc6, 0x51, 0x12, 0xae, 0xc6, 0xeb, 0x7e, + 0xc0, 0xf6, 0x9f, 0xf6, 0xc7, 0x36, 0x25, 0x4e, 0xa0, 0x70, 0xb7, 0x97, 0xba, 0x3e, 0xe7, 0xf8, + 0x3b, 0xe7, 0xfb, 0xdc, 0x1a, 0x3a, 0xa9, 0xd6, 0xd9, 0xb0, 0xc8, 0xc2, 0x24, 0x0f, 0x17, 0x45, + 0x6c, 0x92, 0x41, 0x9a, 0x99, 0xc2, 0xe0, 0xdd, 0x6a, 0xc9, 0x7b, 0x6f, 0x96, 0xc6, 0x2c, 0x57, + 0x7a, 0x58, 0x6d, 0xe7, 0xf7, 0x1f, 0x86, 0x45, 0xbc, 0xd6, 0x79, 0x11, 0xae, 0x53, 0x2b, 0xec, + 0x9d, 0x57, 0x05, 0xd2, 0xcc, 0xa4, 0x26, 0x0f, 0x57, 0x2a, 0xd3, 0x79, 0x6a, 0x92, 0x5c, 0xd7, + 0xec, 0xc9, 0xc2, 0xac, 0xd7, 0x26, 0x19, 0xda, 0xc5, 0x82, 0xfd, 0x5f, 0xe1, 0x78, 0x1a, 0x2f, + 0x13, 0x1d, 0xc9, 0x27, 0x5b, 0xfc, 0x1d, 0x1c, 0x6f, 0xa4, 0x50, 0xf3, 0x87, 0x42, 0xe7, 0xdd, + 0xd6, 0xdb, 0xd6, 0xbb, 0x03, 0x81, 0x36, 0x88, 0x51, 0x89, 0xe3, 0x73, 0xd8, 0xcf, 0xe3, 0x65, + 0x12, 0x16, 0xf7, 0x99, 0xee, 0x6e, 0x55, 0xa2, 0x27, 0xa0, 0xff, 0x47, 0x0b, 0x4e, 0x83, 0xcc, + 0x2c, 0x74, 0x9e, 0x3f, 0xf7, 0x18, 0xc1, 0xc9, 0x46, 0x29, 0x9a, 0x7c, 0xd4, 0x2b, 0x93, 0xea, + 0xca, 0xa5, 0x7d, 0x81, 0x06, 0x75, 0xc8, 0x06, 0x17, 0xff, 0x25, 0xc6, 0x5f, 0xc3, 0xe1, 0xc7, + 0x70, 0x15, 0x47, 0x61, 0x89, 0x3a, 0x26, 0xb2, 0xfe, 0x3b, 0xe2, 0x05, 0xda, 0x1f, 0x41, 0x7b, + 0xd3, 0xfa, 0x3d, 0xec, 0xd9, 0x6f, 0x65, 0x53, 0xdb, 0xef, 0xda, 0x17, 0x67, 0x76, 0x18, 0xf9, + 0x60, 0x43, 0x45, 0xaa, 0x4f, 0xd1, 0x28, 0xfb, 0x14, 0x8e, 0x3f, 0x61, 0x71, 0x07, 0x76, 0xef, + 0x74, 0x18, 0xe9, 0xac, 0x9e, 0x4e, 0xbd, 0xc3, 0x5d, 0xd8, 0x4b, 0xc3, 0x87, 0x95, 0x09, 0xa3, + 0x7a, 0x22, 0xcd, 0xb6, 0xff, 0x57, 0x0b, 0x3a, 0xce, 0x5d, 0x18, 0x27, 0x0b, 0x13, 0x69, 0x5b, + 0x25, 0xb0, 0x14, 0xfe, 0x11, 0x7a, 0x8b, 0x86, 0x51, 0x8f, 0x97, 0xd8, 0xd4, 0xb1, 0x06, 0xdd, + 0x47, 0x45, 0x50, 0x0b, 0x9a, 0xd3, 0xdf, 0xc3, 0xae, 0x8d, 0x56, 0x39, 0xb6, 0x2f, 0xde, 0x34, + 0x3d, 0x3d, 0xba, 0xd1, 0x24, 0x32, 0x59, 0xae, 0xa3, 0xba, 0xb3, 0x5a, 0xde, 0xff, 0xb3, 0x05, + 0xaf, 0xff, 0x47, 0x83, 0x7f, 0x80, 0xb3, 0x4f, 0x7e, 0x4d, 0x2f, 0x12, 0xbd, 0x6e, 0x04, 0xa2, + 0xe6, 0x9f, 0x02, 0x1d, 0x68, 0x5b, 0x6d, 0xad, 0x93, 0x22, 0xef, 0x6e, 0x55, 0xa3, 0x3e, 0x69, + 0x62, 0xd1, 0x27, 0x4e, 0x3c, 0x13, 0x7e, 0xfb, 0xf7, 0x36, 0x20, 0xf9, 0xfb, 0xf5, 0xb3, 0x2b, + 0xc4, 0xfb, 0xb0, 0x73, 0x4d, 0x7c, 0xcf, 0x45, 0x9f, 0x61, 0x04, 0x07, 0xcc, 0xf3, 0x15, 0x65, + 0xd7, 0xd4, 0xe7, 0x01, 0x45, 0x2d, 0x7c, 0x04, 0xed, 0x11, 0x71, 0x55, 0x40, 0x6e, 0x7d, 0x4e, + 0x5c, 0xb4, 0x85, 0x5f, 0xc1, 0x71, 0x09, 0x38, 0x7c, 0x32, 0xe1, 0x4c, 0x8d, 0x29, 0x71, 0xa9, + 0x40, 0xdb, 0xf8, 0x0c, 0x5e, 0x55, 0xb0, 0xa0, 0x44, 0x72, 0xa1, 0xa6, 0xde, 0x15, 0x23, 0x72, + 0x26, 0x28, 0xfa, 0x1c, 0xbf, 0x85, 0x73, 0x8f, 0x55, 0x0e, 0x8a, 0x32, 0x97, 0x8b, 0x29, 0x15, + 0x4a, 0x0a, 0xc2, 0xa6, 0xc4, 0x91, 0x1e, 0x67, 0x68, 0x07, 0x7f, 0x05, 0xbd, 0x46, 0xe1, 0x70, + 0x76, 0xe9, 0x5d, 0x3d, 0xe3, 0x77, 0x71, 0x0f, 0x3a, 0x33, 0x36, 0x9d, 0x05, 0x01, 0x17, 0x92, + 0xba, 0x4a, 0xde, 0x3c, 0xe6, 0xd9, 0x6b, 0xf2, 0x04, 0x82, 0x07, 0x7c, 0x4a, 0x7c, 0x25, 0x6f, + 0x3c, 0x17, 0x7d, 0x81, 0x31, 0x1c, 0xba, 0xb3, 0xc0, 0xf7, 0x1c, 0x22, 0xa9, 0xc5, 0xf6, 0x4b, + 0x9b, 0x3a, 0xc0, 0x84, 0x32, 0xa9, 0x02, 0xee, 0x7b, 0xce, 0xad, 0xba, 0x24, 0x9e, 0x5f, 0x06, + 0x05, 0xdc, 0x01, 0x3c, 0xb9, 0x76, 0x1c, 0x25, 0x28, 0xb1, 0x41, 0x7c, 0xcf, 0x91, 0xa8, 0x5d, + 0xf6, 0x16, 0x8c, 0x09, 0x93, 0x7c, 0xf2, 0x82, 0x3a, 0xc0, 0x27, 0x70, 0x34, 0x63, 0x3f, 0x31, + 0xfe, 0x33, 0x2b, 0x53, 0xc9, 0xdb, 0x80, 0xa2, 0x2f, 0xcb, 0xb8, 0x92, 0x88, 0x2b, 0x2a, 0x95, + 0x33, 0x26, 0x1e, 0x53, 0x8c, 0x4b, 0x75, 0xc9, 0x67, 0xcc, 0x45, 0x87, 0xf8, 0x14, 0xd0, 0x84, + 0x88, 0xe9, 0xb8, 0x4a, 0xaa, 0xa8, 0x10, 0x5c, 0xa0, 0xa3, 0x66, 0xee, 0xf2, 0xa6, 0x6e, 0x19, + 0xe1, 0x33, 0x38, 0x6d, 0x46, 0xc2, 0xe5, 0x98, 0x8a, 0xd2, 0x79, 0xca, 0x19, 0xfa, 0xa7, 0x35, + 0x5a, 0x40, 0xdf, 0x64, 0xcb, 0xc1, 0xdd, 0x43, 0xaa, 0xb3, 0x95, 0x8e, 0x96, 0x3a, 0x1b, 0x7c, + 0x08, 0xe7, 0x59, 0xbc, 0x68, 0xee, 0xbf, 0x7c, 0xaa, 0x46, 0x78, 0xe3, 0x2f, 0x15, 0x84, 0x8b, + 0xdf, 0xc2, 0xa5, 0xfe, 0xe5, 0x9b, 0x65, 0x5c, 0xdc, 0xdd, 0xcf, 0xcb, 0x17, 0x60, 0xb8, 0x71, + 0x7c, 0x68, 0x8f, 0xdb, 0xc7, 0x2f, 0x1f, 0x96, 0xc7, 0xe7, 0xf6, 0x61, 0x7c, 0xff, 0x6f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xea, 0x58, 0x85, 0x3d, 0x39, 0x05, 0x00, 0x00, } diff --git a/protos/peer/transaction.proto b/protos/peer/transaction.proto index 0783fb7f229..f12685674de 100644 --- a/protos/peer/transaction.proto +++ b/protos/peer/transaction.proto @@ -17,6 +17,8 @@ limitations under the License. syntax = "proto3"; option go_package = "github.com/hyperledger/fabric/protos/peer"; +option java_package = "org.hyperledger.fabric.protos.peer"; +option java_outer_classname = "TransactionPackage"; package protos; diff --git a/scripts/compile_protos.sh b/scripts/compile_protos.sh index 85c089476c4..6c7c3ea6369 100755 --- a/scripts/compile_protos.sh +++ b/scripts/compile_protos.sh @@ -17,6 +17,7 @@ ROOTLESS_PROTO_FILES="$(find $PWD \ -path $PWD/vendor -prune -o \ -path $PWD/gotools -prune -o \ -path $PWD/build -prune -o \ + -path $PWD/core/chaincode/shim/java -prune -o \ -name "*.proto" -exec readlink -f {} \;)" ROOTLESS_PROTO_DIRS="$(dirname $ROOTLESS_PROTO_FILES | sort | uniq)"