diff --git a/AUTHORS.md b/AUTHORS.md index 585bff8ab7..8f619ee749 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -8,4 +8,4 @@ This is the official list of Fetch.AI authors for copyright purposes. * Aristotelis Triantafyllidis [Totoual](https://github.com/Totoual) * Diarmid Campbell [dishmop](https://github.com/dishmop) * Oleg Panasevych [Panasevychol](https://github.com/panasevychol) -* Kevin Chen [Kevin-Chen0]() +* Kevin Chen [Kevin-Chen0](https://github.com/Kevin-Chen0) diff --git a/HISTORY.md b/HISTORY.md index 9bb82d6096..c1db96e2c0 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,8 +2,12 @@ ## 0.2.3 (2020-03-19) -- Fixes stub connection +- Fixes stub connection file I/O +- Fixes OEF connection teardown +- Fixes CLI GUI subprocesses issues - Improves skill guide by adding a service provider agent +- Protocol generator bug fixes +- Add aea_version field to package yaml files for version management - Multiple docs updates and restructuring - Multiple additional minor fixes and changes diff --git a/aea/protocols/default/default_pb2.py b/aea/protocols/default/default_pb2.py index 836d6eca7e..e512806ae0 100644 --- a/aea/protocols/default/default_pb2.py +++ b/aea/protocols/default/default_pb2.py @@ -2,6 +2,9 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: protocols/default/default.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 @@ -17,7 +20,9 @@ package="fetch.aea.Default", syntax="proto3", serialized_options=None, - serialized_pb=b'\n\x1fprotocols/default/default.proto\x12\x11\x66\x65tch.aea.Default"\xd6\x05\n\x0e\x44\x65\x66\x61ultMessage\x12\x12\n\nmessage_id\x18\x01 \x01(\x05\x12"\n\x1a\x64ialogue_starter_reference\x18\x02 \x01(\t\x12$\n\x1c\x64ialogue_responder_reference\x18\x03 \x01(\t\x12\x0e\n\x06target\x18\x04 \x01(\x05\x12\x38\n\x05\x62ytes\x18\x05 \x01(\x0b\x32\'.fetch.aea.Default.DefaultMessage.BytesH\x00\x12\x38\n\x05\x65rror\x18\x06 \x01(\x0b\x32\'.fetch.aea.Default.DefaultMessage.ErrorH\x00\x1a\xdb\x01\n\tErrorCode\x12M\n\nerror_code\x18\x01 \x01(\x0e\x32\x39.fetch.aea.Default.DefaultMessage.ErrorCode.ErrorCodeEnum"\x7f\n\rErrorCodeEnum\x12\x18\n\x14UNSUPPORTED_PROTOCOL\x10\x00\x12\x12\n\x0e\x44\x45\x43ODING_ERROR\x10\x01\x12\x13\n\x0fINVALID_MESSAGE\x10\x02\x12\x15\n\x11UNSUPPORTED_SKILL\x10\x03\x12\x14\n\x10INVALID_DIALOGUE\x10\x04\x1a\x18\n\x05\x42ytes\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\x0c\x1a\xd9\x01\n\x05\x45rror\x12?\n\nerror_code\x18\x01 \x01(\x0b\x32+.fetch.aea.Default.DefaultMessage.ErrorCode\x12\x11\n\terror_msg\x18\x02 \x01(\t\x12J\n\nerror_data\x18\x03 \x03(\x0b\x32\x36.fetch.aea.Default.DefaultMessage.Error.ErrorDataEntry\x1a\x30\n\x0e\x45rrorDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\x42\x0e\n\x0cperformativeb\x06proto3', + serialized_pb=_b( + '\n\x1fprotocols/default/default.proto\x12\x11\x66\x65tch.aea.Default"\xd6\x05\n\x0e\x44\x65\x66\x61ultMessage\x12\x12\n\nmessage_id\x18\x01 \x01(\x05\x12"\n\x1a\x64ialogue_starter_reference\x18\x02 \x01(\t\x12$\n\x1c\x64ialogue_responder_reference\x18\x03 \x01(\t\x12\x0e\n\x06target\x18\x04 \x01(\x05\x12\x38\n\x05\x62ytes\x18\x05 \x01(\x0b\x32\'.fetch.aea.Default.DefaultMessage.BytesH\x00\x12\x38\n\x05\x65rror\x18\x06 \x01(\x0b\x32\'.fetch.aea.Default.DefaultMessage.ErrorH\x00\x1a\xdb\x01\n\tErrorCode\x12M\n\nerror_code\x18\x01 \x01(\x0e\x32\x39.fetch.aea.Default.DefaultMessage.ErrorCode.ErrorCodeEnum"\x7f\n\rErrorCodeEnum\x12\x18\n\x14UNSUPPORTED_PROTOCOL\x10\x00\x12\x12\n\x0e\x44\x45\x43ODING_ERROR\x10\x01\x12\x13\n\x0fINVALID_MESSAGE\x10\x02\x12\x15\n\x11UNSUPPORTED_SKILL\x10\x03\x12\x14\n\x10INVALID_DIALOGUE\x10\x04\x1a\x18\n\x05\x42ytes\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\x0c\x1a\xd9\x01\n\x05\x45rror\x12?\n\nerror_code\x18\x01 \x01(\x0b\x32+.fetch.aea.Default.DefaultMessage.ErrorCode\x12\x11\n\terror_msg\x18\x02 \x01(\t\x12J\n\nerror_data\x18\x03 \x03(\x0b\x32\x36.fetch.aea.Default.DefaultMessage.Error.ErrorDataEntry\x1a\x30\n\x0e\x45rrorDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\x42\x0e\n\x0cperformativeb\x06proto3' + ), ) @@ -121,7 +126,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=b"", + default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -159,7 +164,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=b"".decode("utf-8"), + default_value=_b("").decode("utf-8"), message_type=None, enum_type=None, containing_type=None, @@ -177,7 +182,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=b"", + default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -190,7 +195,7 @@ extensions=[], nested_types=[], enum_types=[], - serialized_options=b"8\001", + serialized_options=_b("8\001"), is_extendable=False, syntax="proto3", extension_ranges=[], @@ -233,7 +238,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=b"".decode("utf-8"), + default_value=_b("").decode("utf-8"), message_type=None, enum_type=None, containing_type=None, @@ -307,7 +312,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=b"".decode("utf-8"), + default_value=_b("").decode("utf-8"), message_type=None, enum_type=None, containing_type=None, @@ -325,7 +330,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=b"".decode("utf-8"), + default_value=_b("").decode("utf-8"), message_type=None, enum_type=None, containing_type=None, @@ -447,47 +452,47 @@ DefaultMessage = _reflection.GeneratedProtocolMessageType( "DefaultMessage", (_message.Message,), - { - "ErrorCode": _reflection.GeneratedProtocolMessageType( + dict( + ErrorCode=_reflection.GeneratedProtocolMessageType( "ErrorCode", (_message.Message,), - { - "DESCRIPTOR": _DEFAULTMESSAGE_ERRORCODE, - "__module__": "protocols.default.default_pb2" + dict( + DESCRIPTOR=_DEFAULTMESSAGE_ERRORCODE, + __module__="protocols.default.default_pb2" # @@protoc_insertion_point(class_scope:fetch.aea.Default.DefaultMessage.ErrorCode) - }, + ), ), - "Bytes": _reflection.GeneratedProtocolMessageType( + Bytes=_reflection.GeneratedProtocolMessageType( "Bytes", (_message.Message,), - { - "DESCRIPTOR": _DEFAULTMESSAGE_BYTES, - "__module__": "protocols.default.default_pb2" + dict( + DESCRIPTOR=_DEFAULTMESSAGE_BYTES, + __module__="protocols.default.default_pb2" # @@protoc_insertion_point(class_scope:fetch.aea.Default.DefaultMessage.Bytes) - }, + ), ), - "Error": _reflection.GeneratedProtocolMessageType( + Error=_reflection.GeneratedProtocolMessageType( "Error", (_message.Message,), - { - "ErrorDataEntry": _reflection.GeneratedProtocolMessageType( + dict( + ErrorDataEntry=_reflection.GeneratedProtocolMessageType( "ErrorDataEntry", (_message.Message,), - { - "DESCRIPTOR": _DEFAULTMESSAGE_ERROR_ERRORDATAENTRY, - "__module__": "protocols.default.default_pb2" + dict( + DESCRIPTOR=_DEFAULTMESSAGE_ERROR_ERRORDATAENTRY, + __module__="protocols.default.default_pb2" # @@protoc_insertion_point(class_scope:fetch.aea.Default.DefaultMessage.Error.ErrorDataEntry) - }, + ), ), - "DESCRIPTOR": _DEFAULTMESSAGE_ERROR, - "__module__": "protocols.default.default_pb2" + DESCRIPTOR=_DEFAULTMESSAGE_ERROR, + __module__="protocols.default.default_pb2" # @@protoc_insertion_point(class_scope:fetch.aea.Default.DefaultMessage.Error) - }, + ), ), - "DESCRIPTOR": _DEFAULTMESSAGE, - "__module__": "protocols.default.default_pb2" + DESCRIPTOR=_DEFAULTMESSAGE, + __module__="protocols.default.default_pb2" # @@protoc_insertion_point(class_scope:fetch.aea.Default.DefaultMessage) - }, + ), ) _sym_db.RegisterMessage(DefaultMessage) _sym_db.RegisterMessage(DefaultMessage.ErrorCode) diff --git a/aea/protocols/default/message.py b/aea/protocols/default/message.py index 754669d1ef..f77dfc1601 100644 --- a/aea/protocols/default/message.py +++ b/aea/protocols/default/message.py @@ -132,22 +132,36 @@ def _is_consistent(self) -> bool: try: assert ( type(self.dialogue_reference) == tuple - ), "dialogue_reference must be 'tuple' but it is not." + ), "Invalid type for 'dialogue_reference'. Expected 'tuple'. Found '{}'.".format( + type(self.dialogue_reference) + ) assert ( type(self.dialogue_reference[0]) == str - ), "The first element of dialogue_reference must be 'str' but it is not." + ), "Invalid type for 'dialogue_reference[0]'. Expected 'str'. Found '{}'.".format( + type(self.dialogue_reference[0]) + ) assert ( type(self.dialogue_reference[1]) == str - ), "The second element of dialogue_reference must be 'str' but it is not." - assert type(self.message_id) == int, "message_id is not int" - assert type(self.target) == int, "target is not int" + ), "Invalid type for 'dialogue_reference[1]'. Expected 'str'. Found '{}'.".format( + type(self.dialogue_reference[1]) + ) + assert ( + type(self.message_id) == int + ), "Invalid type for 'message_id'. Expected 'int'. Found '{}'.".format( + type(self.message_id) + ) + assert ( + type(self.target) == int + ), "Invalid type for 'target'. Expected 'int'. Found '{}'.".format( + type(self.target) + ) # Light Protocol Rule 2 # Check correct performative assert ( type(self.performative) == DefaultMessage.Performative - ), "'{}' is not in the list of valid performatives: {}".format( - self.performative, self.valid_performatives + ), "Invalid 'performative'. Expected either of '{}'. Found '{}'.".format( + self.valid_performatives, self.performative ) # Check correct contents @@ -157,30 +171,42 @@ def _is_consistent(self) -> bool: expected_nb_of_contents = 1 assert ( type(self.content) == bytes - ), "Content 'content' is not of type 'bytes'." + ), "Invalid type for content 'content'. Expected 'bytes'. Found '{}'.".format( + type(self.content) + ) elif self.performative == DefaultMessage.Performative.ERROR: expected_nb_of_contents = 3 assert ( type(self.error_code) == CustomErrorCode - ), "Content 'error_code' is not of type 'ErrorCode'." + ), "Invalid type for content 'error_code'. Expected 'ErrorCode'. Found '{}'.".format( + type(self.error_code) + ) assert ( type(self.error_msg) == str - ), "Content 'error_msg' is not of type 'str'." + ), "Invalid type for content 'error_msg'. Expected 'str'. Found '{}'.".format( + type(self.error_msg) + ) assert ( type(self.error_data) == dict - ), "Content 'error_data' is not of type 'dict'." - for key, value in self.error_data.items(): + ), "Invalid type for content 'error_data'. Expected 'dict'. Found '{}'.".format( + type(self.error_data) + ) + for key_of_error_data, value_of_error_data in self.error_data.items(): assert ( - type(key) == str - ), "Keys of 'error_data' dictionary are not of type 'str'." + type(key_of_error_data) == str + ), "Invalid type for dictionary keys in content 'error_data'. Expected 'str'. Found '{}'.".format( + type(key_of_error_data) + ) assert ( - type(value) == bytes - ), "Values of 'error_data' dictionary are not of type 'bytes'." + type(value_of_error_data) == bytes + ), "Invalid type for dictionary values in content 'error_data'. Expected 'bytes'. Found '{}'.".format( + type(value_of_error_data) + ) # Check correct content count assert ( expected_nb_of_contents == actual_nb_of_contents - ), "Incorrect number of contents. Expected {} contents. Found {}".format( + ), "Incorrect number of contents. Expected {}. Found {}".format( expected_nb_of_contents, actual_nb_of_contents ) @@ -188,14 +214,14 @@ def _is_consistent(self) -> bool: if self.message_id == 1: assert ( self.target == 0 - ), "Expected target to be 0 when message_id is 1. Found {}.".format( + ), "Invalid 'target'. Expected 0 (because 'message_id' is 1). Found {}.".format( self.target ) else: assert ( 0 < self.target < self.message_id - ), "Expected target to be between 1 to (message_id -1) inclusive. Found {}".format( - self.target + ), "Invalid 'target'. Expected an integer between 1 and {} inclusive. Found {}.".format( + self.message_id - 1, self.target, ) except (AssertionError, ValueError, KeyError) as e: print(str(e)) diff --git a/tests/data/generator/test_protocol/__init__.py b/tests/data/generator/t_protocol/__init__.py similarity index 100% rename from tests/data/generator/test_protocol/__init__.py rename to tests/data/generator/t_protocol/__init__.py diff --git a/tests/data/generator/test_protocol/custom_types.py b/tests/data/generator/t_protocol/custom_types.py similarity index 100% rename from tests/data/generator/test_protocol/custom_types.py rename to tests/data/generator/t_protocol/custom_types.py diff --git a/tests/data/generator/test_protocol/message.py b/tests/data/generator/t_protocol/message.py similarity index 96% rename from tests/data/generator/test_protocol/message.py rename to tests/data/generator/t_protocol/message.py index 0a67da9f50..93d82f8c5f 100644 --- a/tests/data/generator/test_protocol/message.py +++ b/tests/data/generator/t_protocol/message.py @@ -17,7 +17,7 @@ # # ------------------------------------------------------------------------------ -"""This module contains test_protocol's message definition.""" +"""This module contains t_protocol's message definition.""" from enum import Enum from typing import Dict, FrozenSet, Optional, Set, Tuple, Union, cast @@ -25,20 +25,20 @@ from aea.configurations.base import ProtocolId from aea.protocols.base import Message -from tests.data.generator.test_protocol.custom_types import DataModel as CustomDataModel +from tests.data.generator.t_protocol.custom_types import DataModel as CustomDataModel DEFAULT_BODY_SIZE = 4 -class TestProtocolMessage(Message): +class TProtocolMessage(Message): """A protocol for testing purposes.""" - protocol_id = ProtocolId("fetchai", "test_protocol", "0.1.0") + protocol_id = ProtocolId("fetchai", "t_protocol", "0.1.0") DataModel = CustomDataModel class Performative(Enum): - """Performatives for the test_protocol protocol.""" + """Performatives for the t_protocol protocol.""" PERFORMATIVE_CT = "performative_ct" PERFORMATIVE_EMPTY_CONTENTS = "performative_empty_contents" @@ -61,7 +61,7 @@ def __init__( **kwargs, ): """ - Initialise an instance of TestProtocolMessage. + Initialise an instance of TProtocolMessage. :param message_id: the message id. :param dialogue_reference: the dialogue reference. @@ -72,7 +72,7 @@ def __init__( dialogue_reference=dialogue_reference, message_id=message_id, target=target, - performative=TestProtocolMessage.Performative(performative), + performative=TProtocolMessage.Performative(performative), **kwargs, ) self._performatives = { @@ -86,7 +86,7 @@ def __init__( } assert ( self._is_consistent() - ), "This message is invalid according to the 'test_protocol' protocol." + ), "This message is invalid according to the 't_protocol' protocol." @property def valid_performatives(self) -> Set[str]: @@ -109,7 +109,7 @@ def message_id(self) -> int: def performative(self) -> Performative: # noqa: F821 """Get the performative of the message.""" assert self.is_set("performative"), "performative is not set." - return cast(TestProtocolMessage.Performative, self.get("performative")) + return cast(TProtocolMessage.Performative, self.get("performative")) @property def target(self) -> int: @@ -387,7 +387,7 @@ def content_union_2( ) def _is_consistent(self) -> bool: - """Check that the message follows the test_protocol protocol.""" + """Check that the message follows the t_protocol protocol.""" try: assert ( type(self.dialogue_reference) == tuple @@ -418,7 +418,7 @@ def _is_consistent(self) -> bool: # Light Protocol Rule 2 # Check correct performative assert ( - type(self.performative) == TestProtocolMessage.Performative + type(self.performative) == TProtocolMessage.Performative ), "Invalid 'performative'. Expected either of '{}'. Found '{}'.".format( self.valid_performatives, self.performative ) @@ -426,14 +426,14 @@ def _is_consistent(self) -> bool: # Check correct contents actual_nb_of_contents = len(self.body) - DEFAULT_BODY_SIZE expected_nb_of_contents = 0 - if self.performative == TestProtocolMessage.Performative.PERFORMATIVE_CT: + if self.performative == TProtocolMessage.Performative.PERFORMATIVE_CT: expected_nb_of_contents = 1 assert ( type(self.content_ct) == CustomDataModel ), "Invalid type for content 'content_ct'. Expected 'DataModel'. Found '{}'.".format( type(self.content_ct) ) - elif self.performative == TestProtocolMessage.Performative.PERFORMATIVE_PT: + elif self.performative == TProtocolMessage.Performative.PERFORMATIVE_PT: expected_nb_of_contents = 5 assert ( type(self.content_bytes) == bytes @@ -460,7 +460,7 @@ def _is_consistent(self) -> bool: ), "Invalid type for content 'content_str'. Expected 'str'. Found '{}'.".format( type(self.content_str) ) - elif self.performative == TestProtocolMessage.Performative.PERFORMATIVE_PCT: + elif self.performative == TProtocolMessage.Performative.PERFORMATIVE_PCT: expected_nb_of_contents = 12 assert ( type(self.content_set_ct) == frozenset @@ -558,7 +558,7 @@ def _is_consistent(self) -> bool: assert all( type(element) == str for element in self.content_list_str ), "Invalid type for tuple elements in content 'content_list_str'. Expected 'str'." - elif self.performative == TestProtocolMessage.Performative.PERFORMATIVE_PMT: + elif self.performative == TProtocolMessage.Performative.PERFORMATIVE_PMT: expected_nb_of_contents = 3 assert ( type(self.content_dict_int_ct) == dict @@ -617,7 +617,7 @@ def _is_consistent(self) -> bool: ), "Invalid type for dictionary values in content 'content_dict_str_float'. Expected 'float'. Found '{}'.".format( type(value_of_content_dict_str_float) ) - elif self.performative == TestProtocolMessage.Performative.PERFORMATIVE_MT: + elif self.performative == TProtocolMessage.Performative.PERFORMATIVE_MT: expected_nb_of_contents = 2 assert ( type(self.content_union_1) == CustomDataModel @@ -696,7 +696,7 @@ def _is_consistent(self) -> bool: and type(value_of_content_union_2) == bytes ) ), "Invalid type for dictionary key, value in content 'content_union_2'. Expected 'str','DataModel' or 'int','float' or 'bool','bytes'." - elif self.performative == TestProtocolMessage.Performative.PERFORMATIVE_O: + elif self.performative == TProtocolMessage.Performative.PERFORMATIVE_O: expected_nb_of_contents = 0 if self.is_set("content_o_ct"): expected_nb_of_contents += 1 @@ -785,7 +785,7 @@ def _is_consistent(self) -> bool: ), "Invalid type for dictionary key, value in content 'content_o_union'. Expected 'str', 'float'." elif ( self.performative - == TestProtocolMessage.Performative.PERFORMATIVE_EMPTY_CONTENTS + == TProtocolMessage.Performative.PERFORMATIVE_EMPTY_CONTENTS ): expected_nb_of_contents = 0 diff --git a/tests/data/generator/test_protocol/protocol.yaml b/tests/data/generator/t_protocol/protocol.yaml similarity index 87% rename from tests/data/generator/test_protocol/protocol.yaml rename to tests/data/generator/t_protocol/protocol.yaml index 68f3ecb625..cae3379c2c 100644 --- a/tests/data/generator/test_protocol/protocol.yaml +++ b/tests/data/generator/t_protocol/protocol.yaml @@ -1,4 +1,4 @@ -name: test_protocol +name: t_protocol author: fetchai version: 0.1.0 license: Apache-2.0 diff --git a/tests/data/generator/test_protocol/serialization.py b/tests/data/generator/t_protocol/serialization.py similarity index 67% rename from tests/data/generator/test_protocol/serialization.py rename to tests/data/generator/t_protocol/serialization.py index 8a9a1f763f..ad491c5dc5 100644 --- a/tests/data/generator/test_protocol/serialization.py +++ b/tests/data/generator/t_protocol/serialization.py @@ -17,44 +17,44 @@ # # ------------------------------------------------------------------------------ -"""Serialization module for test_protocol protocol.""" +"""Serialization module for t_protocol protocol.""" from typing import cast from aea.protocols.base import Message from aea.protocols.base import Serializer -from tests.data.generator.test_protocol import test_protocol_pb2 -from tests.data.generator.test_protocol.custom_types import DataModel -from tests.data.generator.test_protocol.message import TestProtocolMessage +from tests.data.generator.t_protocol import t_protocol_pb2 +from tests.data.generator.t_protocol.custom_types import DataModel +from tests.data.generator.t_protocol.message import TProtocolMessage -class TestProtocolSerializer(Serializer): - """Serialization for the 'test_protocol' protocol.""" +class TProtocolSerializer(Serializer): + """Serialization for the 't_protocol' protocol.""" def encode(self, msg: Message) -> bytes: """ - Encode a 'TestProtocol' message into bytes. + Encode a 'TProtocol' message into bytes. :param msg: the message object. :return: the bytes. """ - msg = cast(TestProtocolMessage, msg) - test_protocol_msg = test_protocol_pb2.TestProtocolMessage() - test_protocol_msg.message_id = msg.message_id + msg = cast(TProtocolMessage, msg) + t_protocol_msg = t_protocol_pb2.TProtocolMessage() + t_protocol_msg.message_id = msg.message_id dialogue_reference = msg.dialogue_reference - test_protocol_msg.dialogue_starter_reference = dialogue_reference[0] - test_protocol_msg.dialogue_responder_reference = dialogue_reference[1] - test_protocol_msg.target = msg.target + t_protocol_msg.dialogue_starter_reference = dialogue_reference[0] + t_protocol_msg.dialogue_responder_reference = dialogue_reference[1] + t_protocol_msg.target = msg.target performative_id = msg.performative - if performative_id == TestProtocolMessage.Performative.PERFORMATIVE_CT: - performative = test_protocol_pb2.TestProtocolMessage.Performative_Ct() # type: ignore + if performative_id == TProtocolMessage.Performative.PERFORMATIVE_CT: + performative = t_protocol_pb2.TProtocolMessage.Performative_Ct() # type: ignore content_ct = msg.content_ct performative = DataModel.encode(performative, content_ct) - test_protocol_msg.performative_ct.CopyFrom(performative) - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_PT: - performative = test_protocol_pb2.TestProtocolMessage.Performative_Pt() # type: ignore + t_protocol_msg.performative_ct.CopyFrom(performative) + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_PT: + performative = t_protocol_pb2.TProtocolMessage.Performative_Pt() # type: ignore content_bytes = msg.content_bytes performative.content_bytes = content_bytes content_int = msg.content_int @@ -65,9 +65,9 @@ def encode(self, msg: Message) -> bytes: performative.content_bool = content_bool content_str = msg.content_str performative.content_str = content_str - test_protocol_msg.performative_pt.CopyFrom(performative) - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_PCT: - performative = test_protocol_pb2.TestProtocolMessage.Performative_Pct() # type: ignore + t_protocol_msg.performative_pt.CopyFrom(performative) + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_PCT: + performative = t_protocol_pb2.TProtocolMessage.Performative_Pct() # type: ignore content_set_ct = msg.content_set_ct performative.content_set_ct.extend(content_set_ct) content_set_bytes = msg.content_set_bytes @@ -92,18 +92,18 @@ def encode(self, msg: Message) -> bytes: performative.content_list_bool.extend(content_list_bool) content_list_str = msg.content_list_str performative.content_list_str.extend(content_list_str) - test_protocol_msg.performative_pct.CopyFrom(performative) - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_PMT: - performative = test_protocol_pb2.TestProtocolMessage.Performative_Pmt() # type: ignore + t_protocol_msg.performative_pct.CopyFrom(performative) + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_PMT: + performative = t_protocol_pb2.TProtocolMessage.Performative_Pmt() # type: ignore content_dict_int_ct = msg.content_dict_int_ct performative.content_dict_int_ct.update(content_dict_int_ct) content_dict_bool_bytes = msg.content_dict_bool_bytes performative.content_dict_bool_bytes.update(content_dict_bool_bytes) content_dict_str_float = msg.content_dict_str_float performative.content_dict_str_float.update(content_dict_str_float) - test_protocol_msg.performative_pmt.CopyFrom(performative) - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_MT: - performative = test_protocol_pb2.TestProtocolMessage.Performative_Mt() # type: ignore + t_protocol_msg.performative_pmt.CopyFrom(performative) + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_MT: + performative = t_protocol_pb2.TProtocolMessage.Performative_Mt() # type: ignore if msg.is_set("content_union_1_type_DataModel"): performative.content_union_1_type_DataModel_is_set = True content_union_1_type_DataModel = msg.content_union_1_type_DataModel @@ -220,9 +220,9 @@ def encode(self, msg: Message) -> bytes: performative.content_union_2_type_dict_of_bool_bytes.update( content_union_2_type_dict_of_bool_bytes ) - test_protocol_msg.performative_mt.CopyFrom(performative) - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_O: - performative = test_protocol_pb2.TestProtocolMessage.Performative_O() # type: ignore + t_protocol_msg.performative_mt.CopyFrom(performative) + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_O: + performative = t_protocol_pb2.TProtocolMessage.Performative_O() # type: ignore if msg.is_set("content_o_ct"): performative.content_o_ct_is_set = True content_o_ct = msg.content_o_ct @@ -287,276 +287,258 @@ def encode(self, msg: Message) -> bytes: performative.content_o_union_type_dict_of_str_float.update( content_o_union_type_dict_of_str_float ) - test_protocol_msg.performative_o.CopyFrom(performative) + t_protocol_msg.performative_o.CopyFrom(performative) elif ( - performative_id - == TestProtocolMessage.Performative.PERFORMATIVE_EMPTY_CONTENTS + performative_id == TProtocolMessage.Performative.PERFORMATIVE_EMPTY_CONTENTS ): - performative = test_protocol_pb2.TestProtocolMessage.Performative_Empty_Contents() # type: ignore - test_protocol_msg.performative_empty_contents.CopyFrom(performative) + performative = t_protocol_pb2.TProtocolMessage.Performative_Empty_Contents() # type: ignore + t_protocol_msg.performative_empty_contents.CopyFrom(performative) else: raise ValueError("Performative not valid: {}".format(performative_id)) - test_protocol_bytes = test_protocol_msg.SerializeToString() - return test_protocol_bytes + t_protocol_bytes = t_protocol_msg.SerializeToString() + return t_protocol_bytes def decode(self, obj: bytes) -> Message: """ - Decode bytes into a 'TestProtocol' message. + Decode bytes into a 'TProtocol' message. :param obj: the bytes object. - :return: the 'TestProtocol' message. + :return: the 'TProtocol' message. """ - test_protocol_pb = test_protocol_pb2.TestProtocolMessage() - test_protocol_pb.ParseFromString(obj) - message_id = test_protocol_pb.message_id + t_protocol_pb = t_protocol_pb2.TProtocolMessage() + t_protocol_pb.ParseFromString(obj) + message_id = t_protocol_pb.message_id dialogue_reference = ( - test_protocol_pb.dialogue_starter_reference, - test_protocol_pb.dialogue_responder_reference, + t_protocol_pb.dialogue_starter_reference, + t_protocol_pb.dialogue_responder_reference, ) - target = test_protocol_pb.target + target = t_protocol_pb.target - performative = test_protocol_pb.WhichOneof("performative") - performative_id = TestProtocolMessage.Performative(str(performative)) + performative = t_protocol_pb.WhichOneof("performative") + performative_id = TProtocolMessage.Performative(str(performative)) performative_content = dict() - if performative_id == TestProtocolMessage.Performative.PERFORMATIVE_CT: - pb2_content_ct = test_protocol_pb.performative_ct.content_ct + if performative_id == TProtocolMessage.Performative.PERFORMATIVE_CT: + pb2_content_ct = t_protocol_pb.performative_ct.content_ct content_ct = DataModel.decode(pb2_content_ct) performative_content["content_ct"] = content_ct - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_PT: - content_bytes = test_protocol_pb.performative_pt.content_bytes + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_PT: + content_bytes = t_protocol_pb.performative_pt.content_bytes performative_content["content_bytes"] = content_bytes - content_int = test_protocol_pb.performative_pt.content_int + content_int = t_protocol_pb.performative_pt.content_int performative_content["content_int"] = content_int - content_float = test_protocol_pb.performative_pt.content_float + content_float = t_protocol_pb.performative_pt.content_float performative_content["content_float"] = content_float - content_bool = test_protocol_pb.performative_pt.content_bool + content_bool = t_protocol_pb.performative_pt.content_bool performative_content["content_bool"] = content_bool - content_str = test_protocol_pb.performative_pt.content_str + content_str = t_protocol_pb.performative_pt.content_str performative_content["content_str"] = content_str - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_PCT: - content_set_ct = test_protocol_pb.performative_pct.content_set_ct + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_PCT: + content_set_ct = t_protocol_pb.performative_pct.content_set_ct content_set_ct_frozenset = frozenset(content_set_ct) performative_content["content_set_ct"] = content_set_ct_frozenset - content_set_bytes = test_protocol_pb.performative_pct.content_set_bytes + content_set_bytes = t_protocol_pb.performative_pct.content_set_bytes content_set_bytes_frozenset = frozenset(content_set_bytes) performative_content["content_set_bytes"] = content_set_bytes_frozenset - content_set_int = test_protocol_pb.performative_pct.content_set_int + content_set_int = t_protocol_pb.performative_pct.content_set_int content_set_int_frozenset = frozenset(content_set_int) performative_content["content_set_int"] = content_set_int_frozenset - content_set_float = test_protocol_pb.performative_pct.content_set_float + content_set_float = t_protocol_pb.performative_pct.content_set_float content_set_float_frozenset = frozenset(content_set_float) performative_content["content_set_float"] = content_set_float_frozenset - content_set_bool = test_protocol_pb.performative_pct.content_set_bool + content_set_bool = t_protocol_pb.performative_pct.content_set_bool content_set_bool_frozenset = frozenset(content_set_bool) performative_content["content_set_bool"] = content_set_bool_frozenset - content_set_str = test_protocol_pb.performative_pct.content_set_str + content_set_str = t_protocol_pb.performative_pct.content_set_str content_set_str_frozenset = frozenset(content_set_str) performative_content["content_set_str"] = content_set_str_frozenset - content_list_ct = test_protocol_pb.performative_pct.content_list_ct + content_list_ct = t_protocol_pb.performative_pct.content_list_ct content_list_ct_tuple = tuple(content_list_ct) performative_content["content_list_ct"] = content_list_ct_tuple - content_list_bytes = test_protocol_pb.performative_pct.content_list_bytes + content_list_bytes = t_protocol_pb.performative_pct.content_list_bytes content_list_bytes_tuple = tuple(content_list_bytes) performative_content["content_list_bytes"] = content_list_bytes_tuple - content_list_int = test_protocol_pb.performative_pct.content_list_int + content_list_int = t_protocol_pb.performative_pct.content_list_int content_list_int_tuple = tuple(content_list_int) performative_content["content_list_int"] = content_list_int_tuple - content_list_float = test_protocol_pb.performative_pct.content_list_float + content_list_float = t_protocol_pb.performative_pct.content_list_float content_list_float_tuple = tuple(content_list_float) performative_content["content_list_float"] = content_list_float_tuple - content_list_bool = test_protocol_pb.performative_pct.content_list_bool + content_list_bool = t_protocol_pb.performative_pct.content_list_bool content_list_bool_tuple = tuple(content_list_bool) performative_content["content_list_bool"] = content_list_bool_tuple - content_list_str = test_protocol_pb.performative_pct.content_list_str + content_list_str = t_protocol_pb.performative_pct.content_list_str content_list_str_tuple = tuple(content_list_str) performative_content["content_list_str"] = content_list_str_tuple - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_PMT: - content_dict_int_ct = test_protocol_pb.performative_pmt.content_dict_int_ct + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_PMT: + content_dict_int_ct = t_protocol_pb.performative_pmt.content_dict_int_ct content_dict_int_ct_dict = dict(content_dict_int_ct) performative_content["content_dict_int_ct"] = content_dict_int_ct_dict content_dict_bool_bytes = ( - test_protocol_pb.performative_pmt.content_dict_bool_bytes + t_protocol_pb.performative_pmt.content_dict_bool_bytes ) content_dict_bool_bytes_dict = dict(content_dict_bool_bytes) performative_content[ "content_dict_bool_bytes" ] = content_dict_bool_bytes_dict content_dict_str_float = ( - test_protocol_pb.performative_pmt.content_dict_str_float + t_protocol_pb.performative_pmt.content_dict_str_float ) content_dict_str_float_dict = dict(content_dict_str_float) performative_content["content_dict_str_float"] = content_dict_str_float_dict - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_MT: - if test_protocol_pb.performative_mt.content_union_1_type_DataModel_is_set: + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_MT: + if t_protocol_pb.performative_mt.content_union_1_type_DataModel_is_set: pb2_content_union_1_type_DataModel = ( - test_protocol_pb.performative_mt.content_union_1_type_DataModel + t_protocol_pb.performative_mt.content_union_1_type_DataModel ) content_union_1 = DataModel.decode(pb2_content_union_1_type_DataModel) performative_content["content_union_1"] = content_union_1 - if test_protocol_pb.performative_mt.content_union_1_type_bytes_is_set: + if t_protocol_pb.performative_mt.content_union_1_type_bytes_is_set: content_union_1 = ( - test_protocol_pb.performative_mt.content_union_1_type_bytes + t_protocol_pb.performative_mt.content_union_1_type_bytes ) performative_content["content_union_1"] = content_union_1 - if test_protocol_pb.performative_mt.content_union_1_type_int_is_set: - content_union_1 = ( - test_protocol_pb.performative_mt.content_union_1_type_int - ) + if t_protocol_pb.performative_mt.content_union_1_type_int_is_set: + content_union_1 = t_protocol_pb.performative_mt.content_union_1_type_int performative_content["content_union_1"] = content_union_1 - if test_protocol_pb.performative_mt.content_union_1_type_float_is_set: + if t_protocol_pb.performative_mt.content_union_1_type_float_is_set: content_union_1 = ( - test_protocol_pb.performative_mt.content_union_1_type_float + t_protocol_pb.performative_mt.content_union_1_type_float ) performative_content["content_union_1"] = content_union_1 - if test_protocol_pb.performative_mt.content_union_1_type_bool_is_set: + if t_protocol_pb.performative_mt.content_union_1_type_bool_is_set: content_union_1 = ( - test_protocol_pb.performative_mt.content_union_1_type_bool + t_protocol_pb.performative_mt.content_union_1_type_bool ) performative_content["content_union_1"] = content_union_1 - if test_protocol_pb.performative_mt.content_union_1_type_str_is_set: - content_union_1 = ( - test_protocol_pb.performative_mt.content_union_1_type_str - ) + if t_protocol_pb.performative_mt.content_union_1_type_str_is_set: + content_union_1 = t_protocol_pb.performative_mt.content_union_1_type_str performative_content["content_union_1"] = content_union_1 - if test_protocol_pb.performative_mt.content_union_1_type_set_of_int_is_set: - content_union_1 = test_protocol_pb.performative_mt.content_union_1 + if t_protocol_pb.performative_mt.content_union_1_type_set_of_int_is_set: + content_union_1 = t_protocol_pb.performative_mt.content_union_1 content_union_1_frozenset = frozenset(content_union_1) performative_content["content_union_1"] = content_union_1_frozenset if ( - test_protocol_pb.performative_mt.content_union_1_type_list_of_DataModel_is_set + t_protocol_pb.performative_mt.content_union_1_type_list_of_DataModel_is_set ): - content_union_1 = test_protocol_pb.performative_mt.content_union_1 + content_union_1 = t_protocol_pb.performative_mt.content_union_1 content_union_1_tuple = tuple(content_union_1) performative_content["content_union_1"] = content_union_1_tuple if ( - test_protocol_pb.performative_mt.content_union_1_type_dict_of_str_DataModel_is_set + t_protocol_pb.performative_mt.content_union_1_type_dict_of_str_DataModel_is_set ): - content_union_1 = test_protocol_pb.performative_mt.content_union_1 + content_union_1 = t_protocol_pb.performative_mt.content_union_1 content_union_1_dict = dict(content_union_1) performative_content["content_union_1"] = content_union_1_dict - if test_protocol_pb.performative_mt.content_union_2_type_set_of_int_is_set: - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + if t_protocol_pb.performative_mt.content_union_2_type_set_of_int_is_set: + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_frozenset = frozenset(content_union_2) performative_content["content_union_2"] = content_union_2_frozenset if ( - test_protocol_pb.performative_mt.content_union_2_type_set_of_DataModel_is_set + t_protocol_pb.performative_mt.content_union_2_type_set_of_DataModel_is_set ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_frozenset = frozenset(content_union_2) performative_content["content_union_2"] = content_union_2_frozenset - if test_protocol_pb.performative_mt.content_union_2_type_set_of_str_is_set: - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + if t_protocol_pb.performative_mt.content_union_2_type_set_of_str_is_set: + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_frozenset = frozenset(content_union_2) performative_content["content_union_2"] = content_union_2_frozenset if ( - test_protocol_pb.performative_mt.content_union_2_type_list_of_DataModel_is_set + t_protocol_pb.performative_mt.content_union_2_type_list_of_DataModel_is_set ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_tuple = tuple(content_union_2) performative_content["content_union_2"] = content_union_2_tuple - if ( - test_protocol_pb.performative_mt.content_union_2_type_list_of_bool_is_set - ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + if t_protocol_pb.performative_mt.content_union_2_type_list_of_bool_is_set: + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_tuple = tuple(content_union_2) performative_content["content_union_2"] = content_union_2_tuple - if ( - test_protocol_pb.performative_mt.content_union_2_type_list_of_bytes_is_set - ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + if t_protocol_pb.performative_mt.content_union_2_type_list_of_bytes_is_set: + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_tuple = tuple(content_union_2) performative_content["content_union_2"] = content_union_2_tuple if ( - test_protocol_pb.performative_mt.content_union_2_type_dict_of_str_DataModel_is_set + t_protocol_pb.performative_mt.content_union_2_type_dict_of_str_DataModel_is_set ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_dict = dict(content_union_2) performative_content["content_union_2"] = content_union_2_dict if ( - test_protocol_pb.performative_mt.content_union_2_type_dict_of_int_float_is_set + t_protocol_pb.performative_mt.content_union_2_type_dict_of_int_float_is_set ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_dict = dict(content_union_2) performative_content["content_union_2"] = content_union_2_dict if ( - test_protocol_pb.performative_mt.content_union_2_type_dict_of_bool_bytes_is_set + t_protocol_pb.performative_mt.content_union_2_type_dict_of_bool_bytes_is_set ): - content_union_2 = test_protocol_pb.performative_mt.content_union_2 + content_union_2 = t_protocol_pb.performative_mt.content_union_2 content_union_2_dict = dict(content_union_2) performative_content["content_union_2"] = content_union_2_dict - elif performative_id == TestProtocolMessage.Performative.PERFORMATIVE_O: - if test_protocol_pb.performative_o.content_o_ct_is_set: - pb2_content_o_ct = test_protocol_pb.performative_o.content_o_ct + elif performative_id == TProtocolMessage.Performative.PERFORMATIVE_O: + if t_protocol_pb.performative_o.content_o_ct_is_set: + pb2_content_o_ct = t_protocol_pb.performative_o.content_o_ct content_o_ct = DataModel.decode(pb2_content_o_ct) performative_content["content_o_ct"] = content_o_ct - if test_protocol_pb.performative_o.content_o_bool_is_set: - content_o_bool = test_protocol_pb.performative_o.content_o_bool + if t_protocol_pb.performative_o.content_o_bool_is_set: + content_o_bool = t_protocol_pb.performative_o.content_o_bool performative_content["content_o_bool"] = content_o_bool - if test_protocol_pb.performative_o.content_o_set_float_is_set: - content_o_set_float = ( - test_protocol_pb.performative_o.content_o_set_float - ) + if t_protocol_pb.performative_o.content_o_set_float_is_set: + content_o_set_float = t_protocol_pb.performative_o.content_o_set_float content_o_set_float_frozenset = frozenset(content_o_set_float) performative_content[ "content_o_set_float" ] = content_o_set_float_frozenset - if test_protocol_pb.performative_o.content_o_list_bytes_is_set: - content_o_list_bytes = ( - test_protocol_pb.performative_o.content_o_list_bytes - ) + if t_protocol_pb.performative_o.content_o_list_bytes_is_set: + content_o_list_bytes = t_protocol_pb.performative_o.content_o_list_bytes content_o_list_bytes_tuple = tuple(content_o_list_bytes) performative_content[ "content_o_list_bytes" ] = content_o_list_bytes_tuple - if test_protocol_pb.performative_o.content_o_dict_str_int_is_set: + if t_protocol_pb.performative_o.content_o_dict_str_int_is_set: content_o_dict_str_int = ( - test_protocol_pb.performative_o.content_o_dict_str_int + t_protocol_pb.performative_o.content_o_dict_str_int ) content_o_dict_str_int_dict = dict(content_o_dict_str_int) performative_content[ "content_o_dict_str_int" ] = content_o_dict_str_int_dict - if test_protocol_pb.performative_o.content_o_union_type_str_is_set: - content_o_union = ( - test_protocol_pb.performative_o.content_o_union_type_str - ) + if t_protocol_pb.performative_o.content_o_union_type_str_is_set: + content_o_union = t_protocol_pb.performative_o.content_o_union_type_str performative_content["content_o_union"] = content_o_union - if ( - test_protocol_pb.performative_o.content_o_union_type_dict_of_str_int_is_set - ): - content_o_union = test_protocol_pb.performative_o.content_o_union + if t_protocol_pb.performative_o.content_o_union_type_dict_of_str_int_is_set: + content_o_union = t_protocol_pb.performative_o.content_o_union content_o_union_dict = dict(content_o_union) performative_content["content_o_union"] = content_o_union_dict if ( - test_protocol_pb.performative_o.content_o_union_type_set_of_DataModel_is_set + t_protocol_pb.performative_o.content_o_union_type_set_of_DataModel_is_set ): - content_o_union = test_protocol_pb.performative_o.content_o_union + content_o_union = t_protocol_pb.performative_o.content_o_union content_o_union_frozenset = frozenset(content_o_union) performative_content["content_o_union"] = content_o_union_frozenset - if test_protocol_pb.performative_o.content_o_union_type_set_of_bytes_is_set: - content_o_union = test_protocol_pb.performative_o.content_o_union + if t_protocol_pb.performative_o.content_o_union_type_set_of_bytes_is_set: + content_o_union = t_protocol_pb.performative_o.content_o_union content_o_union_frozenset = frozenset(content_o_union) performative_content["content_o_union"] = content_o_union_frozenset - if test_protocol_pb.performative_o.content_o_union_type_list_of_bool_is_set: - content_o_union = test_protocol_pb.performative_o.content_o_union + if t_protocol_pb.performative_o.content_o_union_type_list_of_bool_is_set: + content_o_union = t_protocol_pb.performative_o.content_o_union content_o_union_tuple = tuple(content_o_union) performative_content["content_o_union"] = content_o_union_tuple if ( - test_protocol_pb.performative_o.content_o_union_type_dict_of_str_float_is_set + t_protocol_pb.performative_o.content_o_union_type_dict_of_str_float_is_set ): - content_o_union = test_protocol_pb.performative_o.content_o_union + content_o_union = t_protocol_pb.performative_o.content_o_union content_o_union_dict = dict(content_o_union) performative_content["content_o_union"] = content_o_union_dict elif ( - performative_id - == TestProtocolMessage.Performative.PERFORMATIVE_EMPTY_CONTENTS + performative_id == TProtocolMessage.Performative.PERFORMATIVE_EMPTY_CONTENTS ): pass else: raise ValueError("Performative not valid: {}.".format(performative_id)) - return TestProtocolMessage( + return TProtocolMessage( message_id=message_id, dialogue_reference=dialogue_reference, target=target, diff --git a/tests/data/generator/test_protocol/test_protocol.proto b/tests/data/generator/t_protocol/t_protocol.proto similarity index 98% rename from tests/data/generator/test_protocol/test_protocol.proto rename to tests/data/generator/t_protocol/t_protocol.proto index f091347287..540b01bdbb 100644 --- a/tests/data/generator/test_protocol/test_protocol.proto +++ b/tests/data/generator/t_protocol/t_protocol.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package fetch.aea.TestProtocol; +package fetch.aea.TProtocol; -message TestProtocolMessage{ +message TProtocolMessage{ // Custom Types message DataModel{ diff --git a/tests/data/generator/test_protocol/test_protocol_pb2.py b/tests/data/generator/t_protocol/t_protocol_pb2.py similarity index 61% rename from tests/data/generator/test_protocol/test_protocol_pb2.py rename to tests/data/generator/t_protocol/t_protocol_pb2.py index 5f51a57af8..c0d9a3183f 100644 --- a/tests/data/generator/test_protocol/test_protocol_pb2.py +++ b/tests/data/generator/t_protocol/t_protocol_pb2.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: protocols/test_protocol/test_protocol.proto +# source: t_protocol.proto import sys @@ -16,26 +16,26 @@ DESCRIPTOR = _descriptor.FileDescriptor( - name="protocols/test_protocol/test_protocol.proto", - package="fetch.aea.TestProtocol", + name="t_protocol.proto", + package="fetch.aea.TProtocol", syntax="proto3", serialized_options=None, serialized_pb=_b( - '\n+protocols/test_protocol/test_protocol.proto\x12\x16\x66\x65tch.aea.TestProtocol"\xad*\n\x13TestProtocolMessage\x12\x12\n\nmessage_id\x18\x01 \x01(\x05\x12"\n\x1a\x64ialogue_starter_reference\x18\x02 \x01(\t\x12$\n\x1c\x64ialogue_responder_reference\x18\x03 \x01(\t\x12\x0e\n\x06target\x18\x04 \x01(\x05\x12V\n\x0fperformative_ct\x18\x05 \x01(\x0b\x32;.fetch.aea.TestProtocol.TestProtocolMessage.Performative_CtH\x00\x12n\n\x1bperformative_empty_contents\x18\x06 \x01(\x0b\x32G.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Empty_ContentsH\x00\x12V\n\x0fperformative_mt\x18\x07 \x01(\x0b\x32;.fetch.aea.TestProtocol.TestProtocolMessage.Performative_MtH\x00\x12T\n\x0eperformative_o\x18\x08 \x01(\x0b\x32:.fetch.aea.TestProtocol.TestProtocolMessage.Performative_OH\x00\x12X\n\x10performative_pct\x18\t \x01(\x0b\x32<.fetch.aea.TestProtocol.TestProtocolMessage.Performative_PctH\x00\x12X\n\x10performative_pmt\x18\n \x01(\x0b\x32<.fetch.aea.TestProtocol.TestProtocolMessage.Performative_PmtH\x00\x12V\n\x0fperformative_pt\x18\x0b \x01(\x0b\x32;.fetch.aea.TestProtocol.TestProtocolMessage.Performative_PtH\x00\x1a\xa2\x02\n\tDataModel\x12\x13\n\x0b\x62ytes_field\x18\x01 \x01(\x0c\x12\x11\n\tint_field\x18\x02 \x01(\x05\x12\x13\n\x0b\x66loat_field\x18\x03 \x01(\x02\x12\x12\n\nbool_field\x18\x04 \x01(\x08\x12\x11\n\tstr_field\x18\x05 \x01(\t\x12\x11\n\tset_field\x18\x06 \x03(\x05\x12\x12\n\nlist_field\x18\x07 \x03(\t\x12X\n\ndict_field\x18\x08 \x03(\x0b\x32\x44.fetch.aea.TestProtocol.TestProtocolMessage.DataModel.DictFieldEntry\x1a\x30\n\x0e\x44ictFieldEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x1a\\\n\x0fPerformative_Ct\x12I\n\ncontent_ct\x18\x01 \x01(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x1a\x7f\n\x0fPerformative_Pt\x12\x15\n\rcontent_bytes\x18\x01 \x01(\x0c\x12\x13\n\x0b\x63ontent_int\x18\x02 \x01(\x05\x12\x15\n\rcontent_float\x18\x03 \x01(\x02\x12\x14\n\x0c\x63ontent_bool\x18\x04 \x01(\x08\x12\x13\n\x0b\x63ontent_str\x18\x05 \x01(\t\x1a\xba\x03\n\x10Performative_Pct\x12M\n\x0e\x63ontent_set_ct\x18\x01 \x03(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12\x19\n\x11\x63ontent_set_bytes\x18\x02 \x03(\x0c\x12\x17\n\x0f\x63ontent_set_int\x18\x03 \x03(\x05\x12\x19\n\x11\x63ontent_set_float\x18\x04 \x03(\x02\x12\x18\n\x10\x63ontent_set_bool\x18\x05 \x03(\x08\x12\x17\n\x0f\x63ontent_set_str\x18\x06 \x03(\t\x12N\n\x0f\x63ontent_list_ct\x18\x07 \x03(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12\x1a\n\x12\x63ontent_list_bytes\x18\x08 \x03(\x0c\x12\x18\n\x10\x63ontent_list_int\x18\t \x03(\x05\x12\x1a\n\x12\x63ontent_list_float\x18\n \x03(\x02\x12\x19\n\x11\x63ontent_list_bool\x18\x0b \x03(\x08\x12\x18\n\x10\x63ontent_list_str\x18\x0c \x03(\t\x1a\xdc\x04\n\x10Performative_Pmt\x12o\n\x13\x63ontent_dict_int_ct\x18\x01 \x03(\x0b\x32R.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictIntCtEntry\x12w\n\x17\x63ontent_dict_bool_bytes\x18\x02 \x03(\x0b\x32V.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry\x12u\n\x16\x63ontent_dict_str_float\x18\x03 \x03(\x0b\x32U.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry\x1an\n\x15\x43ontentDictIntCtEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\x44\n\x05value\x18\x02 \x01(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel:\x02\x38\x01\x1a;\n\x19\x43ontentDictBoolBytesEntry\x12\x0b\n\x03key\x18\x01 \x01(\x08\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\x1a:\n\x18\x43ontentDictStrFloatEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\x1a\x9c\x0e\n\x0fPerformative_Mt\x12]\n\x1e\x63ontent_union_1_type_DataModel\x18\x01 \x01(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12"\n\x1a\x63ontent_union_1_type_bytes\x18\x02 \x01(\x0c\x12 \n\x18\x63ontent_union_1_type_int\x18\x03 \x01(\x05\x12"\n\x1a\x63ontent_union_1_type_float\x18\x04 \x01(\x02\x12!\n\x19\x63ontent_union_1_type_bool\x18\x05 \x01(\x08\x12 \n\x18\x63ontent_union_1_type_str\x18\x06 \x01(\t\x12\'\n\x1f\x63ontent_union_1_type_set_of_int\x18\x07 \x03(\x05\x12\x65\n&content_union_1_type_list_of_DataModel\x18\x08 \x03(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12\x98\x01\n*content_union_1_type_dict_of_str_DataModel\x18\t \x03(\x0b\x32\x64.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry\x12\'\n\x1f\x63ontent_union_2_type_set_of_int\x18\n \x03(\x05\x12\x64\n%content_union_2_type_set_of_DataModel\x18\x0b \x03(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12\'\n\x1f\x63ontent_union_2_type_set_of_str\x18\x0c \x03(\t\x12\x65\n&content_union_2_type_list_of_DataModel\x18\r \x03(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12)\n!content_union_2_type_list_of_bool\x18\x0e \x03(\x08\x12*\n"content_union_2_type_list_of_bytes\x18\x0f \x03(\x0c\x12\x98\x01\n*content_union_2_type_dict_of_str_DataModel\x18\x10 \x03(\x0b\x32\x64.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry\x12\x90\x01\n&content_union_2_type_dict_of_int_float\x18\x11 \x03(\x0b\x32`.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry\x12\x92\x01\n\'content_union_2_type_dict_of_bool_bytes\x18\x12 \x03(\x0b\x32\x61.fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry\x1a\x81\x01\n(ContentUnion1TypeDictOfStrDataModelEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x44\n\x05value\x18\x02 \x01(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel:\x02\x38\x01\x1a\x81\x01\n(ContentUnion2TypeDictOfStrDataModelEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x44\n\x05value\x18\x02 \x01(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel:\x02\x38\x01\x1a\x46\n$ContentUnion2TypeDictOfIntFloatEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\x1aG\n%ContentUnion2TypeDictOfBoolBytesEntry\x12\x0b\n\x03key\x18\x01 \x01(\x08\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\x1a\xb7\t\n\x0ePerformative_O\x12K\n\x0c\x63ontent_o_ct\x18\x01 \x01(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12\x1b\n\x13\x63ontent_o_ct_is_set\x18\x02 \x01(\x08\x12\x16\n\x0e\x63ontent_o_bool\x18\x03 \x01(\x08\x12\x1d\n\x15\x63ontent_o_bool_is_set\x18\x04 \x01(\x08\x12\x1b\n\x13\x63ontent_o_set_float\x18\x05 \x03(\x02\x12"\n\x1a\x63ontent_o_set_float_is_set\x18\x06 \x01(\x08\x12\x1c\n\x14\x63ontent_o_list_bytes\x18\x07 \x03(\x0c\x12#\n\x1b\x63ontent_o_list_bytes_is_set\x18\x08 \x01(\x08\x12r\n\x16\x63ontent_o_dict_str_int\x18\t \x03(\x0b\x32R.fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentODictStrIntEntry\x12%\n\x1d\x63ontent_o_dict_str_int_is_set\x18\n \x01(\x08\x12 \n\x18\x63ontent_o_union_type_str\x18\x0b \x01(\t\x12\x8b\x01\n$content_o_union_type_dict_of_str_int\x18\x0c \x03(\x0b\x32].fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry\x12\x64\n%content_o_union_type_set_of_DataModel\x18\r \x03(\x0b\x32\x35.fetch.aea.TestProtocol.TestProtocolMessage.DataModel\x12)\n!content_o_union_type_set_of_bytes\x18\x0e \x03(\x0c\x12)\n!content_o_union_type_list_of_bool\x18\x0f \x03(\x08\x12\x8f\x01\n&content_o_union_type_dict_of_str_float\x18\x10 \x03(\x0b\x32_.fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry\x12\x1e\n\x16\x63ontent_o_union_is_set\x18\x11 \x01(\x08\x1a\x39\n\x17\x43ontentODictStrIntEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x44\n"ContentOUnionTypeDictOfStrIntEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x46\n$ContentOUnionTypeDictOfStrFloatEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\x1a\x1d\n\x1bPerformative_Empty_ContentsB\x0e\n\x0cperformativeb\x06proto3' + '\n\x10t_protocol.proto\x12\x13\x66\x65tch.aea.TProtocol"\xf4(\n\x10TProtocolMessage\x12\x12\n\nmessage_id\x18\x01 \x01(\x05\x12"\n\x1a\x64ialogue_starter_reference\x18\x02 \x01(\t\x12$\n\x1c\x64ialogue_responder_reference\x18\x03 \x01(\t\x12\x0e\n\x06target\x18\x04 \x01(\x05\x12P\n\x0fperformative_ct\x18\x05 \x01(\x0b\x32\x35.fetch.aea.TProtocol.TProtocolMessage.Performative_CtH\x00\x12h\n\x1bperformative_empty_contents\x18\x06 \x01(\x0b\x32\x41.fetch.aea.TProtocol.TProtocolMessage.Performative_Empty_ContentsH\x00\x12P\n\x0fperformative_mt\x18\x07 \x01(\x0b\x32\x35.fetch.aea.TProtocol.TProtocolMessage.Performative_MtH\x00\x12N\n\x0eperformative_o\x18\x08 \x01(\x0b\x32\x34.fetch.aea.TProtocol.TProtocolMessage.Performative_OH\x00\x12R\n\x10performative_pct\x18\t \x01(\x0b\x32\x36.fetch.aea.TProtocol.TProtocolMessage.Performative_PctH\x00\x12R\n\x10performative_pmt\x18\n \x01(\x0b\x32\x36.fetch.aea.TProtocol.TProtocolMessage.Performative_PmtH\x00\x12P\n\x0fperformative_pt\x18\x0b \x01(\x0b\x32\x35.fetch.aea.TProtocol.TProtocolMessage.Performative_PtH\x00\x1a\x9c\x02\n\tDataModel\x12\x13\n\x0b\x62ytes_field\x18\x01 \x01(\x0c\x12\x11\n\tint_field\x18\x02 \x01(\x05\x12\x13\n\x0b\x66loat_field\x18\x03 \x01(\x02\x12\x12\n\nbool_field\x18\x04 \x01(\x08\x12\x11\n\tstr_field\x18\x05 \x01(\t\x12\x11\n\tset_field\x18\x06 \x03(\x05\x12\x12\n\nlist_field\x18\x07 \x03(\t\x12R\n\ndict_field\x18\x08 \x03(\x0b\x32>.fetch.aea.TProtocol.TProtocolMessage.DataModel.DictFieldEntry\x1a\x30\n\x0e\x44ictFieldEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x1aV\n\x0fPerformative_Ct\x12\x43\n\ncontent_ct\x18\x01 \x01(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x1a\x7f\n\x0fPerformative_Pt\x12\x15\n\rcontent_bytes\x18\x01 \x01(\x0c\x12\x13\n\x0b\x63ontent_int\x18\x02 \x01(\x05\x12\x15\n\rcontent_float\x18\x03 \x01(\x02\x12\x14\n\x0c\x63ontent_bool\x18\x04 \x01(\x08\x12\x13\n\x0b\x63ontent_str\x18\x05 \x01(\t\x1a\xae\x03\n\x10Performative_Pct\x12G\n\x0e\x63ontent_set_ct\x18\x01 \x03(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12\x19\n\x11\x63ontent_set_bytes\x18\x02 \x03(\x0c\x12\x17\n\x0f\x63ontent_set_int\x18\x03 \x03(\x05\x12\x19\n\x11\x63ontent_set_float\x18\x04 \x03(\x02\x12\x18\n\x10\x63ontent_set_bool\x18\x05 \x03(\x08\x12\x17\n\x0f\x63ontent_set_str\x18\x06 \x03(\t\x12H\n\x0f\x63ontent_list_ct\x18\x07 \x03(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12\x1a\n\x12\x63ontent_list_bytes\x18\x08 \x03(\x0c\x12\x18\n\x10\x63ontent_list_int\x18\t \x03(\x05\x12\x1a\n\x12\x63ontent_list_float\x18\n \x03(\x02\x12\x19\n\x11\x63ontent_list_bool\x18\x0b \x03(\x08\x12\x18\n\x10\x63ontent_list_str\x18\x0c \x03(\t\x1a\xc4\x04\n\x10Performative_Pmt\x12i\n\x13\x63ontent_dict_int_ct\x18\x01 \x03(\x0b\x32L.fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictIntCtEntry\x12q\n\x17\x63ontent_dict_bool_bytes\x18\x02 \x03(\x0b\x32P.fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry\x12o\n\x16\x63ontent_dict_str_float\x18\x03 \x03(\x0b\x32O.fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry\x1ah\n\x15\x43ontentDictIntCtEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12>\n\x05value\x18\x02 \x01(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel:\x02\x38\x01\x1a;\n\x19\x43ontentDictBoolBytesEntry\x12\x0b\n\x03key\x18\x01 \x01(\x08\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\x1a:\n\x18\x43ontentDictStrFloatEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\x1a\xde\r\n\x0fPerformative_Mt\x12W\n\x1e\x63ontent_union_1_type_DataModel\x18\x01 \x01(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12"\n\x1a\x63ontent_union_1_type_bytes\x18\x02 \x01(\x0c\x12 \n\x18\x63ontent_union_1_type_int\x18\x03 \x01(\x05\x12"\n\x1a\x63ontent_union_1_type_float\x18\x04 \x01(\x02\x12!\n\x19\x63ontent_union_1_type_bool\x18\x05 \x01(\x08\x12 \n\x18\x63ontent_union_1_type_str\x18\x06 \x01(\t\x12\'\n\x1f\x63ontent_union_1_type_set_of_int\x18\x07 \x03(\x05\x12_\n&content_union_1_type_list_of_DataModel\x18\x08 \x03(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12\x92\x01\n*content_union_1_type_dict_of_str_DataModel\x18\t \x03(\x0b\x32^.fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry\x12\'\n\x1f\x63ontent_union_2_type_set_of_int\x18\n \x03(\x05\x12^\n%content_union_2_type_set_of_DataModel\x18\x0b \x03(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12\'\n\x1f\x63ontent_union_2_type_set_of_str\x18\x0c \x03(\t\x12_\n&content_union_2_type_list_of_DataModel\x18\r \x03(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12)\n!content_union_2_type_list_of_bool\x18\x0e \x03(\x08\x12*\n"content_union_2_type_list_of_bytes\x18\x0f \x03(\x0c\x12\x92\x01\n*content_union_2_type_dict_of_str_DataModel\x18\x10 \x03(\x0b\x32^.fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry\x12\x8a\x01\n&content_union_2_type_dict_of_int_float\x18\x11 \x03(\x0b\x32Z.fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry\x12\x8c\x01\n\'content_union_2_type_dict_of_bool_bytes\x18\x12 \x03(\x0b\x32[.fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry\x1a{\n(ContentUnion1TypeDictOfStrDataModelEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12>\n\x05value\x18\x02 \x01(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel:\x02\x38\x01\x1a{\n(ContentUnion2TypeDictOfStrDataModelEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12>\n\x05value\x18\x02 \x01(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel:\x02\x38\x01\x1a\x46\n$ContentUnion2TypeDictOfIntFloatEntry\x12\x0b\n\x03key\x18\x01 \x01(\x05\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\x1aG\n%ContentUnion2TypeDictOfBoolBytesEntry\x12\x0b\n\x03key\x18\x01 \x01(\x08\x12\r\n\x05value\x18\x02 \x01(\x0c:\x02\x38\x01\x1a\x99\t\n\x0ePerformative_O\x12\x45\n\x0c\x63ontent_o_ct\x18\x01 \x01(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12\x1b\n\x13\x63ontent_o_ct_is_set\x18\x02 \x01(\x08\x12\x16\n\x0e\x63ontent_o_bool\x18\x03 \x01(\x08\x12\x1d\n\x15\x63ontent_o_bool_is_set\x18\x04 \x01(\x08\x12\x1b\n\x13\x63ontent_o_set_float\x18\x05 \x03(\x02\x12"\n\x1a\x63ontent_o_set_float_is_set\x18\x06 \x01(\x08\x12\x1c\n\x14\x63ontent_o_list_bytes\x18\x07 \x03(\x0c\x12#\n\x1b\x63ontent_o_list_bytes_is_set\x18\x08 \x01(\x08\x12l\n\x16\x63ontent_o_dict_str_int\x18\t \x03(\x0b\x32L.fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentODictStrIntEntry\x12%\n\x1d\x63ontent_o_dict_str_int_is_set\x18\n \x01(\x08\x12 \n\x18\x63ontent_o_union_type_str\x18\x0b \x01(\t\x12\x85\x01\n$content_o_union_type_dict_of_str_int\x18\x0c \x03(\x0b\x32W.fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry\x12^\n%content_o_union_type_set_of_DataModel\x18\r \x03(\x0b\x32/.fetch.aea.TProtocol.TProtocolMessage.DataModel\x12)\n!content_o_union_type_set_of_bytes\x18\x0e \x03(\x0c\x12)\n!content_o_union_type_list_of_bool\x18\x0f \x03(\x08\x12\x89\x01\n&content_o_union_type_dict_of_str_float\x18\x10 \x03(\x0b\x32Y.fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry\x12\x1e\n\x16\x63ontent_o_union_is_set\x18\x11 \x01(\x08\x1a\x39\n\x17\x43ontentODictStrIntEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x44\n"ContentOUnionTypeDictOfStrIntEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\x1a\x46\n$ContentOUnionTypeDictOfStrFloatEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\x1a\x1d\n\x1bPerformative_Empty_ContentsB\x0e\n\x0cperformativeb\x06proto3' ), ) -_TESTPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY = _descriptor.Descriptor( name="DictFieldEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.DictFieldEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.DictFieldEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.DictFieldEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.DictFieldEntry.key", index=0, number=1, type=5, @@ -53,7 +53,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.DictFieldEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.DictFieldEntry.value", index=1, number=2, type=8, @@ -78,20 +78,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=1090, - serialized_end=1138, + serialized_start=1009, + serialized_end=1057, ) -_TESTPROTOCOLMESSAGE_DATAMODEL = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_DATAMODEL = _descriptor.Descriptor( name="DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="bytes_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.bytes_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.bytes_field", index=0, number=1, type=12, @@ -109,7 +109,7 @@ ), _descriptor.FieldDescriptor( name="int_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.int_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.int_field", index=1, number=2, type=5, @@ -127,7 +127,7 @@ ), _descriptor.FieldDescriptor( name="float_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.float_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.float_field", index=2, number=3, type=2, @@ -145,7 +145,7 @@ ), _descriptor.FieldDescriptor( name="bool_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.bool_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.bool_field", index=3, number=4, type=8, @@ -163,7 +163,7 @@ ), _descriptor.FieldDescriptor( name="str_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.str_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.str_field", index=4, number=5, type=9, @@ -181,7 +181,7 @@ ), _descriptor.FieldDescriptor( name="set_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.set_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.set_field", index=5, number=6, type=5, @@ -199,7 +199,7 @@ ), _descriptor.FieldDescriptor( name="list_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.list_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.list_field", index=6, number=7, type=9, @@ -217,7 +217,7 @@ ), _descriptor.FieldDescriptor( name="dict_field", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.DataModel.dict_field", + full_name="fetch.aea.TProtocol.TProtocolMessage.DataModel.dict_field", index=7, number=8, type=11, @@ -235,27 +235,27 @@ ), ], extensions=[], - nested_types=[_TESTPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY,], + nested_types=[_TPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY,], enum_types=[], serialized_options=None, is_extendable=False, syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=848, - serialized_end=1138, + serialized_start=773, + serialized_end=1057, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_CT = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_CT = _descriptor.Descriptor( name="Performative_Ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Ct", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="content_ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Ct.content_ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Ct.content_ct", index=0, number=1, type=11, @@ -280,20 +280,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=1140, - serialized_end=1232, + serialized_start=1059, + serialized_end=1145, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PT = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_PT = _descriptor.Descriptor( name="Performative_Pt", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pt", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="content_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt.content_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pt.content_bytes", index=0, number=1, type=12, @@ -311,7 +311,7 @@ ), _descriptor.FieldDescriptor( name="content_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt.content_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pt.content_int", index=1, number=2, type=5, @@ -329,7 +329,7 @@ ), _descriptor.FieldDescriptor( name="content_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt.content_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pt.content_float", index=2, number=3, type=2, @@ -347,7 +347,7 @@ ), _descriptor.FieldDescriptor( name="content_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt.content_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pt.content_bool", index=3, number=4, type=8, @@ -365,7 +365,7 @@ ), _descriptor.FieldDescriptor( name="content_str", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt.content_str", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pt.content_str", index=4, number=5, type=9, @@ -390,20 +390,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=1234, - serialized_end=1361, + serialized_start=1147, + serialized_end=1274, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_PCT = _descriptor.Descriptor( name="Performative_Pct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="content_set_ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_set_ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_set_ct", index=0, number=1, type=11, @@ -421,7 +421,7 @@ ), _descriptor.FieldDescriptor( name="content_set_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_set_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_set_bytes", index=1, number=2, type=12, @@ -439,7 +439,7 @@ ), _descriptor.FieldDescriptor( name="content_set_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_set_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_set_int", index=2, number=3, type=5, @@ -457,7 +457,7 @@ ), _descriptor.FieldDescriptor( name="content_set_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_set_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_set_float", index=3, number=4, type=2, @@ -475,7 +475,7 @@ ), _descriptor.FieldDescriptor( name="content_set_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_set_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_set_bool", index=4, number=5, type=8, @@ -493,7 +493,7 @@ ), _descriptor.FieldDescriptor( name="content_set_str", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_set_str", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_set_str", index=5, number=6, type=9, @@ -511,7 +511,7 @@ ), _descriptor.FieldDescriptor( name="content_list_ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_list_ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_list_ct", index=6, number=7, type=11, @@ -529,7 +529,7 @@ ), _descriptor.FieldDescriptor( name="content_list_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_list_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_list_bytes", index=7, number=8, type=12, @@ -547,7 +547,7 @@ ), _descriptor.FieldDescriptor( name="content_list_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_list_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_list_int", index=8, number=9, type=5, @@ -565,7 +565,7 @@ ), _descriptor.FieldDescriptor( name="content_list_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_list_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_list_float", index=9, number=10, type=2, @@ -583,7 +583,7 @@ ), _descriptor.FieldDescriptor( name="content_list_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_list_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_list_bool", index=10, number=11, type=8, @@ -601,7 +601,7 @@ ), _descriptor.FieldDescriptor( name="content_list_str", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct.content_list_str", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pct.content_list_str", index=11, number=12, type=9, @@ -626,20 +626,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=1364, - serialized_end=1806, + serialized_start=1277, + serialized_end=1707, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY = _descriptor.Descriptor( name="ContentDictIntCtEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictIntCtEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictIntCtEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictIntCtEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictIntCtEntry.key", index=0, number=1, type=5, @@ -657,7 +657,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictIntCtEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictIntCtEntry.value", index=1, number=2, type=11, @@ -682,20 +682,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=2182, - serialized_end=2292, + serialized_start=2065, + serialized_end=2169, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY = _descriptor.Descriptor( name="ContentDictBoolBytesEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry.key", index=0, number=1, type=8, @@ -713,7 +713,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry.value", index=1, number=2, type=12, @@ -738,20 +738,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=2294, - serialized_end=2353, + serialized_start=2171, + serialized_end=2230, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY = _descriptor.Descriptor( name="ContentDictStrFloatEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry.key", index=0, number=1, type=9, @@ -769,7 +769,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry.value", index=1, number=2, type=2, @@ -794,20 +794,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=2355, - serialized_end=2413, + serialized_start=2232, + serialized_end=2290, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT = _descriptor.Descriptor( name="Performative_Pmt", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="content_dict_int_ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.content_dict_int_ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.content_dict_int_ct", index=0, number=1, type=11, @@ -825,7 +825,7 @@ ), _descriptor.FieldDescriptor( name="content_dict_bool_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.content_dict_bool_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.content_dict_bool_bytes", index=1, number=2, type=11, @@ -843,7 +843,7 @@ ), _descriptor.FieldDescriptor( name="content_dict_str_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.content_dict_str_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.content_dict_str_float", index=2, number=3, type=11, @@ -862,9 +862,9 @@ ], extensions=[], nested_types=[ - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY, ], enum_types=[], serialized_options=None, @@ -872,20 +872,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=1809, - serialized_end=2413, + serialized_start=1710, + serialized_end=2290, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY = _descriptor.Descriptor( name="ContentUnion1TypeDictOfStrDataModelEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry.key", index=0, number=1, type=9, @@ -903,7 +903,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry.value", index=1, number=2, type=11, @@ -928,20 +928,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=3830, - serialized_end=3959, + serialized_start=3658, + serialized_end=3781, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY = _descriptor.Descriptor( name="ContentUnion2TypeDictOfStrDataModelEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry.key", index=0, number=1, type=9, @@ -959,7 +959,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry.value", index=1, number=2, type=11, @@ -984,20 +984,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=3962, - serialized_end=4091, + serialized_start=3783, + serialized_end=3906, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY = _descriptor.Descriptor( name="ContentUnion2TypeDictOfIntFloatEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry.key", index=0, number=1, type=5, @@ -1015,7 +1015,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry.value", index=1, number=2, type=2, @@ -1040,20 +1040,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=4093, - serialized_end=4163, + serialized_start=3908, + serialized_end=3978, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY = _descriptor.Descriptor( name="ContentUnion2TypeDictOfBoolBytesEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry.key", index=0, number=1, type=8, @@ -1071,7 +1071,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry.value", index=1, number=2, type=12, @@ -1096,20 +1096,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=4165, - serialized_end=4236, + serialized_start=3980, + serialized_end=4051, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_MT = _descriptor.Descriptor( name="Performative_Mt", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="content_union_1_type_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_DataModel", index=0, number=1, type=11, @@ -1127,7 +1127,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_bytes", index=1, number=2, type=12, @@ -1145,7 +1145,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_int", index=2, number=3, type=5, @@ -1163,7 +1163,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_float", index=3, number=4, type=2, @@ -1181,7 +1181,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_bool", index=4, number=5, type=8, @@ -1199,7 +1199,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_str", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_str", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_str", index=5, number=6, type=9, @@ -1217,7 +1217,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_set_of_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_set_of_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_set_of_int", index=6, number=7, type=5, @@ -1235,7 +1235,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_list_of_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_list_of_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_list_of_DataModel", index=7, number=8, type=11, @@ -1253,7 +1253,7 @@ ), _descriptor.FieldDescriptor( name="content_union_1_type_dict_of_str_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_1_type_dict_of_str_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_1_type_dict_of_str_DataModel", index=8, number=9, type=11, @@ -1271,7 +1271,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_set_of_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_set_of_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_set_of_int", index=9, number=10, type=5, @@ -1289,7 +1289,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_set_of_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_set_of_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_set_of_DataModel", index=10, number=11, type=11, @@ -1307,7 +1307,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_set_of_str", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_set_of_str", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_set_of_str", index=11, number=12, type=9, @@ -1325,7 +1325,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_list_of_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_list_of_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_list_of_DataModel", index=12, number=13, type=11, @@ -1343,7 +1343,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_list_of_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_list_of_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_list_of_bool", index=13, number=14, type=8, @@ -1361,7 +1361,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_list_of_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_list_of_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_list_of_bytes", index=14, number=15, type=12, @@ -1379,7 +1379,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_dict_of_str_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_dict_of_str_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_dict_of_str_DataModel", index=15, number=16, type=11, @@ -1397,7 +1397,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_dict_of_int_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_dict_of_int_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_dict_of_int_float", index=16, number=17, type=11, @@ -1415,7 +1415,7 @@ ), _descriptor.FieldDescriptor( name="content_union_2_type_dict_of_bool_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.content_union_2_type_dict_of_bool_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.content_union_2_type_dict_of_bool_bytes", index=17, number=18, type=11, @@ -1434,10 +1434,10 @@ ], extensions=[], nested_types=[ - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY, ], enum_types=[], serialized_options=None, @@ -1445,20 +1445,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=2416, - serialized_end=4236, + serialized_start=2293, + serialized_end=4051, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY = _descriptor.Descriptor( name="ContentODictStrIntEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentODictStrIntEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentODictStrIntEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentODictStrIntEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentODictStrIntEntry.key", index=0, number=1, type=9, @@ -1476,7 +1476,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentODictStrIntEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentODictStrIntEntry.value", index=1, number=2, type=5, @@ -1501,20 +1501,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=5247, - serialized_end=5304, + serialized_start=5032, + serialized_end=5089, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY = _descriptor.Descriptor( name="ContentOUnionTypeDictOfStrIntEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry.key", index=0, number=1, type=9, @@ -1532,7 +1532,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry.value", index=1, number=2, type=5, @@ -1557,20 +1557,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=5306, - serialized_end=5374, + serialized_start=5091, + serialized_end=5159, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY = _descriptor.Descriptor( name="ContentOUnionTypeDictOfStrFloatEntry", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="key", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry.key", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry.key", index=0, number=1, type=9, @@ -1588,7 +1588,7 @@ ), _descriptor.FieldDescriptor( name="value", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry.value", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry.value", index=1, number=2, type=2, @@ -1613,20 +1613,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=5376, - serialized_end=5446, + serialized_start=5161, + serialized_end=5231, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_O = _descriptor.Descriptor( name="Performative_O", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="content_o_ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_ct", index=0, number=1, type=11, @@ -1644,7 +1644,7 @@ ), _descriptor.FieldDescriptor( name="content_o_ct_is_set", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_ct_is_set", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_ct_is_set", index=1, number=2, type=8, @@ -1662,7 +1662,7 @@ ), _descriptor.FieldDescriptor( name="content_o_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_bool", index=2, number=3, type=8, @@ -1680,7 +1680,7 @@ ), _descriptor.FieldDescriptor( name="content_o_bool_is_set", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_bool_is_set", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_bool_is_set", index=3, number=4, type=8, @@ -1698,7 +1698,7 @@ ), _descriptor.FieldDescriptor( name="content_o_set_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_set_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_set_float", index=4, number=5, type=2, @@ -1716,7 +1716,7 @@ ), _descriptor.FieldDescriptor( name="content_o_set_float_is_set", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_set_float_is_set", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_set_float_is_set", index=5, number=6, type=8, @@ -1734,7 +1734,7 @@ ), _descriptor.FieldDescriptor( name="content_o_list_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_list_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_list_bytes", index=6, number=7, type=12, @@ -1752,7 +1752,7 @@ ), _descriptor.FieldDescriptor( name="content_o_list_bytes_is_set", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_list_bytes_is_set", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_list_bytes_is_set", index=7, number=8, type=8, @@ -1770,7 +1770,7 @@ ), _descriptor.FieldDescriptor( name="content_o_dict_str_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_dict_str_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_dict_str_int", index=8, number=9, type=11, @@ -1788,7 +1788,7 @@ ), _descriptor.FieldDescriptor( name="content_o_dict_str_int_is_set", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_dict_str_int_is_set", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_dict_str_int_is_set", index=9, number=10, type=8, @@ -1806,7 +1806,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_type_str", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_type_str", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_type_str", index=10, number=11, type=9, @@ -1824,7 +1824,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_type_dict_of_str_int", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_type_dict_of_str_int", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_type_dict_of_str_int", index=11, number=12, type=11, @@ -1842,7 +1842,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_type_set_of_DataModel", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_type_set_of_DataModel", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_type_set_of_DataModel", index=12, number=13, type=11, @@ -1860,7 +1860,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_type_set_of_bytes", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_type_set_of_bytes", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_type_set_of_bytes", index=13, number=14, type=12, @@ -1878,7 +1878,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_type_list_of_bool", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_type_list_of_bool", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_type_list_of_bool", index=14, number=15, type=8, @@ -1896,7 +1896,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_type_dict_of_str_float", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_type_dict_of_str_float", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_type_dict_of_str_float", index=15, number=16, type=11, @@ -1914,7 +1914,7 @@ ), _descriptor.FieldDescriptor( name="content_o_union_is_set", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.content_o_union_is_set", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_O.content_o_union_is_set", index=16, number=17, type=8, @@ -1933,9 +1933,9 @@ ], extensions=[], nested_types=[ - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY, + _TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY, ], enum_types=[], serialized_options=None, @@ -1943,13 +1943,13 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=4239, - serialized_end=5446, + serialized_start=4054, + serialized_end=5231, ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS = _descriptor.Descriptor( +_TPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS = _descriptor.Descriptor( name="Performative_Empty_Contents", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.Performative_Empty_Contents", + full_name="fetch.aea.TProtocol.TProtocolMessage.Performative_Empty_Contents", filename=None, file=DESCRIPTOR, containing_type=None, @@ -1962,20 +1962,20 @@ syntax="proto3", extension_ranges=[], oneofs=[], - serialized_start=5448, - serialized_end=5477, + serialized_start=5233, + serialized_end=5262, ) -_TESTPROTOCOLMESSAGE = _descriptor.Descriptor( - name="TestProtocolMessage", - full_name="fetch.aea.TestProtocol.TestProtocolMessage", +_TPROTOCOLMESSAGE = _descriptor.Descriptor( + name="TProtocolMessage", + full_name="fetch.aea.TProtocol.TProtocolMessage", filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( name="message_id", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.message_id", + full_name="fetch.aea.TProtocol.TProtocolMessage.message_id", index=0, number=1, type=5, @@ -1993,7 +1993,7 @@ ), _descriptor.FieldDescriptor( name="dialogue_starter_reference", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.dialogue_starter_reference", + full_name="fetch.aea.TProtocol.TProtocolMessage.dialogue_starter_reference", index=1, number=2, type=9, @@ -2011,7 +2011,7 @@ ), _descriptor.FieldDescriptor( name="dialogue_responder_reference", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.dialogue_responder_reference", + full_name="fetch.aea.TProtocol.TProtocolMessage.dialogue_responder_reference", index=2, number=3, type=9, @@ -2029,7 +2029,7 @@ ), _descriptor.FieldDescriptor( name="target", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.target", + full_name="fetch.aea.TProtocol.TProtocolMessage.target", index=3, number=4, type=5, @@ -2047,7 +2047,7 @@ ), _descriptor.FieldDescriptor( name="performative_ct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_ct", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_ct", index=4, number=5, type=11, @@ -2065,7 +2065,7 @@ ), _descriptor.FieldDescriptor( name="performative_empty_contents", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_empty_contents", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_empty_contents", index=5, number=6, type=11, @@ -2083,7 +2083,7 @@ ), _descriptor.FieldDescriptor( name="performative_mt", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_mt", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_mt", index=6, number=7, type=11, @@ -2101,7 +2101,7 @@ ), _descriptor.FieldDescriptor( name="performative_o", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_o", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_o", index=7, number=8, type=11, @@ -2119,7 +2119,7 @@ ), _descriptor.FieldDescriptor( name="performative_pct", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_pct", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_pct", index=8, number=9, type=11, @@ -2137,7 +2137,7 @@ ), _descriptor.FieldDescriptor( name="performative_pmt", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_pmt", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_pmt", index=9, number=10, type=11, @@ -2155,7 +2155,7 @@ ), _descriptor.FieldDescriptor( name="performative_pt", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative_pt", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative_pt", index=10, number=11, type=11, @@ -2174,14 +2174,14 @@ ], extensions=[], nested_types=[ - _TESTPROTOCOLMESSAGE_DATAMODEL, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_CT, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PT, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O, - _TESTPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS, + _TPROTOCOLMESSAGE_DATAMODEL, + _TPROTOCOLMESSAGE_PERFORMATIVE_CT, + _TPROTOCOLMESSAGE_PERFORMATIVE_PT, + _TPROTOCOLMESSAGE_PERFORMATIVE_PCT, + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT, + _TPROTOCOLMESSAGE_PERFORMATIVE_MT, + _TPROTOCOLMESSAGE_PERFORMATIVE_O, + _TPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS, ], enum_types=[], serialized_options=None, @@ -2191,204 +2191,196 @@ oneofs=[ _descriptor.OneofDescriptor( name="performative", - full_name="fetch.aea.TestProtocol.TestProtocolMessage.performative", + full_name="fetch.aea.TProtocol.TProtocolMessage.performative", index=0, containing_type=None, fields=[], ), ], - serialized_start=72, - serialized_end=5493, + serialized_start=42, + serialized_end=5278, ) -_TESTPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_DATAMODEL -) -_TESTPROTOCOLMESSAGE_DATAMODEL.fields_by_name[ +_TPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY.containing_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_DATAMODEL.fields_by_name[ "dict_field" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY -_TESTPROTOCOLMESSAGE_DATAMODEL.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_CT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY +_TPROTOCOLMESSAGE_DATAMODEL.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_CT.fields_by_name[ "content_ct" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_CT.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PT.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_CT.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_PT.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_PCT.fields_by_name[ "content_set_ct" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_PCT.fields_by_name[ "content_list_ct" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_PCT.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY.fields_by_name[ "value" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_PMT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT.fields_by_name[ +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT.fields_by_name[ "content_dict_int_ct" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT.fields_by_name[ "content_dict_bool_bytes" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT.fields_by_name[ "content_dict_str_float" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY.fields_by_name[ "value" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_MT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY.fields_by_name[ +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY.fields_by_name[ "value" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_MT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_MT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_MT ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_1_type_DataModel" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_1_type_list_of_DataModel" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_1_type_dict_of_str_DataModel" ].message_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY + _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_2_type_set_of_DataModel" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_2_type_list_of_DataModel" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_2_type_dict_of_str_DataModel" ].message_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY + _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_2_type_dict_of_int_float" -].message_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY -) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.fields_by_name[ "content_union_2_type_dict_of_bool_bytes" -].message_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY -) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_MT.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_O ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_O ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY.containing_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY.containing_type = ( + _TPROTOCOLMESSAGE_PERFORMATIVE_O ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ +_TPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ "content_o_ct" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ "content_o_dict_str_int" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ "content_o_union_type_dict_of_str_int" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ "content_o_union_type_set_of_DataModel" -].message_type = _TESTPROTOCOLMESSAGE_DATAMODEL -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_DATAMODEL +_TPROTOCOLMESSAGE_PERFORMATIVE_O.fields_by_name[ "content_o_union_type_dict_of_str_float" -].message_type = ( - _TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY -) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS.containing_type = _TESTPROTOCOLMESSAGE -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY +_TPROTOCOLMESSAGE_PERFORMATIVE_O.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS.containing_type = _TPROTOCOLMESSAGE +_TPROTOCOLMESSAGE.fields_by_name[ "performative_ct" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_CT -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_CT +_TPROTOCOLMESSAGE.fields_by_name[ "performative_empty_contents" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS +_TPROTOCOLMESSAGE.fields_by_name[ "performative_mt" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_MT -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_MT +_TPROTOCOLMESSAGE.fields_by_name[ "performative_o" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_O -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_O +_TPROTOCOLMESSAGE.fields_by_name[ "performative_pct" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_PCT +_TPROTOCOLMESSAGE.fields_by_name[ "performative_pmt" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT -_TESTPROTOCOLMESSAGE.fields_by_name[ +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_PMT +_TPROTOCOLMESSAGE.fields_by_name[ "performative_pt" -].message_type = _TESTPROTOCOLMESSAGE_PERFORMATIVE_PT -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_ct"] +].message_type = _TPROTOCOLMESSAGE_PERFORMATIVE_PT +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_ct"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_ct" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_empty_contents"] +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_empty_contents"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_empty_contents" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_mt"] +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_mt"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_mt" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_o"] +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_o"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_o" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_pct"] +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_pct"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_pct" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_pmt"] +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_pmt"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_pmt" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -_TESTPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( - _TESTPROTOCOLMESSAGE.fields_by_name["performative_pt"] +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +_TPROTOCOLMESSAGE.oneofs_by_name["performative"].fields.append( + _TPROTOCOLMESSAGE.fields_by_name["performative_pt"] ) -_TESTPROTOCOLMESSAGE.fields_by_name[ +_TPROTOCOLMESSAGE.fields_by_name[ "performative_pt" -].containing_oneof = _TESTPROTOCOLMESSAGE.oneofs_by_name["performative"] -DESCRIPTOR.message_types_by_name["TestProtocolMessage"] = _TESTPROTOCOLMESSAGE +].containing_oneof = _TPROTOCOLMESSAGE.oneofs_by_name["performative"] +DESCRIPTOR.message_types_by_name["TProtocolMessage"] = _TPROTOCOLMESSAGE _sym_db.RegisterFileDescriptor(DESCRIPTOR) -TestProtocolMessage = _reflection.GeneratedProtocolMessageType( - "TestProtocolMessage", +TProtocolMessage = _reflection.GeneratedProtocolMessageType( + "TProtocolMessage", (_message.Message,), dict( DataModel=_reflection.GeneratedProtocolMessageType( @@ -2399,41 +2391,41 @@ "DictFieldEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.DataModel.DictFieldEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.DataModel.DictFieldEntry) ), ), - DESCRIPTOR=_TESTPROTOCOLMESSAGE_DATAMODEL, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.DataModel) + DESCRIPTOR=_TPROTOCOLMESSAGE_DATAMODEL, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.DataModel) ), ), Performative_Ct=_reflection.GeneratedProtocolMessageType( "Performative_Ct", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_CT, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Ct) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_CT, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Ct) ), ), Performative_Pt=_reflection.GeneratedProtocolMessageType( "Performative_Pt", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_PT, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pt) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_PT, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Pt) ), ), Performative_Pct=_reflection.GeneratedProtocolMessageType( "Performative_Pct", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_PCT, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pct) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_PCT, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Pct) ), ), Performative_Pmt=_reflection.GeneratedProtocolMessageType( @@ -2444,32 +2436,32 @@ "ContentDictIntCtEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictIntCtEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictIntCtEntry) ), ), ContentDictBoolBytesEntry=_reflection.GeneratedProtocolMessageType( "ContentDictBoolBytesEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry) ), ), ContentDictStrFloatEntry=_reflection.GeneratedProtocolMessageType( "ContentDictStrFloatEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry) ), ), - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Pmt) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_PMT, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Pmt) ), ), Performative_Mt=_reflection.GeneratedProtocolMessageType( @@ -2480,41 +2472,41 @@ "ContentUnion1TypeDictOfStrDataModelEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry) ), ), ContentUnion2TypeDictOfStrDataModelEntry=_reflection.GeneratedProtocolMessageType( "ContentUnion2TypeDictOfStrDataModelEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry) ), ), ContentUnion2TypeDictOfIntFloatEntry=_reflection.GeneratedProtocolMessageType( "ContentUnion2TypeDictOfIntFloatEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry) ), ), ContentUnion2TypeDictOfBoolBytesEntry=_reflection.GeneratedProtocolMessageType( "ContentUnion2TypeDictOfBoolBytesEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry) ), ), - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Mt) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_MT, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Mt) ), ), Performative_O=_reflection.GeneratedProtocolMessageType( @@ -2525,99 +2517,95 @@ "ContentODictStrIntEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentODictStrIntEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentODictStrIntEntry) ), ), ContentOUnionTypeDictOfStrIntEntry=_reflection.GeneratedProtocolMessageType( "ContentOUnionTypeDictOfStrIntEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry) ), ), ContentOUnionTypeDictOfStrFloatEntry=_reflection.GeneratedProtocolMessageType( "ContentOUnionTypeDictOfStrFloatEntry", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry) ), ), - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_O, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_O) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_O, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_O) ), ), Performative_Empty_Contents=_reflection.GeneratedProtocolMessageType( "Performative_Empty_Contents", (_message.Message,), dict( - DESCRIPTOR=_TESTPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage.Performative_Empty_Contents) + DESCRIPTOR=_TPROTOCOLMESSAGE_PERFORMATIVE_EMPTY_CONTENTS, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage.Performative_Empty_Contents) ), ), - DESCRIPTOR=_TESTPROTOCOLMESSAGE, - __module__="protocols.test_protocol.test_protocol_pb2" - # @@protoc_insertion_point(class_scope:fetch.aea.TestProtocol.TestProtocolMessage) + DESCRIPTOR=_TPROTOCOLMESSAGE, + __module__="t_protocol_pb2" + # @@protoc_insertion_point(class_scope:fetch.aea.TProtocol.TProtocolMessage) ), ) -_sym_db.RegisterMessage(TestProtocolMessage) -_sym_db.RegisterMessage(TestProtocolMessage.DataModel) -_sym_db.RegisterMessage(TestProtocolMessage.DataModel.DictFieldEntry) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Ct) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Pt) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Pct) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Pmt) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Pmt.ContentDictIntCtEntry) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Mt) +_sym_db.RegisterMessage(TProtocolMessage) +_sym_db.RegisterMessage(TProtocolMessage.DataModel) +_sym_db.RegisterMessage(TProtocolMessage.DataModel.DictFieldEntry) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Ct) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Pt) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Pct) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Pmt) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Pmt.ContentDictIntCtEntry) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Pmt.ContentDictBoolBytesEntry) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Pmt.ContentDictStrFloatEntry) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Mt) _sym_db.RegisterMessage( - TestProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry + TProtocolMessage.Performative_Mt.ContentUnion1TypeDictOfStrDataModelEntry ) _sym_db.RegisterMessage( - TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry + TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfStrDataModelEntry ) _sym_db.RegisterMessage( - TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry + TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfIntFloatEntry ) _sym_db.RegisterMessage( - TestProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry + TProtocolMessage.Performative_Mt.ContentUnion2TypeDictOfBoolBytesEntry ) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_O) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_O.ContentODictStrIntEntry) +_sym_db.RegisterMessage(TProtocolMessage.Performative_O) +_sym_db.RegisterMessage(TProtocolMessage.Performative_O.ContentODictStrIntEntry) _sym_db.RegisterMessage( - TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry + TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrIntEntry ) _sym_db.RegisterMessage( - TestProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry + TProtocolMessage.Performative_O.ContentOUnionTypeDictOfStrFloatEntry ) -_sym_db.RegisterMessage(TestProtocolMessage.Performative_Empty_Contents) +_sym_db.RegisterMessage(TProtocolMessage.Performative_Empty_Contents) -_TESTPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY._options = None -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY._options = None -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY._options = None -_TESTPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY._options = None -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY._options = ( - None -) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY._options = ( - None -) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY._options = ( +_TPROTOCOLMESSAGE_DATAMODEL_DICTFIELDENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTINTCTENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTBOOLBYTESENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_PMT_CONTENTDICTSTRFLOATENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION1TYPEDICTOFSTRDATAMODELENTRY._options = ( None ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY._options = ( +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFSTRDATAMODELENTRY._options = ( None ) -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY._options = None -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY._options = None -_TESTPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFINTFLOATENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_MT_CONTENTUNION2TYPEDICTOFBOOLBYTESENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTODICTSTRINTENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRINTENTRY._options = None +_TPROTOCOLMESSAGE_PERFORMATIVE_O_CONTENTOUNIONTYPEDICTOFSTRFLOATENTRY._options = None # @@protoc_insertion_point(module_scope) diff --git a/tests/test_protocols/test_generator.py b/tests/test_protocols/test_generator.py index 28040c6071..88c1f71ba9 100644 --- a/tests/test_protocols/test_generator.py +++ b/tests/test_protocols/test_generator.py @@ -56,11 +56,11 @@ from packages.fetchai.connections.oef.connection import OEFConnection -from tests.data.generator.test_protocol.message import ( # type: ignore - TestProtocolMessage, +from tests.data.generator.t_protocol.message import ( # type: ignore + TProtocolMessage, ) -from tests.data.generator.test_protocol.serialization import ( # type: ignore - TestProtocolSerializer, +from tests.data.generator.t_protocol.serialization import ( # type: ignore + TProtocolSerializer, ) from ..common.click_testing import CliRunner @@ -93,7 +93,7 @@ def test_generated_protocol_serialisation_ct(self): """Test that a generated protocol's serialisation + deserialisation work correctly.""" # create a message with pt content some_dict = {1: True, 2: False, 3: True, 4: False} - data_model = TestProtocolMessage.DataModel( + data_model = TProtocolMessage.DataModel( bytes_field=b"some bytes", int_field=42, float_field=42.7, @@ -103,19 +103,19 @@ def test_generated_protocol_serialisation_ct(self): list_field=["some string 1", "some string 2"], dict_field=some_dict, ) - message = TestProtocolMessage( + message = TProtocolMessage( message_id=1, dialogue_reference=(str(0), ""), target=0, - performative=TestProtocolMessage.Performative.PERFORMATIVE_CT, + performative=TProtocolMessage.Performative.PERFORMATIVE_CT, content_ct=data_model, ) # serialise the message - encoded_message_in_bytes = TestProtocolSerializer().encode(message) + encoded_message_in_bytes = TProtocolSerializer().encode(message) # deserialise the message - decoded_message = TestProtocolSerializer().decode(encoded_message_in_bytes) + decoded_message = TProtocolSerializer().decode(encoded_message_in_bytes) # Compare the original message with the serialised+deserialised message assert decoded_message.message_id == message.message_id @@ -129,11 +129,11 @@ def test_generated_protocol_serialisation_ct(self): def test_generated_protocol_serialisation_pt(self): """Test that a generated protocol's serialisation + deserialisation work correctly.""" # create a message with pt content - message = TestProtocolMessage( + message = TProtocolMessage( message_id=1, dialogue_reference=(str(0), ""), target=0, - performative=TestProtocolMessage.Performative.PERFORMATIVE_PT, + performative=TProtocolMessage.Performative.PERFORMATIVE_PT, content_bytes=b"some bytes", content_int=42, content_float=42.7, @@ -142,10 +142,10 @@ def test_generated_protocol_serialisation_pt(self): ) # serialise the message - encoded_message_in_bytes = TestProtocolSerializer().encode(message) + encoded_message_in_bytes = TProtocolSerializer().encode(message) # deserialise the message - decoded_message = TestProtocolSerializer().decode(encoded_message_in_bytes) + decoded_message = TProtocolSerializer().decode(encoded_message_in_bytes) # Compare the original message with the serialised+deserialised message assert decoded_message.message_id == message.message_id @@ -199,22 +199,22 @@ def test_generated_protocol_end_to_end(self): "tests", "data", "generator", - "test_protocol", + "t_protocol", "protocol.yaml", ) ) ) ) generated_protocol = Protocol( - TestProtocolMessage.protocol_id, - TestProtocolSerializer(), + TProtocolMessage.protocol_id, + TProtocolSerializer(), generated_protocol_configuration, ) resources_1.protocol_registry.register( - TestProtocolMessage.protocol_id, generated_protocol + TProtocolMessage.protocol_id, generated_protocol ) resources_2.protocol_registry.register( - TestProtocolMessage.protocol_id, generated_protocol + TProtocolMessage.protocol_id, generated_protocol ) # create AEAs @@ -222,38 +222,38 @@ def test_generated_protocol_end_to_end(self): aea_2 = AEA(identity_2, [oef_connection_2], wallet_2, ledger_apis, resources_2) # message 1 - message = TestProtocolMessage( + message = TProtocolMessage( message_id=1, dialogue_reference=(str(0), ""), target=0, - performative=TestProtocolMessage.Performative.PERFORMATIVE_PT, + performative=TProtocolMessage.Performative.PERFORMATIVE_PT, content_bytes=b"some bytes", content_int=42, content_float=42.7, content_bool=True, content_str="some string", ) - encoded_message_in_bytes = TestProtocolSerializer().encode(message) + encoded_message_in_bytes = TProtocolSerializer().encode(message) envelope = Envelope( to=identity_2.address, sender=identity_1.address, - protocol_id=TestProtocolMessage.protocol_id, + protocol_id=TProtocolMessage.protocol_id, message=encoded_message_in_bytes, ) # message 2 - message_2 = TestProtocolMessage( + message_2 = TProtocolMessage( message_id=2, dialogue_reference=(str(0), ""), target=1, - performative=TestProtocolMessage.Performative.PERFORMATIVE_PT, + performative=TProtocolMessage.Performative.PERFORMATIVE_PT, content_bytes=b"some other bytes", content_int=43, content_float=43.7, content_bool=False, content_str="some other string", ) - encoded_message_2_in_bytes = TestProtocolSerializer().encode(message_2) + encoded_message_2_in_bytes = TProtocolSerializer().encode(message_2) # add handlers to AEA resources agent_1_handler = Agent1Handler( @@ -262,7 +262,7 @@ def test_generated_protocol_end_to_end(self): resources_1.handler_registry.register( ( PublicId.from_str("fetchai/fake_skill:0.1.0"), - TestProtocolMessage.protocol_id, + TProtocolMessage.protocol_id, ), agent_1_handler, ) @@ -274,7 +274,7 @@ def test_generated_protocol_end_to_end(self): resources_2.handler_registry.register( ( PublicId.from_str("fetchai/fake_skill:0.1.0"), - TestProtocolMessage.protocol_id, + TProtocolMessage.protocol_id, ), agent_2_handler, ) @@ -452,7 +452,7 @@ def test__includes_custom_type_positive(self, *mocks): class Agent1Handler(Handler): """The handler for agent 1.""" - SUPPORTED_PROTOCOL = TestProtocolMessage.protocol_id # type: Optional[ProtocolId] + SUPPORTED_PROTOCOL = TProtocolMessage.protocol_id # type: Optional[ProtocolId] def __init__(self, **kwargs): """Initialize the handler.""" @@ -484,7 +484,7 @@ def teardown(self) -> None: class Agent2Handler(Handler): """The handler for agent 2.""" - SUPPORTED_PROTOCOL = TestProtocolMessage.protocol_id # type: Optional[ProtocolId] + SUPPORTED_PROTOCOL = TProtocolMessage.protocol_id # type: Optional[ProtocolId] def __init__(self, encoded_messsage, **kwargs): """Initialize the handler.""" @@ -509,7 +509,7 @@ def handle(self, message: Message) -> None: envelope = Envelope( to=message.counterparty, sender=self.context.agent_address, - protocol_id=TestProtocolMessage.protocol_id, + protocol_id=TProtocolMessage.protocol_id, message=self.encoded_message_2_in_bytes, ) self.context.outbox.put(envelope)