diff --git a/libp2p/security/noise/pb/noise.proto b/libp2p/security/noise/pb/noise.proto index 54cef92..05a78c6 100644 --- a/libp2p/security/noise/pb/noise.proto +++ b/libp2p/security/noise/pb/noise.proto @@ -1,5 +1,8 @@ +syntax = "proto3"; +package pb; + message NoiseHandshakePayload { - optional bytes identity_key = 1; - optional bytes identity_sig = 2; - optional bytes data = 3; + bytes identity_key = 1; + bytes identity_sig = 2; + bytes data = 3; } diff --git a/libp2p/security/noise/pb/noise_pb2.py b/libp2p/security/noise/pb/noise_pb2.py index d7b92ae..63320da 100644 --- a/libp2p/security/noise/pb/noise_pb2.py +++ b/libp2p/security/noise/pb/noise_pb2.py @@ -17,9 +17,9 @@ _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor.FileDescriptor( name='libp2p/security/noise/pb/noise.proto', - package='', - syntax='proto2', - serialized_pb=_b('\n$libp2p/security/noise/pb/noise.proto\"Q\n\x15NoiseHandshakePayload\x12\x14\n\x0cidentity_key\x18\x01 \x01(\x0c\x12\x14\n\x0cidentity_sig\x18\x02 \x01(\x0c\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c') + package='pb', + syntax='proto3', + serialized_pb=_b('\n$libp2p/security/noise/pb/noise.proto\x12\x02pb\"Q\n\x15NoiseHandshakePayload\x12\x14\n\x0cidentity_key\x18\x01 \x01(\x0c\x12\x14\n\x0cidentity_sig\x18\x02 \x01(\x0c\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x62\x06proto3') ) @@ -27,27 +27,27 @@ DESCRIPTOR = _descriptor.FileDescriptor( _NOISEHANDSHAKEPAYLOAD = _descriptor.Descriptor( name='NoiseHandshakePayload', - full_name='NoiseHandshakePayload', + full_name='pb.NoiseHandshakePayload', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='identity_key', full_name='NoiseHandshakePayload.identity_key', index=0, + name='identity_key', full_name='pb.NoiseHandshakePayload.identity_key', 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, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='identity_sig', full_name='NoiseHandshakePayload.identity_sig', index=1, + name='identity_sig', full_name='pb.NoiseHandshakePayload.identity_sig', 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), _descriptor.FieldDescriptor( - name='data', full_name='NoiseHandshakePayload.data', index=2, + name='data', full_name='pb.NoiseHandshakePayload.data', 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, @@ -61,12 +61,12 @@ _NOISEHANDSHAKEPAYLOAD = _descriptor.Descriptor( ], options=None, is_extendable=False, - syntax='proto2', + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=40, - serialized_end=121, + serialized_start=44, + serialized_end=125, ) DESCRIPTOR.message_types_by_name['NoiseHandshakePayload'] = _NOISEHANDSHAKEPAYLOAD @@ -75,7 +75,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR) NoiseHandshakePayload = _reflection.GeneratedProtocolMessageType('NoiseHandshakePayload', (_message.Message,), dict( DESCRIPTOR = _NOISEHANDSHAKEPAYLOAD, __module__ = 'libp2p.security.noise.pb.noise_pb2' - # @@protoc_insertion_point(class_scope:NoiseHandshakePayload) + # @@protoc_insertion_point(class_scope:pb.NoiseHandshakePayload) )) _sym_db.RegisterMessage(NoiseHandshakePayload) diff --git a/libp2p/security/noise/pb/noise_pb2.pyi b/libp2p/security/noise/pb/noise_pb2.pyi index eea8fda..a4bcf5b 100644 --- a/libp2p/security/noise/pb/noise_pb2.pyi +++ b/libp2p/security/noise/pb/noise_pb2.pyi @@ -34,8 +34,6 @@ class NoiseHandshakePayload(google___protobuf___message___Message): def MergeFrom(self, other_msg: google___protobuf___message___Message) -> None: ... def CopyFrom(self, other_msg: google___protobuf___message___Message) -> None: ... if sys.version_info >= (3,): - def HasField(self, field_name: typing_extensions___Literal[u"data",u"identity_key",u"identity_sig"]) -> bool: ... def ClearField(self, field_name: typing_extensions___Literal[u"data",u"identity_key",u"identity_sig"]) -> None: ... else: - def HasField(self, field_name: typing_extensions___Literal[u"data",b"data",u"identity_key",b"identity_key",u"identity_sig",b"identity_sig"]) -> bool: ... def ClearField(self, field_name: typing_extensions___Literal[u"data",b"data",u"identity_key",b"identity_key",u"identity_sig",b"identity_sig"]) -> None: ...