Re-generate protobufs

libp2p/crypto/pb/crypto_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: libp2p/crypto/pb/crypto.proto
 
@@ -8,7 +9,6 @@ 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()
@@ -20,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   name='libp2p/crypto/pb/crypto.proto',
   package='crypto.pb',
   syntax='proto2',
+  serialized_options=None,
   serialized_pb=_b('\n\x1dlibp2p/crypto/pb/crypto.proto\x12\tcrypto.pb\"?\n\tPublicKey\x12$\n\x08key_type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c\"@\n\nPrivateKey\x12$\n\x08key_type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c*9\n\x07KeyType\x12\x07\n\x03RSA\x10\x00\x12\x0b\n\x07\x45\x64\x32\x35\x35\x31\x39\x10\x01\x12\r\n\tSecp256k1\x10\x02\x12\t\n\x05\x45\x43\x44SA\x10\x03')
 )
 
@@ -31,23 +32,23 @@ _KEYTYPE = _descriptor.EnumDescriptor(
   values=[
     _descriptor.EnumValueDescriptor(
       name='RSA', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='Ed25519', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='Secp256k1', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='ECDSA', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
+  serialized_options=None,
   serialized_start=175,
   serialized_end=232,
 )
@@ -74,21 +75,21 @@ _PUBLICKEY = _descriptor.Descriptor(
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='data', full_name='crypto.pb.PublicKey.data', index=1,
       number=2, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -112,21 +113,21 @@ _PRIVATEKEY = _descriptor.Descriptor(
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='data', full_name='crypto.pb.PrivateKey.data', index=1,
       number=2, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -143,18 +144,18 @@ DESCRIPTOR.message_types_by_name['PrivateKey'] = _PRIVATEKEY
 DESCRIPTOR.enum_types_by_name['KeyType'] = _KEYTYPE
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-PublicKey = _reflection.GeneratedProtocolMessageType('PublicKey', (_message.Message,), dict(
+PublicKey = _reflection.GeneratedProtocolMessageType('PublicKey', (_message.Message,), {
-  DESCRIPTOR = _PUBLICKEY,
+  'DESCRIPTOR' : _PUBLICKEY,
-  __module__ = 'libp2p.crypto.pb.crypto_pb2'
+  '__module__' : 'libp2p.crypto.pb.crypto_pb2'
   # @@protoc_insertion_point(class_scope:crypto.pb.PublicKey)
-  ))
+  })
 _sym_db.RegisterMessage(PublicKey)
 
-PrivateKey = _reflection.GeneratedProtocolMessageType('PrivateKey', (_message.Message,), dict(
+PrivateKey = _reflection.GeneratedProtocolMessageType('PrivateKey', (_message.Message,), {
-  DESCRIPTOR = _PRIVATEKEY,
+  'DESCRIPTOR' : _PRIVATEKEY,
-  __module__ = 'libp2p.crypto.pb.crypto_pb2'
+  '__module__' : 'libp2p.crypto.pb.crypto_pb2'
   # @@protoc_insertion_point(class_scope:crypto.pb.PrivateKey)
-  ))
+  })
 _sym_db.RegisterMessage(PrivateKey)
 
 

libp2p/pubsub/pb/rpc_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: libp2p/pubsub/pb/rpc.proto
 
@@ -7,7 +8,6 @@ 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()
@@ -19,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   name='libp2p/pubsub/pb/rpc.proto',
   package='pubsub.pb',
   syntax='proto2',
+  serialized_options=None,
   serialized_pb=_b('\n\x1alibp2p/pubsub/pb/rpc.proto\x12\tpubsub.pb\"\xb4\x01\n\x03RPC\x12-\n\rsubscriptions\x18\x01 \x03(\x0b\x32\x16.pubsub.pb.RPC.SubOpts\x12#\n\x07publish\x18\x02 \x03(\x0b\x32\x12.pubsub.pb.Message\x12*\n\x07\x63ontrol\x18\x03 \x01(\x0b\x32\x19.pubsub.pb.ControlMessage\x1a-\n\x07SubOpts\x12\x11\n\tsubscribe\x18\x01 \x01(\x08\x12\x0f\n\x07topicid\x18\x02 \x01(\t\"i\n\x07Message\x12\x0f\n\x07\x66rom_id\x18\x01 \x01(\x0c\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x12\r\n\x05seqno\x18\x03 \x01(\x0c\x12\x10\n\x08topicIDs\x18\x04 \x03(\t\x12\x11\n\tsignature\x18\x05 \x01(\x0c\x12\x0b\n\x03key\x18\x06 \x01(\x0c\"\xb0\x01\n\x0e\x43ontrolMessage\x12&\n\x05ihave\x18\x01 \x03(\x0b\x32\x17.pubsub.pb.ControlIHave\x12&\n\x05iwant\x18\x02 \x03(\x0b\x32\x17.pubsub.pb.ControlIWant\x12&\n\x05graft\x18\x03 \x03(\x0b\x32\x17.pubsub.pb.ControlGraft\x12&\n\x05prune\x18\x04 \x03(\x0b\x32\x17.pubsub.pb.ControlPrune\"3\n\x0c\x43ontrolIHave\x12\x0f\n\x07topicID\x18\x01 \x01(\t\x12\x12\n\nmessageIDs\x18\x02 \x03(\t\"\"\n\x0c\x43ontrolIWant\x12\x12\n\nmessageIDs\x18\x01 \x03(\t\"\x1f\n\x0c\x43ontrolGraft\x12\x0f\n\x07topicID\x18\x01 \x01(\t\"\x1f\n\x0c\x43ontrolPrune\x12\x0f\n\x07topicID\x18\x01 \x01(\t\"\x87\x03\n\x0fTopicDescriptor\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x31\n\x04\x61uth\x18\x02 \x01(\x0b\x32#.pubsub.pb.TopicDescriptor.AuthOpts\x12/\n\x03\x65nc\x18\x03 \x01(\x0b\x32\".pubsub.pb.TopicDescriptor.EncOpts\x1a|\n\x08\x41uthOpts\x12:\n\x04mode\x18\x01 \x01(\x0e\x32,.pubsub.pb.TopicDescriptor.AuthOpts.AuthMode\x12\x0c\n\x04keys\x18\x02 \x03(\x0c\"&\n\x08\x41uthMode\x12\x08\n\x04NONE\x10\x00\x12\x07\n\x03KEY\x10\x01\x12\x07\n\x03WOT\x10\x02\x1a\x83\x01\n\x07\x45ncOpts\x12\x38\n\x04mode\x18\x01 \x01(\x0e\x32*.pubsub.pb.TopicDescriptor.EncOpts.EncMode\x12\x11\n\tkeyHashes\x18\x02 \x03(\x0c\"+\n\x07\x45ncMode\x12\x08\n\x04NONE\x10\x00\x12\r\n\tSHAREDKEY\x10\x01\x12\x07\n\x03WOT\x10\x02')
 )
 
@@ -32,19 +33,19 @@ _TOPICDESCRIPTOR_AUTHOPTS_AUTHMODE = _descriptor.EnumDescriptor(
   values=[
     _descriptor.EnumValueDescriptor(
       name='NONE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='KEY', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='WOT', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
+  serialized_options=None,
   serialized_start=885,
   serialized_end=923,
 )
@@ -58,19 +59,19 @@ _TOPICDESCRIPTOR_ENCOPTS_ENCMODE = _descriptor.EnumDescriptor(
   values=[
     _descriptor.EnumValueDescriptor(
       name='NONE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='SHAREDKEY', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='WOT', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
+  serialized_options=None,
   serialized_start=1014,
   serialized_end=1057,
 )
@@ -90,21 +91,21 @@ _RPC_SUBOPTS = _descriptor.Descriptor(
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='topicid', full_name='pubsub.pb.RPC.SubOpts.topicid', index=1,
       number=2, 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -127,28 +128,28 @@ _RPC = _descriptor.Descriptor(
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='publish', full_name='pubsub.pb.RPC.publish', index=1,
       number=2, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='control', full_name='pubsub.pb.RPC.control', 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[_RPC_SUBOPTS, ],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -172,49 +173,49 @@ _MESSAGE = _descriptor.Descriptor(
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='data', full_name='pubsub.pb.Message.data', 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='seqno', full_name='pubsub.pb.Message.seqno', 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='topicIDs', full_name='pubsub.pb.Message.topicIDs', index=3,
       number=4, type=9, cpp_type=9, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='signature', full_name='pubsub.pb.Message.signature', index=4,
       number=5, 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='key', full_name='pubsub.pb.Message.key', index=5,
       number=6, 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -238,35 +239,35 @@ _CONTROLMESSAGE = _descriptor.Descriptor(
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='iwant', full_name='pubsub.pb.ControlMessage.iwant', index=1,
       number=2, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='graft', full_name='pubsub.pb.ControlMessage.graft', index=2,
       number=3, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='prune', full_name='pubsub.pb.ControlMessage.prune', index=3,
       number=4, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -290,21 +291,21 @@ _CONTROLIHAVE = _descriptor.Descriptor(
       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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='messageIDs', full_name='pubsub.pb.ControlIHave.messageIDs', index=1,
       number=2, type=9, cpp_type=9, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -328,14 +329,14 @@ _CONTROLIWANT = _descriptor.Descriptor(
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -359,14 +360,14 @@ _CONTROLGRAFT = _descriptor.Descriptor(
       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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -390,14 +391,14 @@ _CONTROLPRUNE = _descriptor.Descriptor(
       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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -421,14 +422,14 @@ _TOPICDESCRIPTOR_AUTHOPTS = _descriptor.Descriptor(
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='keys', full_name='pubsub.pb.TopicDescriptor.AuthOpts.keys', index=1,
       number=2, type=12, cpp_type=9, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -436,7 +437,7 @@ _TOPICDESCRIPTOR_AUTHOPTS = _descriptor.Descriptor(
   enum_types=[
     _TOPICDESCRIPTOR_AUTHOPTS_AUTHMODE,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -459,14 +460,14 @@ _TOPICDESCRIPTOR_ENCOPTS = _descriptor.Descriptor(
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='keyHashes', full_name='pubsub.pb.TopicDescriptor.EncOpts.keyHashes', index=1,
       number=2, type=12, cpp_type=9, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -474,7 +475,7 @@ _TOPICDESCRIPTOR_ENCOPTS = _descriptor.Descriptor(
   enum_types=[
     _TOPICDESCRIPTOR_ENCOPTS_ENCMODE,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -497,28 +498,28 @@ _TOPICDESCRIPTOR = _descriptor.Descriptor(
       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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='auth', full_name='pubsub.pb.TopicDescriptor.auth', index=1,
       number=2, 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='enc', full_name='pubsub.pb.TopicDescriptor.enc', 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[_TOPICDESCRIPTOR_AUTHOPTS, _TOPICDESCRIPTOR_ENCOPTS, ],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -554,82 +555,82 @@ DESCRIPTOR.message_types_by_name['ControlPrune'] = _CONTROLPRUNE
 DESCRIPTOR.message_types_by_name['TopicDescriptor'] = _TOPICDESCRIPTOR
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-RPC = _reflection.GeneratedProtocolMessageType('RPC', (_message.Message,), dict(
+RPC = _reflection.GeneratedProtocolMessageType('RPC', (_message.Message,), {
 
-  SubOpts = _reflection.GeneratedProtocolMessageType('SubOpts', (_message.Message,), dict(
+  'SubOpts' : _reflection.GeneratedProtocolMessageType('SubOpts', (_message.Message,), {
-    DESCRIPTOR = _RPC_SUBOPTS,
+    'DESCRIPTOR' : _RPC_SUBOPTS,
-    __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+    '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
     # @@protoc_insertion_point(class_scope:pubsub.pb.RPC.SubOpts)
-    ))
+    })
   ,
-  DESCRIPTOR = _RPC,
+  'DESCRIPTOR' : _RPC,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.RPC)
-  ))
+  })
 _sym_db.RegisterMessage(RPC)
 _sym_db.RegisterMessage(RPC.SubOpts)
 
-Message = _reflection.GeneratedProtocolMessageType('Message', (_message.Message,), dict(
+Message = _reflection.GeneratedProtocolMessageType('Message', (_message.Message,), {
-  DESCRIPTOR = _MESSAGE,
+  'DESCRIPTOR' : _MESSAGE,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.Message)
-  ))
+  })
 _sym_db.RegisterMessage(Message)
 
-ControlMessage = _reflection.GeneratedProtocolMessageType('ControlMessage', (_message.Message,), dict(
+ControlMessage = _reflection.GeneratedProtocolMessageType('ControlMessage', (_message.Message,), {
-  DESCRIPTOR = _CONTROLMESSAGE,
+  'DESCRIPTOR' : _CONTROLMESSAGE,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.ControlMessage)
-  ))
+  })
 _sym_db.RegisterMessage(ControlMessage)
 
-ControlIHave = _reflection.GeneratedProtocolMessageType('ControlIHave', (_message.Message,), dict(
+ControlIHave = _reflection.GeneratedProtocolMessageType('ControlIHave', (_message.Message,), {
-  DESCRIPTOR = _CONTROLIHAVE,
+  'DESCRIPTOR' : _CONTROLIHAVE,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.ControlIHave)
-  ))
+  })
 _sym_db.RegisterMessage(ControlIHave)
 
-ControlIWant = _reflection.GeneratedProtocolMessageType('ControlIWant', (_message.Message,), dict(
+ControlIWant = _reflection.GeneratedProtocolMessageType('ControlIWant', (_message.Message,), {
-  DESCRIPTOR = _CONTROLIWANT,
+  'DESCRIPTOR' : _CONTROLIWANT,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.ControlIWant)
-  ))
+  })
 _sym_db.RegisterMessage(ControlIWant)
 
-ControlGraft = _reflection.GeneratedProtocolMessageType('ControlGraft', (_message.Message,), dict(
+ControlGraft = _reflection.GeneratedProtocolMessageType('ControlGraft', (_message.Message,), {
-  DESCRIPTOR = _CONTROLGRAFT,
+  'DESCRIPTOR' : _CONTROLGRAFT,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.ControlGraft)
-  ))
+  })
 _sym_db.RegisterMessage(ControlGraft)
 
-ControlPrune = _reflection.GeneratedProtocolMessageType('ControlPrune', (_message.Message,), dict(
+ControlPrune = _reflection.GeneratedProtocolMessageType('ControlPrune', (_message.Message,), {
-  DESCRIPTOR = _CONTROLPRUNE,
+  'DESCRIPTOR' : _CONTROLPRUNE,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.ControlPrune)
-  ))
+  })
 _sym_db.RegisterMessage(ControlPrune)
 
-TopicDescriptor = _reflection.GeneratedProtocolMessageType('TopicDescriptor', (_message.Message,), dict(
+TopicDescriptor = _reflection.GeneratedProtocolMessageType('TopicDescriptor', (_message.Message,), {
 
-  AuthOpts = _reflection.GeneratedProtocolMessageType('AuthOpts', (_message.Message,), dict(
+  'AuthOpts' : _reflection.GeneratedProtocolMessageType('AuthOpts', (_message.Message,), {
-    DESCRIPTOR = _TOPICDESCRIPTOR_AUTHOPTS,
+    'DESCRIPTOR' : _TOPICDESCRIPTOR_AUTHOPTS,
-    __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+    '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
     # @@protoc_insertion_point(class_scope:pubsub.pb.TopicDescriptor.AuthOpts)
-    ))
+    })
   ,
 
-  EncOpts = _reflection.GeneratedProtocolMessageType('EncOpts', (_message.Message,), dict(
+  'EncOpts' : _reflection.GeneratedProtocolMessageType('EncOpts', (_message.Message,), {
-    DESCRIPTOR = _TOPICDESCRIPTOR_ENCOPTS,
+    'DESCRIPTOR' : _TOPICDESCRIPTOR_ENCOPTS,
-    __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+    '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
     # @@protoc_insertion_point(class_scope:pubsub.pb.TopicDescriptor.EncOpts)
-    ))
+    })
   ,
-  DESCRIPTOR = _TOPICDESCRIPTOR,
+  'DESCRIPTOR' : _TOPICDESCRIPTOR,
-  __module__ = 'libp2p.pubsub.pb.rpc_pb2'
+  '__module__' : 'libp2p.pubsub.pb.rpc_pb2'
   # @@protoc_insertion_point(class_scope:pubsub.pb.TopicDescriptor)
-  ))
+  })
 _sym_db.RegisterMessage(TopicDescriptor)
 _sym_db.RegisterMessage(TopicDescriptor.AuthOpts)
 _sym_db.RegisterMessage(TopicDescriptor.EncOpts)

libp2p/security/insecure/pb/plaintext_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: libp2p/security/insecure/pb/plaintext.proto
 
@@ -7,7 +8,6 @@ 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()
@@ -20,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   name='libp2p/security/insecure/pb/plaintext.proto',
   package='plaintext.pb',
   syntax='proto2',
+  serialized_options=None,
   serialized_pb=_b('\n+libp2p/security/insecure/pb/plaintext.proto\x12\x0cplaintext.pb\x1a\x1dlibp2p/crypto/pb/crypto.proto\"<\n\x08\x45xchange\x12\n\n\x02id\x18\x01 \x01(\x0c\x12$\n\x06pubkey\x18\x02 \x01(\x0b\x32\x14.crypto.pb.PublicKey')
   ,
   dependencies=[libp2p_dot_crypto_dot_pb_dot_crypto__pb2.DESCRIPTOR,])
@@ -40,21 +41,21 @@ _EXCHANGE = _descriptor.Descriptor(
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
       name='pubkey', full_name='plaintext.pb.Exchange.pubkey', index=1,
       number=2, 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, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
@@ -68,11 +69,11 @@ _EXCHANGE.fields_by_name['pubkey'].message_type = libp2p_dot_crypto_dot_pb_dot_c
 DESCRIPTOR.message_types_by_name['Exchange'] = _EXCHANGE
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Exchange = _reflection.GeneratedProtocolMessageType('Exchange', (_message.Message,), dict(
+Exchange = _reflection.GeneratedProtocolMessageType('Exchange', (_message.Message,), {
-  DESCRIPTOR = _EXCHANGE,
+  'DESCRIPTOR' : _EXCHANGE,
-  __module__ = 'libp2p.security.insecure.pb.plaintext_pb2'
+  '__module__' : 'libp2p.security.insecure.pb.plaintext_pb2'
   # @@protoc_insertion_point(class_scope:plaintext.pb.Exchange)
-  ))
+  })
 _sym_db.RegisterMessage(Exchange)
 
 

libp2p/security/secio/pb/spipe_pb2.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: spipe.proto
+# source: libp2p/security/secio/pb/spipe.proto
 
 import sys
 _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
@@ -16,11 +16,11 @@ _sym_db = _symbol_database.Default()
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-  name='spipe.proto',
+  name='libp2p/security/secio/pb/spipe.proto',
   package='spipe.pb',
   syntax='proto2',
   serialized_options=None,
-  serialized_pb=_b('\n\x0bspipe.proto\x12\x08spipe.pb\"_\n\x07Propose\x12\x0c\n\x04rand\x18\x01 \x01(\x0c\x12\x12\n\npublic_key\x18\x02 \x01(\x0c\x12\x11\n\texchanges\x18\x03 \x01(\t\x12\x0f\n\x07\x63iphers\x18\x04 \x01(\t\x12\x0e\n\x06hashes\x18\x05 \x01(\t\";\n\x08\x45xchange\x12\x1c\n\x14\x65phemeral_public_key\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c')
+  serialized_pb=_b('\n$libp2p/security/secio/pb/spipe.proto\x12\x08spipe.pb\"_\n\x07Propose\x12\x0c\n\x04rand\x18\x01 \x01(\x0c\x12\x12\n\npublic_key\x18\x02 \x01(\x0c\x12\x11\n\texchanges\x18\x03 \x01(\t\x12\x0f\n\x07\x63iphers\x18\x04 \x01(\t\x12\x0e\n\x06hashes\x18\x05 \x01(\t\";\n\x08\x45xchange\x12\x1c\n\x14\x65phemeral_public_key\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c')
 )
 
 
@@ -80,8 +80,8 @@ _PROPOSE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=25,
+  serialized_start=50,
-  serialized_end=120,
+  serialized_end=145,
 )
 
 
@@ -118,26 +118,26 @@ _EXCHANGE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=122,
+  serialized_start=147,
-  serialized_end=181,
+  serialized_end=206,
 )
 
 DESCRIPTOR.message_types_by_name['Propose'] = _PROPOSE
 DESCRIPTOR.message_types_by_name['Exchange'] = _EXCHANGE
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Propose = _reflection.GeneratedProtocolMessageType('Propose', (_message.Message,), dict(
+Propose = _reflection.GeneratedProtocolMessageType('Propose', (_message.Message,), {
-  DESCRIPTOR = _PROPOSE,
+  'DESCRIPTOR' : _PROPOSE,
-  __module__ = 'spipe_pb2'
+  '__module__' : 'libp2p.security.secio.pb.spipe_pb2'
   # @@protoc_insertion_point(class_scope:spipe.pb.Propose)
-  ))
+  })
 _sym_db.RegisterMessage(Propose)
 
-Exchange = _reflection.GeneratedProtocolMessageType('Exchange', (_message.Message,), dict(
+Exchange = _reflection.GeneratedProtocolMessageType('Exchange', (_message.Message,), {
-  DESCRIPTOR = _EXCHANGE,
+  'DESCRIPTOR' : _EXCHANGE,
-  __module__ = 'spipe_pb2'
+  '__module__' : 'libp2p.security.secio.pb.spipe_pb2'
   # @@protoc_insertion_point(class_scope:spipe.pb.Exchange)
-  ))
+  })
 _sym_db.RegisterMessage(Exchange)