From 8925d5d07c70f93c9f6008b36ebac8dacb2e13d0 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sat, 20 Aug 2022 17:39:37 +0200 Subject: [PATCH 01/93] refactor: move 'determine_package_type_for_directory' in aea.utils.click_utils --- aea/cli/fingerprint.py | 35 ++++------------------------------ aea/cli/local_registry_sync.py | 2 +- aea/cli/utils/click_utils.py | 32 ++++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/aea/cli/fingerprint.py b/aea/cli/fingerprint.py index 90c4367933..0ccefeebcc 100644 --- a/aea/cli/fingerprint.py +++ b/aea/cli/fingerprint.py @@ -18,13 +18,15 @@ # # ------------------------------------------------------------------------------ """Implementation of the 'aea add' subcommand.""" -import os from pathlib import Path from typing import Dict, Optional, Union, cast import click -from aea.cli.utils.click_utils import PublicIdParameter +from aea.cli.utils.click_utils import ( + PublicIdParameter, + determine_package_type_for_directory, +) from aea.cli.utils.context import Context from aea.cli.utils.decorators import check_aea_project, pass_ctx from aea.configurations.base import ( @@ -137,35 +139,6 @@ def fingerprint_package_by_path( ) -def determine_package_type_for_directory(package_dir: Path) -> PackageType: - """ - Find package type for the package directory by checking config file names. - - :param package_dir: package dir to determine package type: - - :return: PackageType - """ - config_files = list( - set(os.listdir(str(package_dir))).intersection( - set(CONFIG_FILE_TO_PACKAGE_TYPE.keys()) - ) - ) - - if len(config_files) > 1: - raise ValueError( - f"Too many config files in the directory, only one has to present!: {', '.join(config_files)}" - ) - if len(config_files) == 0: - raise ValueError( - f"No package config file found in `{str(package_dir)}`. Incorrect directory?" - ) - - config_file = config_files[0] - package_type = PackageType(CONFIG_FILE_TO_PACKAGE_TYPE[config_file]) - - return package_type - - def fingerprint_package( package_dir: Path, package_type: Union[str, PackageType], diff --git a/aea/cli/local_registry_sync.py b/aea/cli/local_registry_sync.py index 8f375841f1..ee9ca4acbc 100644 --- a/aea/cli/local_registry_sync.py +++ b/aea/cli/local_registry_sync.py @@ -26,9 +26,9 @@ import click -from aea.cli.fingerprint import determine_package_type_for_directory from aea.cli.registry.add import fetch_package from aea.cli.registry.utils import get_package_meta +from aea.cli.utils.click_utils import determine_package_type_for_directory from aea.cli.utils.context import Context from aea.cli.utils.decorators import pass_ctx from aea.cli.utils.loggers import logger diff --git a/aea/cli/utils/click_utils.py b/aea/cli/utils/click_utils.py index 57d902dbb6..fd75d88d5d 100644 --- a/aea/cli/utils/click_utils.py +++ b/aea/cli/utils/click_utils.py @@ -36,13 +36,14 @@ from aea.cli.utils.config import get_or_create_cli_config, try_to_load_agent_config from aea.cli.utils.constants import DUMMY_PACKAGE_ID from aea.configurations.constants import ( + CONFIG_FILE_TO_PACKAGE_TYPE, CONNECTION, CONTRACT, DEFAULT_AEA_CONFIG_FILE, PROTOCOL, SKILL, ) -from aea.configurations.data_types import PublicId +from aea.configurations.data_types import PackageType, PublicId from aea.helpers.io import open_file @@ -331,3 +332,32 @@ def wrap(fn): # type: ignore ) # type: ignore return wrap + + +def determine_package_type_for_directory(package_dir: Path) -> PackageType: + """ + Find package type for the package directory by checking config file names. + + :param package_dir: package dir to determine package type: + + :return: PackageType + """ + config_files = list( + set(os.listdir(str(package_dir))).intersection( + set(CONFIG_FILE_TO_PACKAGE_TYPE.keys()) + ) + ) + + if len(config_files) > 1: + raise ValueError( + f"Too many config files in the directory, only one has to present!: {', '.join(config_files)}" + ) + if len(config_files) == 0: + raise ValueError( + f"No package config file found in `{str(package_dir)}`. Incorrect directory?" + ) + + config_file = config_files[0] + package_type = PackageType(CONFIG_FILE_TO_PACKAGE_TYPE[config_file]) + + return package_type From b5be0c786af0b7339f0f592c8b466c6ab61b0873 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sat, 20 Aug 2022 18:04:59 +0200 Subject: [PATCH 02/93] add 'aea test' command This new CLI command works in three modes: - `aea test`: run all tests of the current AEA project - `aea test item_type public_id`: run all tests of the AEA package specified by item_type and publci_id - `aea test by-path package_dir`: run all the tests of the AEA package located at package_dir --- aea/cli/core.py | 2 + aea/cli/test.py | 141 +++++++++++++++++++++++++++++++++++ aea/cli/utils/click_utils.py | 14 +++- aea/cli/utils/decorators.py | 4 + docs/cli-commands.md | 1 + setup.py | 1 + tests/test_cli/test_misc.py | 1 + tox.ini | 4 +- 8 files changed, 164 insertions(+), 4 deletions(-) create mode 100644 aea/cli/test.py diff --git a/aea/cli/core.py b/aea/cli/core.py index 8851465a2d..108820b2f8 100644 --- a/aea/cli/core.py +++ b/aea/cli/core.py @@ -64,6 +64,7 @@ from aea.cli.run import run from aea.cli.scaffold import scaffold from aea.cli.search import search +from aea.cli.test import test from aea.cli.transfer import transfer from aea.cli.upgrade import upgrade from aea.cli.utils.click_utils import registry_path_option @@ -140,6 +141,7 @@ def cli( cli.add_command(scaffold) cli.add_command(search) cli.add_command(local_registry_sync) +cli.add_command(test) cli.add_command(transfer) cli.add_command(upgrade) cli.add_command(hash_group) diff --git a/aea/cli/test.py b/aea/cli/test.py new file mode 100644 index 0000000000..760e1df1ec --- /dev/null +++ b/aea/cli/test.py @@ -0,0 +1,141 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2022 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Implementation of the 'aea test' command.""" +import sys +from pathlib import Path +from typing import Sequence, cast + +import click +import pytest + +from aea.cli.utils.click_utils import ( + PublicIdParameter, + determine_package_type_for_directory, +) +from aea.cli.utils.context import Context +from aea.cli.utils.decorators import check_aea_project, pass_ctx, pytest_args +from aea.configurations.constants import CONNECTION, CONTRACT, PROTOCOL, SKILL +from aea.configurations.data_types import PublicId +from aea.helpers.base import cd + + +@click.group(invoke_without_command=True) +@click.pass_context +@check_aea_project +@pytest_args +def test(click_context: click.Context, args: Sequence[str]) -> None: + """Run tests of an AEA project.""" + click.echo("Executing tests of the AEA project...") + ctx = cast(Context, click_context.obj) + if click_context.invoked_subcommand is None: + test_package_by_path(Path(ctx.cwd), args) + + +@test.command() +@click.argument("connection_public_id", type=PublicIdParameter(), required=True) +@pytest_args +@pass_ctx +def connection( + ctx: Context, connection_public_id: PublicId, args: Sequence[str] +) -> None: + """Executes a test suite of a connection package dependency.""" + test_item(ctx, CONNECTION, connection_public_id, args) + + +@test.command() +@click.argument("contract_public_id", type=PublicIdParameter(), required=True) +@pytest_args +@pass_ctx +def contract(ctx: Context, contract_public_id: PublicId, args: Sequence[str]) -> None: + """Executes a test suite of a contract package dependency.""" + test_item(ctx, CONTRACT, contract_public_id, args) + + +@test.command() +@click.argument("protocol_public_id", type=PublicIdParameter(), required=True) +@pytest_args +@pass_ctx +def protocol(ctx: Context, protocol_public_id: PublicId, args: Sequence[str]) -> None: + """Executes a test suite of a protocol package dependency.""" + test_item(ctx, PROTOCOL, protocol_public_id, args) + + +@test.command() +@click.argument("skill_public_id", type=PublicIdParameter(), required=True) +@pytest_args +@pass_ctx +def skill(ctx: Context, skill_public_id: PublicId, args: Sequence[str]) -> None: + """Executes a test suite of a skill package dependency.""" + test_item(ctx, SKILL, skill_public_id, args) + + +@test.command() +@click.argument( + "path", type=click.Path(exists=True, file_okay=False, dir_okay=True), required=True +) +@pytest_args +@pass_ctx +def by_path( + ctx: Context, + path: str, + args: Sequence[str], +) -> None: + """Executes a test suite of a package specified by a path.""" + click.echo(f"Executing tests of package at {path}'...") + full_path = Path(ctx.cwd) / Path(path) + test_package_by_path(full_path, args) + + +def test_item( + ctx: Context, + item_type: str, + item_public_id: PublicId, + pytest_arguments: Sequence[str], +) -> None: + """ + Run tests of a package dependency. + + :param ctx: the context. + :param item_type: the item type. + :param item_public_id: the item public id. + :param pytest_arguments: arguments to forward to Pytest + """ + item_type_plural = item_type + "s" + click.echo( + "Executing tests of component of type {}, {}' ...".format( + item_type, item_public_id + ) + ) + package_dirpath = Path(ctx.cwd, item_type_plural, item_public_id.name) + test_package_by_path(package_dirpath, pytest_arguments) + + +def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> None: + """ + Fingerprint package placed in package_dir. + + :param package_dir: directory of the package + :param pytest_arguments: arguments to forward to Pytest + """ + # check the path points to a valid AEA package + determine_package_type_for_directory(package_dir) + with cd(package_dir): + sys.exit(pytest.main(list(pytest_arguments))) diff --git a/aea/cli/utils/click_utils.py b/aea/cli/utils/click_utils.py index fd75d88d5d..4bd11975a7 100644 --- a/aea/cli/utils/click_utils.py +++ b/aea/cli/utils/click_utils.py @@ -22,7 +22,7 @@ import os from collections import OrderedDict from pathlib import Path -from typing import Any, Callable, List, Optional, Union, cast +from typing import Any, Callable, List, Optional, Sequence, Union, cast import click from click import argument, option @@ -83,6 +83,18 @@ def arg_strip(s: str) -> str: raise click.BadParameter(value) +class PytestArgs(click.Option): + """Custom Click option for parsing Pytest arguments.""" + + def type_cast_value(self, ctx: click.Context, value: str) -> Sequence[str]: + """Cast a string value to a sequence of Pytest arguments.""" + try: + return value.split(" ") + except Exception: + error_message = f"cannot split '{value}' into pytest arguments" + raise click.BadParameter(error_message) + + class PublicIdOrPathParameter(click.ParamType): """Define a public id parameter for Click applications.""" diff --git a/aea/cli/utils/decorators.py b/aea/cli/utils/decorators.py index 723e2547e9..9315c5c1de 100644 --- a/aea/cli/utils/decorators.py +++ b/aea/cli/utils/decorators.py @@ -29,6 +29,7 @@ import click from jsonschema import ValidationError +from aea.cli.utils.click_utils import PytestArgs from aea.cli.utils.config import ( get_default_author_from_cli_config, try_to_load_agent_config, @@ -250,3 +251,6 @@ def wrapper( raise e return wrapper + + +pytest_args = click.option("--args", "-a", cls=PytestArgs, default="") diff --git a/docs/cli-commands.md b/docs/cli-commands.md index ab6d3d6f49..2aa0f00bcc 100644 --- a/docs/cli-commands.md +++ b/docs/cli-commands.md @@ -42,6 +42,7 @@ | `run {using [connections, ...]}` | Run the AEA on the Fetch.ai network with default or specified connections. | | `scaffold [package_type] [name]` | Scaffold a new connection, protocol, or skill called `name`. | | `search [package_type]` | Search for components in the registry. `search --local [package_type] [--query searching_query]` to search in local `packages` directory. | +| `test [package_type] [name]` | Execute test suite of an AEA project, or a specific AEA package. | | `transfer [type] [address] [amount]` | Transfer wealth associated with a private key of the agent to another account. | | `upgrade [package_type] [public_id]` | Upgrade the packages of the agent. | | `-v DEBUG run` | Run with debugging. | diff --git a/setup.py b/setup.py index 0811481ca4..59826828cf 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ def get_all_extras() -> Dict: "pyyaml>=4.2b1,<6.0", "jsonschema>=3.0.0,<4.0.0", "packaging>=20.3,<22.0", + "pytest>=7.0.0,<7.2.0", "semver>=2.9.1,<3.0.0", ] diff --git a/tests/test_cli/test_misc.py b/tests/test_cli/test_misc.py index 067e1a49b1..aed5d3053b 100644 --- a/tests/test_cli/test_misc.py +++ b/tests/test_cli/test_misc.py @@ -99,6 +99,7 @@ def test_flag_help(): run Run the agent. scaffold Scaffold a package for the agent. search Search for packages in the registry. + test Run tests of an AEA project. transfer Transfer wealth associated with a private key of... upgrade Upgrade the packages of the agent. """ diff --git a/tox.ini b/tox.ini index bb43896dce..a1ef7e011f 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,6 @@ deps = openapi-core==0.13.2 openapi-spec-validator==0.2.8 pexpect==4.8.0 - pytest==7.0.0 pytest-asyncio==0.18.0 pytest-cov==3.0.0 pytest-custom-exit-code==0.3.0 @@ -331,12 +330,11 @@ deps = openapi-core==0.13.2 openapi-spec-validator==0.2.8 pexpect==4.8.0 - pytest==5.4.3 pytest-asyncio==0.12.0 pytest-cov==2.9.0 pytest-custom-exit-code==0.3.0 pytest-randomly==3.4.0 - pytest-rerunfailures==9.0 + pytest-rerunfailures==10.0 GitPython==3.1.27 ; Plugin dependencies. We need this ; because we use --no-deps to install the plugins. From 9e2e4726b45e5e02d858e7af69c2a9feeee0b1f4 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 11:31:33 +0200 Subject: [PATCH 03/93] test: add tests for 'aea test' command --- aea/cli/test.py | 3 +- tests/test_cli/test_test.py | 260 ++++++++++++++++++++++++++++++++++++ 2 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 tests/test_cli/test_test.py diff --git a/aea/cli/test.py b/aea/cli/test.py index 760e1df1ec..9cc13b8c0d 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -138,4 +138,5 @@ def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> # check the path points to a valid AEA package determine_package_type_for_directory(package_dir) with cd(package_dir): - sys.exit(pytest.main(list(pytest_arguments))) + exit_code = pytest.main(list(pytest_arguments)) + sys.exit(exit_code) diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py new file mode 100644 index 0000000000..85cda12586 --- /dev/null +++ b/tests/test_cli/test_test.py @@ -0,0 +1,260 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This test module contains the tests for CLI test command.""" +import subprocess # nosec +from pathlib import Path +from textwrap import dedent +from typing import Any, Sequence, Type +from unittest import mock + +import click.testing +import pytest +from _pytest.config import ExitCode + +from aea.cli import cli +from aea.cli.utils.package_utils import get_package_path +from aea.configurations.data_types import ComponentType, PublicId +from aea.helpers.base import cd +from aea.test_tools.test_cases import AEATestCaseEmpty, CLI_LOG_OPTION + + +OK_PYTEST_EXIT_CODE = ExitCode.OK +NO_TESTS_COLLECTED_PYTEST_EXIT_CODE = ExitCode.NO_TESTS_COLLECTED + + +def _parametrize_class(test_cls: Type) -> Type: + """Allow a base AEA test class to use 'setup/teardown' instead of '(setup/teardown)_class' methods.""" + old_setup_class = test_cls.setup_class + old_teardown_class = test_cls.teardown_class + + def setup_class(cls) -> None: + """Don't call super setup method.""" + + def teardown_class(cls) -> None: + """Don't call super teardown method.""" + + def setup(self) -> None: + """Setup after every test execution.""" + old_setup_class() # type: ignore + + def teardown(self) -> None: + """Tear down after every test execution.""" + old_teardown_class() # type: ignore + + test_cls.setup_class = setup_class + test_cls.teardown_class = teardown_class + test_cls.setup = setup + test_cls.teardown = teardown + + return test_cls + + +def mock_pytest_main() -> Any: + """ + Mock pytest main so to run in a subprocess. + + This is necessary as otherwise the in-process subcall to pytest will conflict with the current pytest runtime. + """ + + def fun(args) -> int: + result = subprocess.call(["pytest", *args]) # nosec + return result + + return mock.patch("aea.cli.test.pytest.main", side_effect=fun) + + +class BaseAEATestCommand(AEATestCaseEmpty): + """Base class for tests related to the command `aea test`.""" + + @classmethod + def run_test_command(cls, *args: Sequence[str]) -> click.testing.Result: + """ + Execute an 'aea test' command. + + It differs from the method run_cli_command of the base class as it does not + raise exception when the executed CLI command fails. + + :param args: the argumnets to pass to `aea test` + :return: the click.testing.Result object + """ + with cd(cls._get_cwd()): + return cls.runner.invoke( + cli, + [*CLI_LOG_OPTION, "test", *args], + standalone_mode=False, + catch_exceptions=False, + ) + + def test_aea_dirpath(self) -> Path: + """Get the test AEA directory path.""" + return self.t / self.agent_name / "tests" + + def dummy_package_dirpath( + self, package_type: ComponentType, item_name: str + ) -> Path: + """ + Get the package directory path. + + :param package_type: the type of the package + :param item_name: the name of the item + :return: path to the AEA package + """ + public_id = self._public_id(package_type) + result = get_package_path( + self.t / self.agent_name, + str(package_type.value), + public_id, + is_vendor=False, + ) + return Path(result) + + def get_test_package_dirpath( + self, package_type: ComponentType, item_name: str + ) -> Path: + """ + Get the test package directory path. + + :param package_type: the type of the package + :param item_name: the name of the item + :return: path to the AEA package + """ + return self.dummy_package_dirpath(package_type, item_name) / "tests" + + @classmethod + def write_dummy_test_module(cls, path_to_module: Path) -> None: + """Write dummy test module.""" + path_to_module.write_text( + dedent( + """\ + def test_dummy_function(): + assert True + """ + ) + ) + + @classmethod + def _get_dummy_package_name(cls, package_type: ComponentType) -> str: + """Get the name of the dummy package from package type.""" + return f"dummy_{package_type.value}" + + def _scaffold_item(self, package_type: ComponentType) -> None: + """Scaffold an item for testing.""" + self.scaffold_item( + str(package_type.value), self._get_dummy_package_name(package_type) + ) + + def _public_id(self, package_type: ComponentType) -> PublicId: + """Return the PublicId of the dummy package.""" + return PublicId(self.author, self._get_dummy_package_name(package_type)) + + def _configure_package_for_testing(self, package_type: ComponentType) -> None: + """Configure a package for testing.""" + self._scaffold_item(package_type) + test_package_name = self._get_dummy_package_name(package_type) + test_package_dirpath = self.get_test_package_dirpath( + package_type, test_package_name + ) + test_package_dirpath.mkdir(exist_ok=False) + test_module_filepath = ( + test_package_dirpath / f"test_{package_type.value}_module.py" + ) + self.write_dummy_test_module(test_module_filepath) + self.fingerprint_item( + str(package_type.value), str(self._public_id(package_type)) + ) + + +class TestAgentTestEmptySuite(BaseAEATestCommand): + """Test that the command 'aea test' works as expected (with an empty test suite).""" + + def test_exit_code_equal_to_5(self): + """Assert that the exit code is equal to 5 (i.e. pytest succeeds without collecting tests).""" + result = self.run_test_command() + assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE + + +class TestAgentTestSingleTest(BaseAEATestCommand): + """Test that the command 'aea test' works as expected (with a non-empty test suite).""" + + def test_run(self): + """Assert that the exit code is equal to 0 (tests are run successfully).""" + # write dummy test module in test/ folder + self.test_aea_dirpath().mkdir(exist_ok=False) + test_module_filepath = self.test_aea_dirpath() / "test_module.py" + self.write_dummy_test_module(test_module_filepath) + result = self.run_test_command() + assert result.exit_code == OK_PYTEST_EXIT_CODE + + +@_parametrize_class +class TestPackageTestByTypeEmptyTestSuite(BaseAEATestCommand): + """Test that the command 'aea test item_type public_id' works as expected (with an empty test suite).""" + + @pytest.mark.parametrize("package_type", list(ComponentType)) + def test_run(self, package_type: ComponentType): + """Assert that the exit code is equal to 5 (empty test suite).""" + self._scaffold_item(package_type) + public_id = self._public_id(package_type) + result = self.run_test_command(str(package_type.value), str(public_id)) + assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE + + +@_parametrize_class +class TestPackageTestByType(BaseAEATestCommand): + """Test that the command 'aea test item_type public_id' works as expected (with a non-empty test suite).""" + + @pytest.mark.parametrize("package_type", list(ComponentType)) + def test_run(self, package_type: ComponentType, *_mocks: Any): + """Assert that the exit code is equal to 0 (tests are run successfully).""" + self._configure_package_for_testing(package_type) + public_id = self._public_id(package_type) + with mock_pytest_main(): + result = self.run_test_command(str(package_type.value), str(public_id)) + assert result.exit_code == OK_PYTEST_EXIT_CODE + + +@_parametrize_class +class TestPackageTestByPathEmptyTestSuite(BaseAEATestCommand): + """Test that the command 'aea test by-path path-to-package' works as expected (empty test suite).""" + + @pytest.mark.parametrize("package_type", list(ComponentType)) + def test_run(self, package_type: ComponentType): + """Assert that the exit code is equal to 0 (tests are run successfully).""" + self._scaffold_item(package_type) + test_package_name = self._get_dummy_package_name(package_type) + package_dirpath = self.dummy_package_dirpath(package_type, test_package_name) + with mock_pytest_main(): + result = self.run_test_command("by-path", str(package_dirpath)) + assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE + + +@_parametrize_class +class TestPackageTestByPath(BaseAEATestCommand): + """Test that the command 'aea test by-path path-to-package' works as expected (non-empty test suite).""" + + @pytest.mark.parametrize("package_type", list(ComponentType)) + def test_run(self, package_type: ComponentType, *_mocks: Any): + """Assert that the exit code is equal to 0 (tests are run successfully).""" + self._configure_package_for_testing(package_type) + test_package_name = self._get_dummy_package_name(package_type) + package_dirpath = self.dummy_package_dirpath(package_type, test_package_name) + with mock_pytest_main(): + result = self.run_test_command("by-path", str(package_dirpath)) + assert result.exit_code == OK_PYTEST_EXIT_CODE From 0136e405be2245efad8711771c08db2e9754039f Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 12:20:09 +0200 Subject: [PATCH 04/93] feat: make 'aea test item_type public_id' work also for vendor packages --- aea/cli/test.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 9cc13b8c0d..641c498a22 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -32,8 +32,10 @@ ) from aea.cli.utils.context import Context from aea.cli.utils.decorators import check_aea_project, pass_ctx, pytest_args +from aea.cli.utils.package_utils import get_package_path from aea.configurations.constants import CONNECTION, CONTRACT, PROTOCOL, SKILL from aea.configurations.data_types import PublicId +from aea.exceptions import enforce from aea.helpers.base import cd @@ -118,13 +120,24 @@ def test_item( :param item_public_id: the item public id. :param pytest_arguments: arguments to forward to Pytest """ - item_type_plural = item_type + "s" click.echo( "Executing tests of component of type {}, {}' ...".format( item_type, item_public_id ) ) - package_dirpath = Path(ctx.cwd, item_type_plural, item_public_id.name) + package_dirpath = Path( + get_package_path(ctx.cwd, item_type, item_public_id, is_vendor=False) + ) + if not package_dirpath.exists(): + # check if it is a vendor package + package_dirpath = Path( + get_package_path(ctx.cwd, item_type, item_public_id, is_vendor=True) + ) + enforce( + package_dirpath.exists(), + exception_text=f"package {item_public_id} of type {item_type} not found", + exception_class=click.ClickException, + ) test_package_by_path(package_dirpath, pytest_arguments) From ee5860bc3ff6c8a2a98c34eb4eb4e8112f400273 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 12:20:26 +0200 Subject: [PATCH 05/93] test: add tests for 'aea test' with vendor packages --- tests/test_cli/test_test.py | 82 +++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 12 deletions(-) diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py index 85cda12586..0bd19a74d1 100644 --- a/tests/test_cli/test_test.py +++ b/tests/test_cli/test_test.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This test module contains the tests for CLI test command.""" +import shutil import subprocess # nosec from pathlib import Path from textwrap import dedent @@ -26,7 +27,7 @@ import click.testing import pytest -from _pytest.config import ExitCode +from _pytest.config import ExitCode # type: ignore from aea.cli import cli from aea.cli.utils.package_utils import get_package_path @@ -102,9 +103,13 @@ def run_test_command(cls, *args: Sequence[str]) -> click.testing.Result: catch_exceptions=False, ) - def test_aea_dirpath(self) -> Path: + def get_aea_dirpath(self) -> Path: + """Get the AEA directory path.""" + return self.t / self.agent_name + + def get_test_aea_dirpath(self) -> Path: """Get the test AEA directory path.""" - return self.t / self.agent_name / "tests" + return self.get_aea_dirpath() / "tests" def dummy_package_dirpath( self, package_type: ComponentType, item_name: str @@ -118,7 +123,7 @@ def dummy_package_dirpath( """ public_id = self._public_id(package_type) result = get_package_path( - self.t / self.agent_name, + str(self.get_aea_dirpath()), str(package_type.value), public_id, is_vendor=False, @@ -180,11 +185,35 @@ def _configure_package_for_testing(self, package_type: ComponentType) -> None: str(package_type.value), str(self._public_id(package_type)) ) + def _vendorize(self, package_type: ComponentType, public_id: PublicId) -> None: + """Vendorize an agent package.""" + aea_dirpath = self.get_aea_dirpath() + old_package_dirpath = Path( + get_package_path( + str(aea_dirpath), + str(package_type.value), + public_id, + is_vendor=False, + ) + ) + new_package_dirpath = Path( + get_package_path( + str(aea_dirpath), + str(package_type.value), + public_id, + is_vendor=True, + ) + ) + assert old_package_dirpath.exists() + assert not new_package_dirpath.exists() + new_package_dirpath.parent.mkdir(parents=True, exist_ok=True) + shutil.move(str(old_package_dirpath), str(new_package_dirpath)) + class TestAgentTestEmptySuite(BaseAEATestCommand): """Test that the command 'aea test' works as expected (with an empty test suite).""" - def test_exit_code_equal_to_5(self): + def test_run(self): """Assert that the exit code is equal to 5 (i.e. pytest succeeds without collecting tests).""" result = self.run_test_command() assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE @@ -193,11 +222,11 @@ def test_exit_code_equal_to_5(self): class TestAgentTestSingleTest(BaseAEATestCommand): """Test that the command 'aea test' works as expected (with a non-empty test suite).""" - def test_run(self): + def test_run(self) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" # write dummy test module in test/ folder - self.test_aea_dirpath().mkdir(exist_ok=False) - test_module_filepath = self.test_aea_dirpath() / "test_module.py" + self.get_test_aea_dirpath().mkdir(exist_ok=False) + test_module_filepath = self.get_test_aea_dirpath() / "test_module.py" self.write_dummy_test_module(test_module_filepath) result = self.run_test_command() assert result.exit_code == OK_PYTEST_EXIT_CODE @@ -208,7 +237,7 @@ class TestPackageTestByTypeEmptyTestSuite(BaseAEATestCommand): """Test that the command 'aea test item_type public_id' works as expected (with an empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType): + def test_run(self, package_type: ComponentType) -> None: """Assert that the exit code is equal to 5 (empty test suite).""" self._scaffold_item(package_type) public_id = self._public_id(package_type) @@ -221,10 +250,39 @@ class TestPackageTestByType(BaseAEATestCommand): """Test that the command 'aea test item_type public_id' works as expected (with a non-empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType, *_mocks: Any): + def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: + """Assert that the exit code is equal to 0 (tests are run successfully).""" + self._configure_package_for_testing(package_type) + public_id = self._public_id(package_type) + with mock_pytest_main(): + result = self.run_test_command(str(package_type.value), str(public_id)) + assert result.exit_code == OK_PYTEST_EXIT_CODE + + +@_parametrize_class +class TestVendorPackageTestByTypeEmptyTestSuite(BaseAEATestCommand): + """Test that the command 'aea test item_type public_id' for vendor packages works as expected (with an empty test suite).""" + + @pytest.mark.parametrize("package_type", list(ComponentType)) + def test_run(self, package_type: ComponentType) -> None: + """Assert that the exit code is equal to 5 (empty test suite).""" + self._scaffold_item(package_type) + public_id = self._public_id(package_type) + self._vendorize(package_type, public_id) + result = self.run_test_command(str(package_type.value), str(public_id)) + assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE + + +@_parametrize_class +class TestVendorPackageTestByType(BaseAEATestCommand): + """Test that the command 'aea test item_type public_id' for vendor packages works as expected (with a non-empty test suite).""" + + @pytest.mark.parametrize("package_type", list(ComponentType)) + def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._configure_package_for_testing(package_type) public_id = self._public_id(package_type) + self._vendorize(package_type, public_id) with mock_pytest_main(): result = self.run_test_command(str(package_type.value), str(public_id)) assert result.exit_code == OK_PYTEST_EXIT_CODE @@ -235,7 +293,7 @@ class TestPackageTestByPathEmptyTestSuite(BaseAEATestCommand): """Test that the command 'aea test by-path path-to-package' works as expected (empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType): + def test_run(self, package_type: ComponentType) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._scaffold_item(package_type) test_package_name = self._get_dummy_package_name(package_type) @@ -250,7 +308,7 @@ class TestPackageTestByPath(BaseAEATestCommand): """Test that the command 'aea test by-path path-to-package' works as expected (non-empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType, *_mocks: Any): + def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._configure_package_for_testing(package_type) test_package_name = self._get_dummy_package_name(package_type) From ec55bf7e4cf3179cf21249e0c5dc02c2bd97f128 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 13:19:55 +0200 Subject: [PATCH 06/93] feat: require tests to be in tests/ --- aea/cli/test.py | 17 +++++++++++++++-- aea/configurations/constants.py | 1 + tests/test_cli/test_test.py | 15 +++++++++------ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 641c498a22..71940af23e 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -33,7 +33,13 @@ from aea.cli.utils.context import Context from aea.cli.utils.decorators import check_aea_project, pass_ctx, pytest_args from aea.cli.utils.package_utils import get_package_path -from aea.configurations.constants import CONNECTION, CONTRACT, PROTOCOL, SKILL +from aea.configurations.constants import ( + AEA_TEST_DIRNAME, + CONNECTION, + CONTRACT, + PROTOCOL, + SKILL, +) from aea.configurations.data_types import PublicId from aea.exceptions import enforce from aea.helpers.base import cd @@ -150,6 +156,13 @@ def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> """ # check the path points to a valid AEA package determine_package_type_for_directory(package_dir) + + test_package_dir = package_dir / AEA_TEST_DIRNAME + enforce( + test_package_dir.exists(), + f"tests directory in {package_dir} not found", + click.ClickException, + ) with cd(package_dir): - exit_code = pytest.main(list(pytest_arguments)) + exit_code = pytest.main([AEA_TEST_DIRNAME] + list(pytest_arguments)) sys.exit(exit_code) diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py index f8f1886481..965069b90b 100644 --- a/aea/configurations/constants.py +++ b/aea/configurations/constants.py @@ -156,3 +156,4 @@ AEA_DIR / "skills" / "scaffold", ] PYCACHE = "__pycache__" +AEA_TEST_DIRNAME = "tests" diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py index 0bd19a74d1..9063f301db 100644 --- a/tests/test_cli/test_test.py +++ b/tests/test_cli/test_test.py @@ -31,6 +31,7 @@ from aea.cli import cli from aea.cli.utils.package_utils import get_package_path +from aea.configurations.constants import AEA_TEST_DIRNAME from aea.configurations.data_types import ComponentType, PublicId from aea.helpers.base import cd from aea.test_tools.test_cases import AEATestCaseEmpty, CLI_LOG_OPTION @@ -109,7 +110,7 @@ def get_aea_dirpath(self) -> Path: def get_test_aea_dirpath(self) -> Path: """Get the test AEA directory path.""" - return self.get_aea_dirpath() / "tests" + return self.get_aea_dirpath() / AEA_TEST_DIRNAME def dummy_package_dirpath( self, package_type: ComponentType, item_name: str @@ -140,7 +141,7 @@ def get_test_package_dirpath( :param item_name: the name of the item :return: path to the AEA package """ - return self.dummy_package_dirpath(package_type, item_name) / "tests" + return self.dummy_package_dirpath(package_type, item_name) / AEA_TEST_DIRNAME @classmethod def write_dummy_test_module(cls, path_to_module: Path) -> None: @@ -161,9 +162,11 @@ def _get_dummy_package_name(cls, package_type: ComponentType) -> str: def _scaffold_item(self, package_type: ComponentType) -> None: """Scaffold an item for testing.""" - self.scaffold_item( - str(package_type.value), self._get_dummy_package_name(package_type) - ) + item_name = self._get_dummy_package_name(package_type) + self.scaffold_item(str(package_type.value), item_name) + package_dirpath = self.dummy_package_dirpath(package_type, item_name) + # initialize tests folder + (package_dirpath / AEA_TEST_DIRNAME).mkdir(exist_ok=False) def _public_id(self, package_type: ComponentType) -> PublicId: """Return the PublicId of the dummy package.""" @@ -176,7 +179,6 @@ def _configure_package_for_testing(self, package_type: ComponentType) -> None: test_package_dirpath = self.get_test_package_dirpath( package_type, test_package_name ) - test_package_dirpath.mkdir(exist_ok=False) test_module_filepath = ( test_package_dirpath / f"test_{package_type.value}_module.py" ) @@ -215,6 +217,7 @@ class TestAgentTestEmptySuite(BaseAEATestCommand): def test_run(self): """Assert that the exit code is equal to 5 (i.e. pytest succeeds without collecting tests).""" + (self.get_aea_dirpath() / AEA_TEST_DIRNAME).mkdir(exist_ok=False) result = self.run_test_command() assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE From 08cb4975796af72e882e311f77012e7e79fb7eed Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 15:29:00 +0200 Subject: [PATCH 07/93] fix: don't check for aea project in 'aea test by-path' --- aea/cli/test.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 71940af23e..b9601b2d97 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -47,14 +47,12 @@ @click.group(invoke_without_command=True) @click.pass_context -@check_aea_project @pytest_args def test(click_context: click.Context, args: Sequence[str]) -> None: """Run tests of an AEA project.""" - click.echo("Executing tests of the AEA project...") ctx = cast(Context, click_context.obj) if click_context.invoked_subcommand is None: - test_package_by_path(Path(ctx.cwd), args) + test_aea_project(Path(ctx.cwd), args) @test.command() @@ -166,3 +164,10 @@ def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> with cd(package_dir): exit_code = pytest.main([AEA_TEST_DIRNAME] + list(pytest_arguments)) sys.exit(exit_code) + + +@check_aea_project +def test_aea_project(aea_project_dirpath: Path, args: Sequence[str]) -> None: + """Run tests of an AEA project.""" + click.echo("Executing tests of the AEA project...") + test_package_by_path(aea_project_dirpath, args) From a2437fbab28f45942efe70d6a0b65c95dd0d0ffc Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 15:39:27 +0200 Subject: [PATCH 08/93] test: update tox.ini configuration bandit must be configured in such a way that tests of AEA packages must be excluded. We add another call to bandit that chekcs all the tests folders in AEA packages, by ignoring B101 (the one about the use of 'assert'). --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a1ef7e011f..2e8987a0f5 100644 --- a/tox.ini +++ b/tox.ini @@ -93,7 +93,8 @@ skipsdist = True skip_install = True deps = bandit==1.7.0 -commands = bandit -r aea benchmark examples packages \ +commands = bandit -r aea benchmark examples packages --exclude packages/*/*/*/tests \ + bandit -s B101 -r packages/*/*/*/tests \ plugins/aea-ledger-fetchai/aea_ledger_fetchai \ plugins/aea-ledger-ethereum/aea_ledger_ethereum \ plugins/aea-ledger-cosmos/aea_ledger_cosmos \ From 469598964a8edb619e7aa61b874a21a23c45a4c9 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 16:00:52 +0200 Subject: [PATCH 09/93] test: move test_protocols/test_contract_api into its package --- .../connections/ledger/connection.yaml | 2 +- .../protocols/contract_api/protocol.yaml | 2 + .../protocols/contract_api/tests/__init__.py | 20 + .../contract_api/tests/test_contract_api.py | 579 ++++++++++++++++++ .../fetchai/skills/erc1155_client/skill.yaml | 4 +- .../fetchai/skills/erc1155_deploy/skill.yaml | 4 +- .../fetchai/skills/generic_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_seller/skill.yaml | 2 +- packages/hashes.csv | 12 +- 9 files changed, 614 insertions(+), 13 deletions(-) create mode 100644 packages/fetchai/protocols/contract_api/tests/__init__.py create mode 100644 packages/fetchai/protocols/contract_api/tests/test_contract_api.py diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index e4dd28714d..f429bef1dd 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -15,7 +15,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/contract_api:1.0.0:bafybeibtegb5bkxjh45a2mpjmymdgyoljt4bdimpspskmpvon3bu6gwzcm +- fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm - fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae class_name: LedgerConnection config: diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml index 6116a76438..f7966d691f 100644 --- a/packages/fetchai/protocols/contract_api/protocol.yaml +++ b/packages/fetchai/protocols/contract_api/protocol.yaml @@ -15,6 +15,8 @@ fingerprint: dialogues.py: bafybeigtl37mvilzuqqdhheqopnitbr4dmwktkb6e55izkf3z7bbrsxuna message.py: bafybeigftvzbo5xf42rxvyjqj3f3sladfpm3dikjymasasu73uo3emfrn4 serialization.py: bafybeif7ij4l5e6mx7gfuwggdlarohqblpluik6hkfq4s2ha7nubwwiwyy + tests/__init__.py: bafybeiebqiklu6bfyzb6x6q7yby632h3nfncwzi3i7mjvombiq2eugpcym + tests/test_contract_api.py: bafybeigelatk4moe7svwqonti3kv7csp4wtxv4zfvl2f4xqeq4aughd554 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/contract_api/tests/__init__.py b/packages/fetchai/protocols/contract_api/tests/__init__.py new file mode 100644 index 0000000000..cd28fe2763 --- /dev/null +++ b/packages/fetchai/protocols/contract_api/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 fetchai +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This package contains the tests of the contract_api protocol package.""" diff --git a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py new file mode 100644 index 0000000000..1616f90e26 --- /dev/null +++ b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py @@ -0,0 +1,579 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the contract_api protocol package.""" + +import logging +import sys +from typing import Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.contract_api.dialogues import ( + ContractApiDialogue, + ContractApiDialogues, +) +from packages.fetchai.protocols.contract_api.message import ContractApiMessage +from packages.fetchai.protocols.contract_api.message import ( + _default_logger as contract_api_message_logger, +) + +from tests.conftest import ROOT_DIR + + +logger = logging.getLogger(__name__) +sys.path.append(ROOT_DIR) + + +def test_get_deploy_transaction_serialization(): + """Test the serialization for 'get_deploy_transaction' speech-act works.""" + kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION, + ledger_id="some_ledger_id", + contract_id="some_contract_id", + callable="some_callable", + kwargs=kwargs_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_get_raw_transaction_serialization(): + """Test the serialization for 'get_raw_transaction' speech-act works.""" + kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION, + ledger_id="some_ledger_id", + contract_id="some_contract_id", + contract_address="some_contract_address", + callable="some_callable", + kwargs=kwargs_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_get_raw_message_serialization(): + """Test the serialization for 'get_raw_message' speech-act works.""" + kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.GET_RAW_MESSAGE, + ledger_id="some_ledger_id", + contract_id="some_contract_id", + contract_address="some_contract_address", + callable="some_callable", + kwargs=kwargs_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_get_state_serialization(): + """Test the serialization for 'get_state' speech-act works.""" + kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.GET_STATE, + ledger_id="some_ledger_id", + contract_id="some_contract_id", + contract_address="some_contract_address", + callable="some_callable", + kwargs=kwargs_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_state_serialization(): + """Test the serialization for 'state' speech-act works.""" + state_arg = ContractApiMessage.State("some_ledger_id", {"key": "some_body"}) + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.STATE, + state=state_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_raw_transaction_serialization(): + """Test the serialization for 'raw_transaction' speech-act works.""" + raw_transaction_arg = ContractApiMessage.RawTransaction( + "some_ledger_id", {"body": "some_body"} + ) + msg = ContractApiMessage( + message_id=2, + target=1, + performative=ContractApiMessage.Performative.RAW_TRANSACTION, + raw_transaction=raw_transaction_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_raw_message_serialization(): + """Test the serialization for 'raw_message' speech-act works.""" + raw_message_arg = ContractApiMessage.RawMessage("some_ledger_id", b"some_body") + msg = ContractApiMessage( + performative=ContractApiMessage.Performative.RAW_MESSAGE, + raw_message=raw_message_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_error_serialization(): + """Test the serialization for 'error' speech-act works.""" + msg = ContractApiMessage( + performative=ContractApiMessage.Performative.ERROR, + code=7, + message="some_error_message", + data=b"some_error_data", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_performative_string_value(): + """Test the string value of the performatives.""" + assert ( + str(ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION) + == "get_deploy_transaction" + ), "The str value must be get_deploy_transaction" + assert ( + str(ContractApiMessage.Performative.GET_RAW_TRANSACTION) + == "get_raw_transaction" + ), "The str value must be get_raw_transaction" + assert ( + str(ContractApiMessage.Performative.GET_RAW_MESSAGE) == "get_raw_message" + ), "The str value must be get_raw_message" + assert ( + str(ContractApiMessage.Performative.GET_STATE) == "get_state" + ), "The str value must be get_state" + assert ( + str(ContractApiMessage.Performative.STATE) == "state" + ), "The str value must be state" + assert ( + str(ContractApiMessage.Performative.RAW_TRANSACTION) == "raw_transaction" + ), "The str value must be raw_transaction" + assert ( + str(ContractApiMessage.Performative.RAW_MESSAGE) == "raw_message" + ), "The str value must be raw_message" + assert ( + str(ContractApiMessage.Performative.ERROR) == "error" + ), "The str value must be error" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.RAW_MESSAGE, + raw_message=ContractApiMessage.RawMessage("some_ledger_id", b"some_body"), + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + ContractApiMessage.Performative, "__eq__", return_value=False + ): + ContractApiMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.RAW_MESSAGE, + raw_message=ContractApiMessage.RawMessage("some_ledger_id", b"some_body"), + ) + + encoded_msg = ContractApiMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + ContractApiMessage.Performative, "__eq__", return_value=False + ): + ContractApiMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.contract_api.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the message is incorrect.""" + with mock.patch.object(contract_api_message_logger, "error") as mock_logger: + ContractApiMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=ContractApiMessage.Performative.RAW_MESSAGE, + raw_message=ContractApiMessage.RawMessage("some_ledger_id", b"some_body"), + ) + + mock_logger.assert_any_call("some error") + + +def test_kwargs(): + """Test the kwargs custom type.""" + body = {"key_1": 1, "key_2": 2} + kwargs = ContractApiMessage.Kwargs(body) + assert str(kwargs) == "Kwargs: body={}".format(body) + + +class TestDialogues: + """Tests contract_api dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.agent_addr = "agent address" + cls.ledger_addr = "ledger address" + cls.agent_dialogues = AgentDialogues(cls.agent_addr) + cls.ledger_dialogues = LedgerDialogues(cls.ledger_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.agent_dialogues._create_self_initiated( + dialogue_opponent_addr=self.ledger_addr, + dialogue_reference=(str(0), ""), + role=ContractApiDialogue.Role.AGENT, + ) + assert isinstance(result, ContractApiDialogue) + assert result.role == ContractApiDialogue.Role.AGENT, "The role must be Agent." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.agent_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.ledger_addr, + dialogue_reference=(str(0), ""), + role=ContractApiDialogue.Role.AGENT, + ) + assert isinstance(result, ContractApiDialogue) + assert result.role == ContractApiDialogue.Role.AGENT, "The role must be agent." + + +class AgentDialogue(ContractApiDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[ContractApiMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + ContractApiDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class AgentDialogues(ContractApiDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return ContractApiDialogue.Role.AGENT + + ContractApiDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=AgentDialogue, + ) + + +class LedgerDialogue(ContractApiDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[ContractApiMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + ContractApiDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class LedgerDialogues(ContractApiDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return ContractApiDialogue.Role.LEDGER + + ContractApiDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=LedgerDialogue, + ) diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 5ff83d3dd0..485742176e 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -15,11 +15,11 @@ fingerprint: strategy.py: bafybeifudijy3opr6srw5kik3x3rmv6f75dts2pcqtlhjwkkzcafpad4em fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiasrzkbxzadi6vt35ucaa5yp4b4wbv6g44le3tuhcecjpnzp24mzq +- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe contracts: - fetchai/erc1155:0.22.0:bafybeidt3wg6cmdd6xjw6appgnb2umx2ixdwwaubdvkle2bcd6gxcx2wue protocols: -- fetchai/contract_api:1.0.0:bafybeibtegb5bkxjh45a2mpjmymdgyoljt4bdimpspskmpvon3bu6gwzcm +- fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm - fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose - fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index cd0a35d829..2f077da582 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -15,11 +15,11 @@ fingerprint: strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiasrzkbxzadi6vt35ucaa5yp4b4wbv6g44le3tuhcecjpnzp24mzq +- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe contracts: - fetchai/erc1155:0.22.0:bafybeidt3wg6cmdd6xjw6appgnb2umx2ixdwwaubdvkle2bcd6gxcx2wue protocols: -- fetchai/contract_api:1.0.0:bafybeibtegb5bkxjh45a2mpjmymdgyoljt4bdimpspskmpvon3bu6gwzcm +- fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm - fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose - fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index d974ce628f..0dec466f20 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -14,7 +14,7 @@ fingerprint: strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiasrzkbxzadi6vt35ucaa5yp4b4wbv6g44le3tuhcecjpnzp24mzq +- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 2ad9ac0a6a..d49d0ab1db 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -15,7 +15,7 @@ fingerprint: strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiasrzkbxzadi6vt35ucaa5yp4b4wbv6g44le3tuhcecjpnzp24mzq +- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index f7f3c3f37b..1e300311bb 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -4,11 +4,11 @@ fetchai/agents/my_first_aea,bafybeihakkloflpblkxcbsp6wrwd36hpr2xtwbub3dklig5qtbd fetchai/connections/gym,bafybeidmle66kgh7h6kdqevtmqm2fu2c5h5vhp7tb5wfthbwnwbql46d5y fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey -fetchai/connections/ledger,bafybeiasrzkbxzadi6vt35ucaa5yp4b4wbv6g44le3tuhcecjpnzp24mzq +fetchai/connections/ledger,bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe fetchai/connections/local,bafybeidu5cgji37wuczrecdfni6h6zarzqno2liycr4niozxqpxsrmnny4 fetchai/connections/stub,bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu fetchai/contracts/erc1155,bafybeidt3wg6cmdd6xjw6appgnb2umx2ixdwwaubdvkle2bcd6gxcx2wue -fetchai/protocols/contract_api,bafybeibtegb5bkxjh45a2mpjmymdgyoljt4bdimpspskmpvon3bu6gwzcm +fetchai/protocols/contract_api,bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose fetchai/protocols/gym,bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe @@ -18,13 +18,13 @@ fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollob fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm fetchai/skills/echo,bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y -fetchai/skills/erc1155_client,bafybeic5nlfuqghuecfonjmtb6mvcjhyyc4eivo36picm4a4tlei4de23q -fetchai/skills/erc1155_deploy,bafybeib3xeug2fx5nmsxp2i7wqpxn6o5m4ys55akr3jw7h6c5ke5i5hzmm +fetchai/skills/erc1155_client,bafybeicfcia5hrbdmulameuxzxpvg3tpubieq7ntj44a3e6atnqmxqkvtm +fetchai/skills/erc1155_deploy,bafybeiejhy5sydqw3ehl27r2ftbres4p2bs7pr5x4fha5tigqfxgtdqymu fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a -fetchai/skills/generic_buyer,bafybeibme7eskh44qsmtuvoanke7jryxknxxki5eq2dn2opf5edptawmvm -fetchai/skills/generic_seller,bafybeigjbzvibvjtkmjaeuc2vwfzk4ukd6pzesbbznkg6eglfmmhkk66f4 +fetchai/skills/generic_buyer,bafybeiaoaph55jeyugeehl3w626mui7freeapv2y2mkq64m4e6gf5ryb4y +fetchai/skills/generic_seller,bafybeiaacd3auwavycrqb4sl5lwxhaobaeghuvfrgzz3ybwzy3h6e3jrrq fetchai/skills/gym,bafybeieulblm3l5s4na6von3tb3hrlh3x7u7dvpclvn2sfvufapqw4wwha fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble From 38419f73c0b57dd84f6b71cc90740f76e7640ffb Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 16:02:55 +0200 Subject: [PATCH 10/93] test: move test_connections/test_gym into its package --- .../fetchai/agents/gym_aea/aea-config.yaml | 4 +- .../fetchai/connections/gym/connection.yaml | 2 + .../fetchai/connections/gym/tests/__init__.py | 20 ++ .../fetchai/connections/gym/tests/test_gym.py | 279 ++++++++++++++++++ packages/fetchai/skills/gym/skill.yaml | 2 +- packages/hashes.csv | 8 +- .../open_aea/agents/gym_aea/aea-config.yaml | 4 +- 7 files changed, 310 insertions(+), 9 deletions(-) create mode 100644 packages/fetchai/connections/gym/tests/__init__.py create mode 100644 packages/fetchai/connections/gym/tests/test_gym.py diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 9a506f054c..bfffc61e0f 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidmle66kgh7h6kdqevtmqm2fu2c5h5vhp7tb5wfthbwnwbql46d5y +- fetchai/gym:0.19.0:bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeieulblm3l5s4na6von3tb3hrlh3x7u7dvpclvn2sfvufapqw4wwha +- fetchai/gym:0.20.0:bafybeiamoluhbqneq3kdjvuafley3nbjvp5qeqxwkteh2r4y23slpsx2zq default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 1811a4de36..6819be442e 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -9,6 +9,8 @@ fingerprint: README.md: bafybeidafzjeoncxdycohsvxmxxgqnlxira724at6x4slxkuw3hasper2q __init__.py: bafybeiacpcxqwod5ppgwckp36jj3ax2ymzkrv4tlalzcatxrx4tblbvfvq connection.py: bafybeiacf4utttdtrp2zb5wjrksatswb7dtlgnzafxiofuvzxot53oqdd4 + tests/__init__.py: bafybeielwxjlvbzufqr3wgv4jrzbi6kquzelxbczla4cvpoiuz2no5eqp4 + tests/test_gym.py: bafybeicajocxzl3rxzwq6cyuzxyo5zdmjxbh4pl5nfcjilkeoznlaz5soe fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/gym/tests/__init__.py b/packages/fetchai/connections/gym/tests/__init__.py new file mode 100644 index 0000000000..9d1f2264f7 --- /dev/null +++ b/packages/fetchai/connections/gym/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the gym connection implementation.""" diff --git a/packages/fetchai/connections/gym/tests/test_gym.py b/packages/fetchai/connections/gym/tests/test_gym.py new file mode 100644 index 0000000000..ca303a6b07 --- /dev/null +++ b/packages/fetchai/connections/gym/tests/test_gym.py @@ -0,0 +1,279 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the gym connection module.""" +import asyncio +import logging +import os +from typing import cast +from unittest.mock import MagicMock, patch + +import gym +import pytest + +from aea.common import Address +from aea.configurations.base import ConnectionConfig +from aea.identity.base import Identity +from aea.mail.base import Envelope, Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue + +from packages.fetchai.connections.gym.connection import GymConnection +from packages.fetchai.protocols.gym.dialogues import GymDialogue +from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues +from packages.fetchai.protocols.gym.message import GymMessage + +from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID + + +logger = logging.getLogger(__name__) + + +class GymDialogues(BaseGymDialogues): + """The dialogues class keeps track of all gym dialogues.""" + + def __init__(self, self_address: Address, **kwargs) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return GymDialogue.Role.AGENT + + BaseGymDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + ) + + +class TestGymConnection: + """Test the packages/connection/gym/connection.py.""" + + def setup(self): + """Initialise the class.""" + self.env = gym.GoalEnv() + configuration = ConnectionConfig(connection_id=GymConnection.connection_id) + self.agent_address = "my_address" + self.agent_public_key = "my_public_key" + identity = Identity( + "name", address=self.agent_address, public_key=self.agent_public_key + ) + self.gym_con = GymConnection( + gym_env=self.env, + identity=identity, + configuration=configuration, + data_dir=MagicMock(), + ) + self.loop = asyncio.get_event_loop() + self.gym_address = str(GymConnection.connection_id) + self.skill_id = "some/skill:0.1.0" + self.dialogues = GymDialogues(self.skill_id) + + def teardown(self): + """Clean up after tests.""" + self.loop.run_until_complete(self.gym_con.disconnect()) + + @pytest.mark.asyncio + async def test_gym_connection_connect(self): + """Test the connection None return value after connect().""" + assert self.gym_con.channel._queue is None + await self.gym_con.channel.connect() + assert self.gym_con.channel._queue is not None + + @pytest.mark.asyncio + async def test_decode_envelope_error(self): + """Test the decoding error for the envelopes.""" + await self.gym_con.connect() + envelope = Envelope( + to=self.gym_address, + sender=self.skill_id, + protocol_specification_id=UNKNOWN_PROTOCOL_PUBLIC_ID, + message=b"hello", + ) + + with pytest.raises(ValueError): + await self.gym_con.send(envelope) + + @pytest.mark.asyncio + async def test_send_connection_error(self): + """Test send connection error.""" + msg, sending_dialogue = self.dialogues.create( + counterparty=self.gym_address, + performative=GymMessage.Performative.RESET, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + ) + + with pytest.raises(ConnectionError): + await self.gym_con.send(envelope) + + @pytest.mark.asyncio + async def test_send_act(self): + """Test send act message.""" + sending_dialogue = await self.send_reset() + assert sending_dialogue.last_message is not None + msg = sending_dialogue.reply( + performative=GymMessage.Performative.ACT, + action=GymMessage.AnyObject("any_action"), + step_id=1, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + ) + await self.gym_con.connect() + + observation = 1 + reward = 1.0 + done = True + info = "some info" + with patch.object( + self.env, "step", return_value=(observation, reward, done, info) + ) as mock: + await self.gym_con.send(envelope) + mock.assert_called() + + response = await asyncio.wait_for(self.gym_con.receive(), timeout=3) + response_msg = cast(GymMessage, response.message) + response_dialogue = self.dialogues.update(response_msg) + + assert response_msg.performative == GymMessage.Performative.PERCEPT + assert response_msg.step_id == msg.step_id + assert response_msg.observation.any == observation + assert response_msg.reward == reward + assert response_msg.done == done + assert response_msg.info.any == info + assert sending_dialogue == response_dialogue + + @pytest.mark.asyncio + async def test_send_reset(self): + """Test send reset message.""" + _ = await self.send_reset() + + @pytest.mark.asyncio + async def test_send_close(self): + """Test send close message.""" + sending_dialogue = await self.send_reset() + assert sending_dialogue.last_message is not None + msg = sending_dialogue.reply( + performative=GymMessage.Performative.CLOSE, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + ) + await self.gym_con.connect() + + with patch.object(self.env, "close") as mock: + await self.gym_con.send(envelope) + mock.assert_called() + + @pytest.mark.asyncio + async def test_send_close_negative(self): + """Test send close message with invalid reference and message id and target.""" + incorrect_msg = GymMessage( + performative=GymMessage.Performative.CLOSE, + dialogue_reference=self.dialogues.new_self_initiated_dialogue_reference(), + ) + incorrect_msg.to = self.gym_address + incorrect_msg.sender = self.skill_id + + # the incorrect message cannot be sent into a dialogue, so this is omitted. + + envelope = Envelope( + to=incorrect_msg.to, + sender=incorrect_msg.sender, + protocol_specification_id=incorrect_msg.protocol_specification_id, + message=incorrect_msg, + ) + await self.gym_con.connect() + + with patch.object(self.gym_con.channel.logger, "warning") as mock_logger: + await self.gym_con.send(envelope) + mock_logger.assert_any_call( + f"Could not create dialogue from message={incorrect_msg}" + ) + + async def send_reset(self) -> GymDialogue: + """Send a reset.""" + msg, sending_dialogue = self.dialogues.create( + counterparty=self.gym_address, + performative=GymMessage.Performative.RESET, + ) + assert sending_dialogue is not None + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + ) + await self.gym_con.connect() + + with patch.object(self.env, "reset") as mock: + await self.gym_con.send(envelope) + mock.assert_called() + + response = await asyncio.wait_for(self.gym_con.receive(), timeout=3) + response_msg = cast(GymMessage, response.message) + response_dialogue = self.dialogues.update(response_msg) + + assert response_msg.performative == GymMessage.Performative.STATUS + assert response_msg.content == {"reset": "success"} + assert sending_dialogue == response_dialogue + return sending_dialogue + + @pytest.mark.asyncio + async def test_receive_connection_error(self): + """Test receive connection error and Cancel Error.""" + with pytest.raises(ConnectionError): + await self.gym_con.receive() + + def test_gym_env_load(self): + """Load gym env from file.""" + curdir = os.getcwd() + os.chdir(os.path.join(ROOT_DIR, "examples", "gym_ex")) + gym_env_path = "gyms.env.BanditNArmedRandom" + configuration = ConnectionConfig( + connection_id=GymConnection.connection_id, env=gym_env_path + ) + identity = Identity( + "name", address=self.agent_address, public_key=self.agent_public_key + ) + gym_con = GymConnection( + gym_env=None, + identity=identity, + configuration=configuration, + data_dir=MagicMock(), + ) + assert gym_con.channel.gym_env is not None + os.chdir(curdir) diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index fb7cef911d..7d589af62f 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,7 +15,7 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidmle66kgh7h6kdqevtmqm2fu2c5h5vhp7tb5wfthbwnwbql46d5y +- fetchai/gym:0.19.0:bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index 1e300311bb..20783b631e 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,7 +1,7 @@ fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe -fetchai/agents/gym_aea,bafybeigc5subo6gehigeochdhitmj3ohvgqapqf7mfj34hukxxqhwakayy +fetchai/agents/gym_aea,bafybeiabzmgtujkjbhzeejrxkir2wcuyzbj3ar6mz6avk5j7w7go37epp4 fetchai/agents/my_first_aea,bafybeihakkloflpblkxcbsp6wrwd36hpr2xtwbub3dklig5qtbdw6lvjlu -fetchai/connections/gym,bafybeidmle66kgh7h6kdqevtmqm2fu2c5h5vhp7tb5wfthbwnwbql46d5y +fetchai/connections/gym,bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey fetchai/connections/ledger,bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe @@ -25,10 +25,10 @@ fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6at fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a fetchai/skills/generic_buyer,bafybeiaoaph55jeyugeehl3w626mui7freeapv2y2mkq64m4e6gf5ryb4y fetchai/skills/generic_seller,bafybeiaacd3auwavycrqb4sl5lwxhaobaeghuvfrgzz3ybwzy3h6e3jrrq -fetchai/skills/gym,bafybeieulblm3l5s4na6von3tb3hrlh3x7u7dvpclvn2sfvufapqw4wwha +fetchai/skills/gym,bafybeiamoluhbqneq3kdjvuafley3nbjvp5qeqxwkteh2r4y23slpsx2zq fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeibtvxaqbm567cgek7de6nlx33cmwqvhvh4hfowr2zi4uioha4l23a +open_aea/agents/gym_aea,bafybeib4eybwgfgezzskodw4rm5qkmfty7j4twv7kxmr3wi6gmsge4ba6a open_aea/agents/http_echo,bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 open_aea/agents/my_first_aea,bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index ea1ca45f62..ca325fdb5e 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidmle66kgh7h6kdqevtmqm2fu2c5h5vhp7tb5wfthbwnwbql46d5y +- fetchai/gym:0.19.0:bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeieulblm3l5s4na6von3tb3hrlh3x7u7dvpclvn2sfvufapqw4wwha +- fetchai/gym:0.20.0:bafybeiamoluhbqneq3kdjvuafley3nbjvp5qeqxwkteh2r4y23slpsx2zq default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} From f5acc94707ff05d9649abd9cb140dea639402c02 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 16:04:44 +0200 Subject: [PATCH 11/93] test: move test_contracts/test_erc1155 into its package TODO: requires moving ganache and other related fixtures --- .../fetchai/contracts/erc1155/contract.yaml | 2 + .../contracts/erc1155/tests/__init__.py | 20 + .../contracts/erc1155/tests/test_contract.py | 1631 +++++++++++++++++ .../fetchai/skills/erc1155_client/skill.yaml | 2 +- .../fetchai/skills/erc1155_deploy/skill.yaml | 2 +- packages/hashes.csv | 6 +- 6 files changed, 1658 insertions(+), 5 deletions(-) create mode 100644 packages/fetchai/contracts/erc1155/tests/__init__.py create mode 100644 packages/fetchai/contracts/erc1155/tests/test_contract.py diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index cdac82d221..81aca86236 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -16,6 +16,8 @@ fingerprint: contracts/erc1155.vy: bafybeieoxkgqprmmgvl2xdqtch4payvxzpw3c76thmtrl7vbmc6zxzl2a4 migrations/1_initial_migration.js: bafybeigzg7dadlq7sepncquzoo5hgs7q2pwvbhzilolgkjkr3jacb2owvy migrations/2_deploy_contracts.js: bafybeihnzburnurq4gvp4rj36b57uzrlgif5y73ggyu3rfc3iot4e5zppy + tests/__init__.py: bafybeidgqgy32gwubf3eu7ijc7ddq4bm675oxyfqevm5j2ew2zcu4p6tm4 + tests/test_contract.py: bafybeienxes6xv3lqkfrrzirrrfxxvop2yk5ab3iy2zqnpkw47wzlmny4q fingerprint_ignore_patterns: [] class_name: ERC1155Contract contract_interface_paths: diff --git a/packages/fetchai/contracts/erc1155/tests/__init__.py b/packages/fetchai/contracts/erc1155/tests/__init__.py new file mode 100644 index 0000000000..d110676a8b --- /dev/null +++ b/packages/fetchai/contracts/erc1155/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""The tests module contains the tests of the packages/contracts/erc1155 dir.""" diff --git a/packages/fetchai/contracts/erc1155/tests/test_contract.py b/packages/fetchai/contracts/erc1155/tests/test_contract.py new file mode 100644 index 0000000000..458ee66773 --- /dev/null +++ b/packages/fetchai/contracts/erc1155/tests/test_contract.py @@ -0,0 +1,1631 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2022 Valory AG +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""The tests module contains the tests of the packages/contracts/erc1155 dir.""" + +import re +import time +from pathlib import Path +from typing import cast +from unittest import mock + +import pytest +from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_fetchai import FetchAIApi, FetchAICrypto + +from aea.configurations.loader import ( + ComponentType, + ContractConfig, + load_component_configuration, +) +from aea.contracts.base import Contract, contract_registry +from aea.test_tools.test_contract import BaseContractTestCase + +from tests.conftest import ( + ETHEREUM_ADDRESS_ONE, + ETHEREUM_ADDRESS_TWO, + ETHEREUM_PRIVATE_KEY_PATH, + ETHEREUM_PRIVATE_KEY_TWO_PATH, + ETHEREUM_TESTNET_CONFIG, + FETCHAI_TESTNET_CONFIG, + MAX_FLAKY_RERUNS, + ROOT_DIR, + UseGanache, +) + + +@pytest.mark.ledger +class TestERC1155ContractEthereum(BaseContractTestCase, UseGanache): + """Test the ERC1155 contract on Ethereum.""" + + ledger_identifier = EthereumCrypto.identifier + path_to_contract = Path(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155") + + @classmethod + def setup(cls): + """Setup.""" + super().setup( + ledger_config=ETHEREUM_TESTNET_CONFIG, + deployer_private_key_path=ETHEREUM_PRIVATE_KEY_PATH, + item_owner_private_key_path=ETHEREUM_PRIVATE_KEY_TWO_PATH, + ) + + cls.token_ids_a = [ + 340282366920938463463374607431768211456, + 340282366920938463463374607431768211457, + 340282366920938463463374607431768211458, + 340282366920938463463374607431768211459, + 340282366920938463463374607431768211460, + 340282366920938463463374607431768211461, + 340282366920938463463374607431768211462, + 340282366920938463463374607431768211463, + 340282366920938463463374607431768211464, + 340282366920938463463374607431768211465, + ] + + cls.token_id_b = 680564733841876926926749214863536422912 + + @classmethod + def finish_contract_deployment(cls) -> str: + """ + Finish deploying contract. + + :return: contract address + """ + contract_address = cls.ledger_api.get_contract_address( + cls.deployment_tx_receipt + ) + + if contract_address is None: + raise ValueError("Contract address not found!") # pragma: nocover + + return contract_address + + def test_generate_token_ids(self): + """Test the generate_token_ids method of the ERC1155 contract.""" + # setup + nft_token_type = 1 + nb_tokens = 2 + expected_toke_ids = [ + 340282366920938463463374607431768211456, + 340282366920938463463374607431768211457, + ] + + # operation + actual_toke_ids = self.contract.generate_token_ids(nft_token_type, nb_tokens) + + # after + assert actual_toke_ids == expected_toke_ids + + def test_generate_id(self): + """Test the _generate_id method of the ERC1155 contract.""" + # setup + ft_token_type = 2 + index = 0 + expected_toke_id = 680564733841876926926749214863536422912 + + # operation + actual_toke_id = self.contract._generate_id(index, ft_token_type) + + # after + assert actual_toke_id == expected_toke_id + + def test_get_create_batch_transaction(self): + """Test the get_create_batch_transaction method of the ERC1155 contract.""" + # operation + tx = self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_ids=self.token_ids_a, + ) + + # after + assert len(tx) == 7 + assert all( + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] + ) + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + def test_get_create_single_transaction(self): + """Test the get_create_single_transaction method of the ERC1155 contract.""" + # operation + tx = self.contract.get_create_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_id=self.token_id_b, + ) + + # after + assert len(tx) == 7 + assert all( + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] + ) + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + def test_get_mint_batch_transaction(self): + """Test the get_mint_batch_transaction method of the ERC1155 contract.""" + # operation + tx = self.contract.get_mint_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.item_owner_crypto.address, + token_ids=self.token_ids_a, + mint_quantities=[1] * len(self.token_ids_a), + ) + + # after + assert len(tx) == 7 + assert all( + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] + ) + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + def test_validate_mint_quantities(self): + """Test the validate_mint_quantities method of the ERC1155 contract.""" + # Valid NFTs + self.contract.validate_mint_quantities( + token_ids=self.token_ids_a, + mint_quantities=[1] * len(self.token_ids_a), + ) + + # Valid FTs + token_id = 680564733841876926926749214863536422912 + mint_quantity = 1 + self.contract.validate_mint_quantities( + token_ids=[token_id], + mint_quantities=[mint_quantity], + ) + + # Invalid NFTs + token_id = self.token_ids_a[0] + mint_quantity = 2 + with pytest.raises( + ValueError, + match=re.escape( + f"Cannot mint NFT (token_id={token_id}) with mint_quantity more than 1 (found={mint_quantity})" + ), + ): + self.contract.validate_mint_quantities( + token_ids=[token_id], + mint_quantities=[mint_quantity], + ) + + # Invalid: neither NFT nor FT + token_id = 1020847100762815390390123822295304634368 + mint_quantity = 1 + with pytest.raises( + ValueError, + match=re.escape( + f"The token type must be 1 or 2. Found type=3 for token_id={token_id}" + ), + ): + self.contract.validate_mint_quantities( + token_ids=[token_id], + mint_quantities=[mint_quantity], + ) + + def test_decode_id(self): + """Test the decode_id method of the ERC1155 contract.""" + # FT + expected_token_type = 2 + token_id = 680564733841876926926749214863536422912 + actual_token_type = self.contract.decode_id(token_id) + assert actual_token_type == expected_token_type + + # NFT + expected_token_type = 1 + token_id = 340282366920938463463374607431768211456 + actual_token_type = self.contract.decode_id(token_id) + assert actual_token_type == expected_token_type + + def test_get_mint_single_transaction(self): + """Test the get_mint_single_transaction method of the ERC1155 contract.""" + # operation + tx = self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.item_owner_crypto.address, + token_id=self.token_id_b, + mint_quantity=1, + ) + + # after + assert len(tx) == 7 + assert all( + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] + ) + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + def test_get_balance(self): + """Test the get_balance method of the ERC1155 contract.""" + # operation + result = self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + token_id=self.token_id_b, + ) + + # after + assert "balance" in result + assert result["balance"][self.token_id_b] == 0 + + def test_get_balances(self): + """Test the get_balances method of the ERC1155 contract.""" + # operation + result = self.contract.get_balances( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + token_ids=self.token_ids_a, + ) + + # after + assert "balances" in result + assert all(result["balances"][token_id] == 0 for token_id in self.token_ids_a) + + def test_get_hash_single(self): + """Test the get_hash_single method of the ERC1155 contract.""" + # operation + result = self.contract.get_hash_single( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + from_address=self.deployer_crypto.address, + to_address=self.item_owner_crypto.address, + token_id=self.token_id_b, + from_supply=0, + to_supply=10, + value=1, + trade_nonce=1, + ) + + # after + assert isinstance(result, bytes) + + def test_get_hash_batch(self): + """Test the get_hash_batch method of the ERC1155 contract.""" + # operation + result = self.contract.get_hash_batch( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + from_address=self.deployer_crypto.address, + to_address=self.item_owner_crypto.address, + token_ids=self.token_ids_a, + from_supplies=[0, 1, 0, 0, 1, 0, 0, 0, 0, 1], + to_supplies=[0, 0, 0, 0, 0, 1, 0, 0, 0, 0], + value=1, + trade_nonce=1, + ) + + # after + assert isinstance(result, bytes) + + def test_generate_trade_nonce(self): + """Test the generate_trade_nonce method of the ERC1155 contract.""" + # operation + result = self.contract.generate_trade_nonce( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + ) + + # after + assert "trade_nonce" in result + assert isinstance(result["trade_nonce"], int) + + @pytest.mark.integration + def test_helper_methods_and_get_transactions(self): + """Test helper methods and get transactions.""" + expected_a = [ + 340282366920938463463374607431768211456, + 340282366920938463463374607431768211457, + 340282366920938463463374607431768211458, + 340282366920938463463374607431768211459, + 340282366920938463463374607431768211460, + 340282366920938463463374607431768211461, + 340282366920938463463374607431768211462, + 340282366920938463463374607431768211463, + 340282366920938463463374607431768211464, + 340282366920938463463374607431768211465, + ] + actual = self.contract.generate_token_ids(token_type=1, nb_tokens=10) + assert expected_a == actual + expected_b = [ + 680564733841876926926749214863536422912, + 680564733841876926926749214863536422913, + ] + actual = self.contract.generate_token_ids(token_type=2, nb_tokens=2) + assert expected_b == actual + tx = self.contract.get_deploy_transaction( + ledger_api=self.ledger_api, deployer_address=ETHEREUM_ADDRESS_ONE + ) + assert len(tx) == 7 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [key in tx for key in ["value", "from", "gas", "gasPrice", "nonce"]] + ), "Error, found: {}".format(tx) + tx = self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address=ETHEREUM_ADDRESS_ONE, + deployer_address=ETHEREUM_ADDRESS_ONE, + token_ids=expected_a, + ) + assert len(tx) == 7 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [ + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] + ] + ), "Error, found: {}".format(tx) + tx = self.contract.get_create_single_transaction( + ledger_api=self.ledger_api, + contract_address=ETHEREUM_ADDRESS_ONE, + deployer_address=ETHEREUM_ADDRESS_ONE, + token_id=expected_b[0], + ) + assert len(tx) == 7 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [ + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] + ] + ), "Error, found: {}".format(tx) + mint_quantities = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + tx = self.contract.get_mint_batch_transaction( + ledger_api=self.ledger_api, + contract_address=ETHEREUM_ADDRESS_ONE, + deployer_address=ETHEREUM_ADDRESS_ONE, + recipient_address=ETHEREUM_ADDRESS_ONE, + token_ids=expected_a, + mint_quantities=mint_quantities, + ) + assert len(tx) == 7 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [ + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] + ] + ), "Error, found: {}".format(tx) + mint_quantity = 1 + tx = self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address=ETHEREUM_ADDRESS_ONE, + deployer_address=ETHEREUM_ADDRESS_ONE, + recipient_address=ETHEREUM_ADDRESS_ONE, + token_id=expected_b[1], + mint_quantity=mint_quantity, + ) + assert len(tx) == 7 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [ + key in tx + for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] + ] + ), "Error, found: {}".format(tx) + + @pytest.mark.integration + def test_get_single_atomic_swap(self): + """Test get single atomic swap.""" + from_address = ETHEREUM_ADDRESS_ONE + to_address = ETHEREUM_ADDRESS_TWO + token_id = self.contract.generate_token_ids(token_type=2, nb_tokens=1)[0] + from_supply = 0 + to_supply = 10 + value = 1 + trade_nonce = 1 + tx_hash = self.contract.get_hash_single( + self.ledger_api, + self.contract_address, + from_address, + to_address, + token_id, + from_supply, + to_supply, + value, + trade_nonce, + ) + assert isinstance(tx_hash, bytes) + signature = self.deployer_crypto.sign_message(tx_hash) + tx = self.contract.get_atomic_swap_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + from_address=from_address, + to_address=to_address, + token_id=token_id, + from_supply=from_supply, + to_supply=to_supply, + value=value, + trade_nonce=trade_nonce, + signature=signature, + ) + assert len(tx) == 8 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [ + key in tx + for key in [ + "value", + "chainId", + "gas", + "gasPrice", + "nonce", + "to", + "from", + ] + ] + ), "Error, found: {}".format(tx) + + @pytest.mark.integration + def test_get_batch_atomic_swap(self): + """Test get batch atomic swap.""" + from_address = ETHEREUM_ADDRESS_ONE + to_address = ETHEREUM_ADDRESS_TWO + token_ids = self.contract.generate_token_ids(token_type=2, nb_tokens=10) + from_supplies = [0, 1, 0, 0, 1, 0, 0, 0, 0, 1] + to_supplies = [0, 0, 0, 0, 0, 1, 0, 0, 0, 0] + value = 1 + trade_nonce = 1 + tx_hash = self.contract.get_hash_batch( + self.ledger_api, + self.contract_address, + from_address, + to_address, + token_ids, + from_supplies, + to_supplies, + value, + trade_nonce, + ) + assert isinstance(tx_hash, bytes) + signature = self.deployer_crypto.sign_message(tx_hash) + tx = self.contract.get_atomic_swap_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + from_address=from_address, + to_address=to_address, + token_ids=token_ids, + from_supplies=from_supplies, + to_supplies=to_supplies, + value=value, + trade_nonce=trade_nonce, + signature=signature, + ) + assert len(tx) == 8 + data = tx.pop("data") + assert len(data) > 0 and data.startswith("0x") + assert all( + [ + key in tx + for key in [ + "value", + "chainId", + "gas", + "gasPrice", + "nonce", + "to", + "from", + ] + ] + ), "Error, found: {}".format(tx) + + @pytest.mark.integration + def test_full(self): + """Setup.""" + # Test tokens IDs + token_ids = self.contract.generate_token_ids(token_type=2, nb_tokens=10) + + # create + tx = self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_ids=token_ids, + ) + tx_signed = self.deployer_crypto.sign_transaction(tx) + tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) + time.sleep(1) + receipt = self.ledger_api.get_transaction_receipt(tx_receipt) + assert self.ledger_api.is_transaction_settled(receipt) + + mint_quantities = [10] * len(token_ids) + # mint + tx = self.contract.get_mint_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.deployer_crypto.address, + token_ids=token_ids, + mint_quantities=mint_quantities, + ) + tx_signed = self.deployer_crypto.sign_transaction(tx) + tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) + time.sleep(1) + receipt = self.ledger_api.get_transaction_receipt(tx_receipt) + assert self.ledger_api.is_transaction_settled(receipt) + + tx = self.contract.get_mint_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.item_owner_crypto.address, + token_ids=token_ids, + mint_quantities=mint_quantities, + ) + tx_signed = self.deployer_crypto.sign_transaction(tx) + tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) + time.sleep(1) + receipt = self.ledger_api.get_transaction_receipt(tx_receipt) + assert self.ledger_api.is_transaction_settled(receipt) + + #  batch trade + from_address = self.deployer_crypto.address + to_address = self.item_owner_crypto.address + from_supplies = [0, 1, 0, 0, 1, 0, 0, 0, 0, 1] + to_supplies = [0, 0, 0, 0, 0, 1, 0, 0, 0, 0] + value = 0 + trade_nonce = 1 + tx_hash = self.contract.get_hash_batch( + self.ledger_api, + self.contract_address, + from_address, + to_address, + token_ids, + from_supplies, + to_supplies, + value, + trade_nonce, + ) + signature = self.item_owner_crypto.sign_message( + tx_hash, is_deprecated_mode=True + ) + tx = self.contract.get_atomic_swap_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + from_address=from_address, + to_address=to_address, + token_ids=token_ids, + from_supplies=from_supplies, + to_supplies=to_supplies, + value=value, + trade_nonce=trade_nonce, + signature=signature, + ) + tx_signed = self.deployer_crypto.sign_transaction(tx) + tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) + time.sleep(1) + receipt = self.ledger_api.get_transaction_receipt(tx_receipt) + assert self.ledger_api.is_transaction_settled(receipt) + + +@pytest.mark.skip("Fetch.ai testnet not currently working.") +class TestCosmWasmContract(BaseContractTestCase): + """Test the cosmwasm contract.""" + + ledger_identifier = FetchAICrypto.identifier + path_to_contract = Path(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155") + fund_from_faucet = True + + @classmethod + def setup(cls): + """Setup.""" + # Test tokens IDs + super().setup(ledger_config=FETCHAI_TESTNET_CONFIG) + cls.token_ids_a = [ + 340282366920938463463374607431768211456, + 340282366920938463463374607431768211457, + 340282366920938463463374607431768211458, + 340282366920938463463374607431768211459, + 340282366920938463463374607431768211460, + 340282366920938463463374607431768211461, + 340282366920938463463374607431768211462, + 340282366920938463463374607431768211463, + 340282366920938463463374607431768211464, + 340282366920938463463374607431768211465, + ] + + cls.token_id_b = 680564733841876926926749214863536422912 + + @classmethod + def finish_contract_deployment(cls) -> str: + """ + Finish deploying contract. + + :return: contract address + """ + code_id = cast(FetchAIApi, cls.ledger_api).get_code_id( + cls.deployment_tx_receipt + ) + + assert code_id is not None + + # Init contract + tx = cls._contract.get_deploy_transaction( + ledger_api=cls.ledger_api, + deployer_address=cls.deployer_crypto.address, + code_id=code_id, + init_msg={}, + tx_fee=0, + amount=0, + label="ERC1155", + gas=1000000, + ) + + if tx is None: + raise ValueError("Deploy transaction not found!") # pragma: nocover + + tx_receipt = cls.sign_send_confirm_receipt_multisig_transaction( + tx, cls.ledger_api, [cls.deployer_crypto] + ) + + contract_address = cls.ledger_api.get_contract_address(tx_receipt) + + if contract_address is None: + raise ValueError("Contract address not found!") # pragma: nocover + + return contract_address + + @pytest.mark.integration + @pytest.mark.ledger + @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) + def test_create_and_mint_and_balances(self): + """Test cosmwasm contract create, mint and balances functionalities.""" + # Create single token + tx = self.contract.get_create_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_id=self.token_id_b, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Create batch of tokens + tx = self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_ids=self.token_ids_a, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Mint single token + tx = self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.item_owner_crypto.address, + token_id=self.token_id_b, + mint_quantity=1, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Get balance of single token + res = self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + token_id=self.token_id_b, + ) + assert "balance" in res + assert res["balance"][self.token_id_b] == 1 + + # Mint batch of tokens + tx = self.contract.get_mint_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.item_owner_crypto.address, + token_ids=self.token_ids_a, + mint_quantities=[1] * len(self.token_ids_a), + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Get balances of multiple tokens + res = self.contract.get_balances( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + token_ids=self.token_ids_a, + ) + assert "balances" in res + assert res["balances"] == {token_id: 1 for token_id in self.token_ids_a} + + @pytest.mark.integration + @pytest.mark.ledger + @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) + def test_cosmwasm_single_atomic_swap(self): + """Test single atomic swap.""" + # Create batch of tokens + tx = self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_ids=self.token_ids_a, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Mint single ERC1155 token a[0] to Deployer + tx = self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.deployer_crypto.address, + token_id=self.token_ids_a[0], + mint_quantity=1, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Store balance of Deployer's native tokens before atomic swap + original_deployer_balance = self.ledger_api.get_balance( + self.deployer_crypto.address + ) + + # Atomic swap + # Send 1 ERC1155 token a[0] from Deployer to Item owner + # Send 1 native token from Item owner to Deployer + tx = self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address=self.contract_address, + from_address=self.deployer_crypto.address, + to_address=self.item_owner_crypto.address, + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=1, + trade_nonce=0, + from_pubkey=self.deployer_crypto.public_key, + to_pubkey=self.item_owner_crypto.public_key, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto, self.item_owner_crypto] + ) + + # Check Item owner's ERC1155 token balance + result = self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + token_id=self.token_ids_a[0], + ) + + assert "balance" in result + assert result["balance"][self.token_ids_a[0]] == 1 + + # Check deployer's native token balance + deployer_balance = self.ledger_api.get_balance(self.deployer_crypto.address) + assert deployer_balance == original_deployer_balance + 1 + + # Other direction of atomic swap + # Send 1 ERC1155 token a[0] from Item owner to Deployer + # Send 1 native token from Item owner to Deployer + tx = self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address=self.contract_address, + from_address=self.deployer_crypto.address, + to_address=self.item_owner_crypto.address, + token_id=self.token_ids_a[0], + from_supply=0, + to_supply=1, + value=1, + trade_nonce=0, + from_pubkey=self.deployer_crypto.public_key, + to_pubkey=self.item_owner_crypto.public_key, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.item_owner_crypto] + ) + + # Check Item owner's ERC1155 token balance + result = self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.deployer_crypto.address, + token_id=self.token_ids_a[0], + ) + + assert "balance" in result + assert result["balance"][self.token_ids_a[0]] == 1 + + # Check deployer's native token balance + deployer_balance = self.ledger_api.get_balance(self.deployer_crypto.address) + assert deployer_balance == original_deployer_balance + 2 + + # Check invalid case with from_supply > 0 and to_supply > 0 + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address=self.contract_address, + from_address=self.deployer_crypto.address, + to_address=self.item_owner_crypto.address, + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=1, + value=1, + trade_nonce=0, + from_pubkey=self.deployer_crypto.public_key, + to_pubkey=self.item_owner_crypto.public_key, + ) + + @pytest.mark.integration + @pytest.mark.ledger + @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) + def test_cosmwasm_batch_atomic_swap(self): + """Test batch atomic swap.""" + + # Create batch of tokens + tx = self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + token_ids=self.token_ids_a, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Mint single token a[0] to Deployer + tx = self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.deployer_crypto.address, + token_id=self.token_ids_a[0], + mint_quantity=1, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Mint single token a[1] to Item owner + tx = self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + deployer_address=self.deployer_crypto.address, + recipient_address=self.item_owner_crypto.address, + token_id=self.token_ids_a[1], + mint_quantity=1, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto] + ) + + # Store balance of Deployer's native tokens before atomic swap + original_deployer_balance = self.ledger_api.get_balance( + self.deployer_crypto.address + ) + + # Atomic swap + # Send 1 ERC1155 token a[0] from Deployer to Item owner + # Send 1 ERC1155 token a[1] from Item owner to Deployer + # Send 1 native token from Item owner to Deployer + + tx = self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address=self.contract_address, + from_address=self.deployer_crypto.address, + to_address=self.item_owner_crypto.address, + token_ids=[self.token_ids_a[0], self.token_ids_a[1]], + from_supplies=[1, 0], + to_supplies=[0, 1], + value=1, + trade_nonce=0, + from_pubkey=self.deployer_crypto.public_key, + to_pubkey=self.item_owner_crypto.public_key, + ) + assert len(tx) == 2 + self.sign_send_confirm_receipt_multisig_transaction( + tx, self.ledger_api, [self.deployer_crypto, self.item_owner_crypto] + ) + + # Check Item owner's ERC1155 token balance + result = self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.item_owner_crypto.address, + token_id=self.token_ids_a[0], + ) + + assert "balance" in result + assert result["balance"][self.token_ids_a[0]] == 1 + + # Check Deployer's ERC1155 token balance + result = self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address=self.contract_address, + agent_address=self.deployer_crypto.address, + token_id=self.token_ids_a[1], + ) + + assert "balance" in result + assert result["balance"][self.token_ids_a[1]] == 1 + + # Check deployer's native token balance + deployer_balance = self.ledger_api.get_balance(self.deployer_crypto.address) + assert deployer_balance == original_deployer_balance + 1 + + +class TestContractCommon: + """Other tests for the contract.""" + + @classmethod + def setup(cls): + """Setup.""" + + # Register smart contract used for testing + cls.path_to_contract = Path( + ROOT_DIR, "packages", "fetchai", "contracts", "erc1155" + ) + + # register contract + configuration = cast( + ContractConfig, + load_component_configuration(ComponentType.CONTRACT, cls.path_to_contract), + ) + configuration._directory = ( # pylint: disable=protected-access + cls.path_to_contract + ) + if str(configuration.public_id) not in contract_registry.specs: + # load contract into sys modules + Contract.from_config(configuration) + cls.contract = contract_registry.make(str(configuration.public_id)) + + cls.token_ids_a = [ + 340282366920938463463374607431768211456, + ] + + # Create mock ledger with unknown identifier + cls.ledger_api = mock.Mock() + attrs = {"identifier": "dummy"} + cls.ledger_api.configure_mock(**attrs) + + @pytest.mark.ledger + def test_get_create_batch_transaction_wrong_identifier(self): + """Test if get_create_batch_transaction with wrong api identifier fails.""" + + # Test if function is not implemented for unknown ledger + with pytest.raises(NotImplementedError): + self.contract.get_create_batch_transaction( + ledger_api=self.ledger_api, + contract_address="contract_address", + deployer_address="address", + token_ids=self.token_ids_a, + ) + + @pytest.mark.ledger + def test_get_create_single_transaction_wrong_identifier(self): + """Test if get_create_single_transaction with wrong api identifier fails.""" + + # Test if function is not implemented for unknown ledger + with pytest.raises(NotImplementedError): + self.contract.get_create_single_transaction( + ledger_api=self.ledger_api, + contract_address="contract_address", + deployer_address="address", + token_id=self.token_ids_a[0], + ) + + @pytest.mark.ledger + def test_get_mint_batch_transaction_wrong_identifier(self): + """Test if get_mint_batch_transaction with wrong api identifier fails.""" + + # Test if function is not implemented for unknown ledger + with pytest.raises(NotImplementedError): + self.contract.get_mint_batch_transaction( + ledger_api=self.ledger_api, + contract_address="contract_address", + deployer_address="address", + recipient_address="address", + token_ids=self.token_ids_a, + mint_quantities=[1], + ) + + @pytest.mark.ledger + def test_get_mint_single_transaction_wrong_identifier(self): + """Test if get_mint_single_transaction with wrong api identifier fails.""" + + # Test if function is not implemented for unknown ledger + with pytest.raises(NotImplementedError): + self.contract.get_mint_single_transaction( + ledger_api=self.ledger_api, + contract_address="contract_address", + deployer_address="address", + recipient_address="address", + token_id=self.token_ids_a[0], + mint_quantity=1, + ) + + @pytest.mark.ledger + def test_get_balance_wrong_identifier(self): + """Test if get_balance with wrong api identifier fails.""" + + # Test if function is not implemented for unknown ledger + with pytest.raises(NotImplementedError): + self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address="contract_address", + agent_address="address", + token_id=self.token_ids_a[0], + ) + + @pytest.mark.ledger + def test_get_balance_wrong_query_res(self): + """Test if get_balance with wrong api identifier fails.""" + + # Create mock fetchai ledger that returns None on execute_contract_query + attrs = {"identifier": "fetchai", "execute_contract_query.return_value": None} + self.ledger_api.configure_mock(**attrs) + + # Test if get balance returns ValueError when querying contract returns None + with pytest.raises(ValueError): + self.contract.get_balance( + ledger_api=self.ledger_api, + contract_address="contract_address", + agent_address="address", + token_id=self.token_ids_a[0], + ) + + @pytest.mark.ledger + def test_get_balances_wrong_query_res(self): + """Test if get_balances with wrong api identifier fails.""" + + # Create mock fetchai ledger that returns None on execute_contract_query + attrs = {"identifier": "fetchai", "execute_contract_query.return_value": None} + self.ledger_api.configure_mock(**attrs) + + # Test if get balance returns ValueError when querying contract returns None + with pytest.raises(ValueError): + self.contract.get_balances( + ledger_api=self.ledger_api, + contract_address="contract_address", + agent_address="address", + token_ids=self.token_ids_a, + ) + + @pytest.mark.ledger + def test_get_hash_batch_not_same(self): + """Test if get_hash_batch returns ValueError when on-chain hash is not same as computed hash.""" + + self.ledger_api.identifier = "ethereum" + + # Test if get hash returns ValueError when on chain hash is not same as computed hash + with mock.patch.object(type(self.contract), "_get_hash_batch", new=mock.Mock()): + with pytest.raises(ValueError): + self.contract.get_hash_batch( + ledger_api=self.ledger_api, + contract_address="contract_address", + from_address="address", + to_address="address", + token_ids=self.token_ids_a, + from_supplies=[1], + to_supplies=[0], + value=123, + trade_nonce=123, + ) + + @pytest.mark.ledger + def test_generate_trade_nonce_if_exist(self): + """Test if generate_trade_nonce retries when nonce already exist.""" + + # Etherem ledger api mock + self.ledger_api.identifier = "ethereum" + + # instance.functions.is_nonce_used(agent_address, trade_nonce).call() -> True, False + is_nonce_used_mock = mock.Mock() + is_nonce_used_mock.configure_mock(**{"call.side_effect": [True, False]}) + + # instance.functions.is_nonce_used(agent_address, trade_nonce) -> is_nonce_used_mock with call method + instance_mock = mock.Mock() + instance_mock.configure_mock( + **{"functions.is_nonce_used.return_value": is_nonce_used_mock} + ) + + # cls.get_instance(ledger_api, contract_address) -> instance_mock + get_instance_mock = mock.Mock() + get_instance_mock.configure_mock(**{"return_value": instance_mock}) + + # Patch get_instance method to return get_instance_mock which returns instance of instance_mock when called + with mock.patch.object( + type(self.contract), "get_instance", new=get_instance_mock + ): + self.contract.generate_trade_nonce( + ledger_api=self.ledger_api, + contract_address="contract_address", + agent_address="address", + ) + + # Check if is_nonce_used was called twice + assert is_nonce_used_mock.call.call_count == 2 + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_eth_no_signature(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError if signature not present on Ethereum case.""" + + self.ledger_api.identifier = "ethereum" + + # Test if get_atomic_swap_single_transaction returns RuntimeError when signature is missing + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=1, + trade_nonce=0, + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_eth_pubkeys(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError if pubkeys are present on Ethereum case.""" + + self.ledger_api.identifier = "ethereum" + + # Test if get_atomic_swap_single_transaction returns RuntimeError when pubkey is present + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=1, + trade_nonce=0, + signature="signature", + from_pubkey="deadbeef", + to_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_signature(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError if signature is present on Cosmos/Fetch case.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction returns RuntimeError when signature is present + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=1, + trade_nonce=0, + signature="signature", + from_pubkey="deadbeef", + to_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_valid(self): + """Test if get_atomic_swap_single_transaction allows one pubkey in case of only one direction of transfers.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction works with only to_pubkey + tx = self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=0, + to_supply=1, + value=1, + trade_nonce=0, + to_pubkey="deadbeef", + ) + assert tx is not None + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_invalid(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError with missing from_pubkey.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with missing from_key + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=1, + trade_nonce=0, + to_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError with missing to_pubkey.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with missing from_key + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=1, + trade_nonce=0, + from_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_eth_pubkeys(self): + """Test if get_atomic_swap_batch_transaction returns RuntimeError if pubkeys are present on Ethereum case.""" + + self.ledger_api.identifier = "ethereum" + + # Test if get_atomic_swap_batch_transaction returns RuntimeError when pubkey is present + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=1, + trade_nonce=0, + signature="signature", + from_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_signature(self): + """Test if get_atomic_swap_batch_transaction returns RuntimeError if signature is present on Cosmos/Fetch case.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_batch_transaction returns RuntimeError when signature is present + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=1, + trade_nonce=0, + signature="signature", + from_pubkey="deadbeef", + to_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_valid(self): + """Test if get_atomic_swap_batch_transaction allows one pubkey in case of only one direction of transfers.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_batch_transaction works with only to_pubkey + tx = self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[0], + to_supplies=[1], + value=1, + trade_nonce=0, + to_pubkey="deadbeef", + ) + assert tx is not None + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_invalid(self): + """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing from_pubkey.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_batch_transaction fails with missing from_key + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=1, + trade_nonce=0, + to_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_ba_transaction_eth_no_signature(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError if signature not present on Ethereum case.""" + + self.ledger_api.identifier = "ethereum" + + # Test if get_atomic_swap_single_transaction returns RuntimeError when signature is missing + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=1, + trade_nonce=0, + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_to_pubkey_missing(self): + """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing to_pubkey.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with all amounts to be zero + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=1, + trade_nonce=0, + from_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_to_pubkey_missing_no_from_pubkey_required( + self, + ): + """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing to_pubkey and from_pubkey not required.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with missing to_pubkey + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[0], + to_supplies=[1], + value=1, + trade_nonce=0, + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_missing_no_to_pubkey_required( + self, + ): + """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing from_pubkey and to_pubkey not required.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with missing from_pubkey + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=0, + trade_nonce=0, + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_only(self): + """Test if get_atomic_swap_batch_transaction returns Tx in case with only from_pubkey.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction works with only from_pubkey + res = self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[1], + to_supplies=[0], + value=0, + trade_nonce=0, + from_pubkey="deadbeef", + ) + assert res is not None + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_amounts_missing(self): + """Test if get_atomic_swap_single_transaction returns RuntimeError with missing amounts.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with all amounts to be zero + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=0, + to_supply=0, + value=0, + trade_nonce=0, + from_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_batch_transaction_amounts_missing(self): + """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing amounts.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with all amounts to be zero + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_batch_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_ids=[self.token_ids_a[0]], + from_supplies=[0], + to_supplies=[0], + value=0, + trade_nonce=0, + from_pubkey="deadbeef", + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing_no_from_pubkey_required( + self, + ): + """Test if get_atomic_swap_single_transaction returns RuntimeError with missing to_pubkey and from_pubkey not required.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with missing to_pubkey + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=0, + to_supply=1, + value=1, + trade_nonce=0, + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_missing_no_to_pubkey_required( + self, + ): + """Test if get_atomic_swap_single_transaction returns RuntimeError with missing from_pubkey and to_pubkey not required.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction fails with missing from_pubkey + with pytest.raises(RuntimeError): + self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=0, + trade_nonce=0, + ) + + @pytest.mark.ledger + def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_only(self): + """Test if get_atomic_swap_single_transaction returns Tx in case with only from_pubkey.""" + + self.ledger_api.identifier = "fetchai" + + # Test if get_atomic_swap_single_transaction works with only from_pubkey + res = self.contract.get_atomic_swap_single_transaction( + self.ledger_api, + contract_address="address", + from_address="address", + to_address="address", + token_id=self.token_ids_a[0], + from_supply=1, + to_supply=0, + value=0, + trade_nonce=0, + from_pubkey="deadbeef", + ) + assert res is not None diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 485742176e..d9c8df211e 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -17,7 +17,7 @@ fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe contracts: -- fetchai/erc1155:0.22.0:bafybeidt3wg6cmdd6xjw6appgnb2umx2ixdwwaubdvkle2bcd6gxcx2wue +- fetchai/erc1155:0.22.0:bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 protocols: - fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 2f077da582..bdd0ee9d4b 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -17,7 +17,7 @@ fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe contracts: -- fetchai/erc1155:0.22.0:bafybeidt3wg6cmdd6xjw6appgnb2umx2ixdwwaubdvkle2bcd6gxcx2wue +- fetchai/erc1155:0.22.0:bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 protocols: - fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index 20783b631e..21d81f1213 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -7,7 +7,7 @@ fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3k fetchai/connections/ledger,bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe fetchai/connections/local,bafybeidu5cgji37wuczrecdfni6h6zarzqno2liycr4niozxqpxsrmnny4 fetchai/connections/stub,bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu -fetchai/contracts/erc1155,bafybeidt3wg6cmdd6xjw6appgnb2umx2ixdwwaubdvkle2bcd6gxcx2wue +fetchai/contracts/erc1155,bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 fetchai/protocols/contract_api,bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose @@ -18,8 +18,8 @@ fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollob fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm fetchai/skills/echo,bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y -fetchai/skills/erc1155_client,bafybeicfcia5hrbdmulameuxzxpvg3tpubieq7ntj44a3e6atnqmxqkvtm -fetchai/skills/erc1155_deploy,bafybeiejhy5sydqw3ehl27r2ftbres4p2bs7pr5x4fha5tigqfxgtdqymu +fetchai/skills/erc1155_client,bafybeicrmo562aihmvt2homynyksgzcvrymnvtnd6zqehajhqyn3rx4oty +fetchai/skills/erc1155_deploy,bafybeifbg2cfmt3hahpx3ycfdctdp6bkkf5ptuxukauy7iurqrpq4bxtma fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a From 17c81905d53a5bed017cd652ba55dc3e54a182ee Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 21 Aug 2022 16:05:45 +0200 Subject: [PATCH 12/93] test: move test_skills/test_echo into its package --- .../agents/my_first_aea/aea-config.yaml | 2 +- packages/fetchai/skills/echo/skill.yaml | 4 + .../fetchai/skills/echo/tests/__init__.py | 21 ++ .../skills/echo/tests/test_behaviours.py | 84 ++++++++ .../skills/echo/tests/test_dialogues.py | 54 +++++ .../skills/echo/tests/test_handlers.py | 196 ++++++++++++++++++ packages/hashes.csv | 6 +- .../agents/my_first_aea/aea-config.yaml | 2 +- 8 files changed, 364 insertions(+), 5 deletions(-) create mode 100644 packages/fetchai/skills/echo/tests/__init__.py create mode 100644 packages/fetchai/skills/echo/tests/test_behaviours.py create mode 100644 packages/fetchai/skills/echo/tests/test_dialogues.py create mode 100644 packages/fetchai/skills/echo/tests/test_handlers.py diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index fed910e069..ebfd89069c 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y +- fetchai/echo:0.19.0:bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 685145ac35..24faeaea58 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -11,6 +11,10 @@ fingerprint: behaviours.py: bafybeigwlodaanmbtfszhvsnqwozur4dynt2q3qw6dhoyajjsnjklb2hmi dialogues.py: bafybeici4rlde6qdpjtftn4xgelrrphpwzzymvhjrgua7frx7qvyw32gue handlers.py: bafybeihjjglefhpwbprqu6anjpmhj3nn7p53nsci3kmueab7hnhchfcmsi + tests/__init__.py: bafybeidedsb72is3z5jndaoh232r7y5qvqb3acotjm6xi4pea3bmkoq6le + tests/test_behaviours.py: bafybeihe72d7uw5kqes2rxxhsipctumojmdyozlsb55m3jgb3s2ao3yiwa + tests/test_dialogues.py: bafybeie2xzn4bielsz365yme74j2zydo5wuqkwjgcbuv3yig3uhoa3y7uu + tests/test_handlers.py: bafybeiaw5z3ppktc74rphsd7ppiswnr4jsmph7w7w2tx56mbdxuhpcpwm4 fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/packages/fetchai/skills/echo/tests/__init__.py b/packages/fetchai/skills/echo/tests/__init__.py new file mode 100644 index 0000000000..782cb6502b --- /dev/null +++ b/packages/fetchai/skills/echo/tests/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""The tests module contains the tests of the packages/skills/echo dir.""" diff --git a/packages/fetchai/skills/echo/tests/test_behaviours.py b/packages/fetchai/skills/echo/tests/test_behaviours.py new file mode 100644 index 0000000000..7dbee7f3c8 --- /dev/null +++ b/packages/fetchai/skills/echo/tests/test_behaviours.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the behaviour class of the echo skill.""" + +import logging +from pathlib import Path +from typing import cast +from unittest.mock import patch + +from aea.test_tools.test_skill import BaseSkillTestCase + +from packages.fetchai.skills.echo.behaviours import EchoBehaviour + +from tests.conftest import ROOT_DIR + + +class TestEchoBehaviour(BaseSkillTestCase): + """Test EchoBehaviour behaviour of echo.""" + + path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") + is_agent_to_agent_messages = False + + @classmethod + def setup(cls): + """Setup the test class.""" + super().setup() + cls.echo_behaviour = cast( + EchoBehaviour, cls._skill.skill_context.behaviours.echo + ) + cls.logger = cls._skill.skill_context.logger + + def test_setup(self): + """Test the setup method of the echo behaviour.""" + # operation + with patch.object(self.logger, "log") as mock_logger: + assert self.echo_behaviour.setup() is None + + # after + self.assert_quantity_in_outbox(0) + + mock_logger.assert_any_call( + logging.INFO, "Echo Behaviour: setup method called." + ) + + def test_act(self): + """Test the act method of the echo behaviour.""" + # operation + with patch.object(self.logger, "log") as mock_logger: + assert self.echo_behaviour.act() is None + + # after + self.assert_quantity_in_outbox(0) + + mock_logger.assert_any_call(logging.INFO, "Echo Behaviour: act method called.") + + def test_teardown(self): + """Test the teardown method of the echo behaviour.""" + # operation + with patch.object(self.logger, "log") as mock_logger: + assert self.echo_behaviour.teardown() is None + + # after + self.assert_quantity_in_outbox(0) + + mock_logger.assert_any_call( + logging.INFO, "Echo Behaviour: teardown method called." + ) diff --git a/packages/fetchai/skills/echo/tests/test_dialogues.py b/packages/fetchai/skills/echo/tests/test_dialogues.py new file mode 100644 index 0000000000..9cad9c27cb --- /dev/null +++ b/packages/fetchai/skills/echo/tests/test_dialogues.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the dialogue classes of the echo skill.""" + +from pathlib import Path +from typing import cast + +from aea.test_tools.test_skill import BaseSkillTestCase, COUNTERPARTY_AGENT_ADDRESS + +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.skills.echo.dialogues import DefaultDialogue, DefaultDialogues + +from tests.conftest import ROOT_DIR + + +class TestDialogues(BaseSkillTestCase): + """Test dialogue class of echo.""" + + path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") + + @classmethod + def setup(cls): + """Setup the test class.""" + super().setup() + cls.default_dialogues = cast( + DefaultDialogues, cls._skill.skill_context.default_dialogues + ) + + def test_default_dialogues(self): + """Test the DefaultDialogues class.""" + _, dialogue = self.default_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=DefaultMessage.Performative.BYTES, + content=b"some_content", + ) + assert dialogue.role == DefaultDialogue.Role.AGENT + assert dialogue.self_address == self.skill.skill_context.agent_name diff --git a/packages/fetchai/skills/echo/tests/test_handlers.py b/packages/fetchai/skills/echo/tests/test_handlers.py new file mode 100644 index 0000000000..bd95293206 --- /dev/null +++ b/packages/fetchai/skills/echo/tests/test_handlers.py @@ -0,0 +1,196 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the handler class of the echo skill.""" + +import logging +from pathlib import Path +from typing import cast +from unittest.mock import patch + +from aea.protocols.dialogue.base import DialogueMessage +from aea.test_tools.test_skill import BaseSkillTestCase + +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.skills.echo.dialogues import DefaultDialogues +from packages.fetchai.skills.echo.handlers import EchoHandler + +from tests.conftest import ROOT_DIR + + +class TestEchoHandler(BaseSkillTestCase): + """Test EchoHandler of echo.""" + + path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") + + @classmethod + def setup(cls): + """Setup the test class.""" + super().setup() + cls.echo_handler = cast(EchoHandler, cls._skill.skill_context.handlers.echo) + cls.logger = cls._skill.skill_context.logger + + cls.default_dialogues = cast( + DefaultDialogues, cls._skill.skill_context.default_dialogues + ) + + cls.content = b"some_content" + cls.list_of_messages = ( + DialogueMessage( + DefaultMessage.Performative.BYTES, {"content": cls.content} + ), + ) + + def test_setup(self): + """Test the setup method of the echo handler.""" + with patch.object(self.logger, "log") as mock_logger: + assert self.echo_handler.setup() is None + + # after + self.assert_quantity_in_outbox(0) + + mock_logger.assert_any_call(logging.INFO, "Echo Handler: setup method called.") + + def test_handle_unidentified_dialogue(self): + """Test the _handle_unidentified_dialogue method of the oef_search handler.""" + # setup + incorrect_dialogue_reference = ("", "") + incoming_message = self.build_incoming_message( + message_type=DefaultMessage, + dialogue_reference=incorrect_dialogue_reference, + performative=DefaultMessage.Performative.BYTES, + content=self.content, + to=self.skill.skill_context.agent_name, + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.echo_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid default message={incoming_message}, unidentified dialogue.", + ) + + def test_handle_error(self): + """Test the _handle_error method of the oef_search handler.""" + # setup + default_dialogue = self.prepare_skill_dialogue( + dialogues=self.default_dialogues, + messages=self.list_of_messages[:1], + ) + incoming_message = self.build_incoming_message_for_skill_dialogue( + dialogue=default_dialogue, + performative=DefaultMessage.Performative.ERROR, + error_code=DefaultMessage.ErrorCode.INVALID_DIALOGUE, + error_msg="Invalid dialogue.", + error_data={"default_message": b"some_bytes"}, + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.echo_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received default error message={incoming_message} in dialogue={default_dialogue}.", + ) + + def test_handle_bytes(self): + """Test the _handle_error method of the oef_search handler.""" + # setup + default_dialogue = self.prepare_skill_dialogue( + dialogues=self.default_dialogues, + messages=self.list_of_messages[:1], + ) + incoming_message = cast( + DefaultMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=default_dialogue, + performative=DefaultMessage.Performative.BYTES, + content=self.content, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.echo_handler.handle(incoming_message) + + # after + self.assert_quantity_in_outbox(1) + + mock_logger.assert_any_call( + logging.INFO, + f"Echo Handler: message={incoming_message}, sender={incoming_message.sender}", + ) + + message = self.get_message_from_outbox() + has_attributes, error_str = self.message_has_attributes( + actual_message=message, + message_type=DefaultMessage, + performative=DefaultMessage.Performative.BYTES, + to=incoming_message.sender, + sender=self.skill.skill_context.agent_name, + target=incoming_message.message_id, + content=incoming_message.content, + ) + assert has_attributes, error_str + + def test_handle_invalid(self): + """Test the _handle_invalid method of the echo handler.""" + # setup + default_dialogue = self.prepare_skill_dialogue( + dialogues=self.default_dialogues, + messages=self.list_of_messages[:1], + ) + incoming_message = cast( + DefaultMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=default_dialogue, + performative=DefaultMessage.Performative.END, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.echo_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid message={incoming_message} in dialogue={self.default_dialogues.get_dialogue(incoming_message)}.", + ) + + def test_retrieve_protocol_dialogues_from_handler(self): + """Test retrieve protocol dialogues from handler""" + assert self.echo_handler.protocol_dialogues() is self.default_dialogues + + def test_teardown(self): + """Test the teardown method of the echo handler.""" + with patch.object(self.logger, "log") as mock_logger: + assert self.echo_handler.teardown() is None + + # after + self.assert_quantity_in_outbox(0) + + mock_logger.assert_any_call( + logging.INFO, "Echo Handler: teardown method called." + ) diff --git a/packages/hashes.csv b/packages/hashes.csv index 21d81f1213..50762c5031 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,6 +1,6 @@ fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe fetchai/agents/gym_aea,bafybeiabzmgtujkjbhzeejrxkir2wcuyzbj3ar6mz6avk5j7w7go37epp4 -fetchai/agents/my_first_aea,bafybeihakkloflpblkxcbsp6wrwd36hpr2xtwbub3dklig5qtbdw6lvjlu +fetchai/agents/my_first_aea,bafybeibvkkunphzs77yf4e2vmcjskcfprjsdsnhzrxtkchmshurpph5dxu fetchai/connections/gym,bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey @@ -17,7 +17,7 @@ fetchai/protocols/ledger_api,bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiese fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm -fetchai/skills/echo,bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y +fetchai/skills/echo,bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu fetchai/skills/erc1155_client,bafybeicrmo562aihmvt2homynyksgzcvrymnvtnd6zqehajhqyn3rx4oty fetchai/skills/erc1155_deploy,bafybeifbg2cfmt3hahpx3ycfdctdp6bkkf5ptuxukauy7iurqrpq4bxtma fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6 fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeib4eybwgfgezzskodw4rm5qkmfty7j4twv7kxmr3wi6gmsge4ba6a open_aea/agents/http_echo,bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 -open_aea/agents/my_first_aea,bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny +open_aea/agents/my_first_aea,bafybeidr6hcyc6wnsvxnru5nj25gys3di3ntotacgu6g4k5n2fsrqh2u2y open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 3495f3695d..bcac0f0d3d 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y +- fetchai/echo:0.19.0:bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From 1f35a179d6195029c3c697e3c44f359878724300 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 13:59:08 +0200 Subject: [PATCH 13/93] fix: make test_aea_project work well with @check_aea_project --- aea/cli/test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index b9601b2d97..3bc976a83c 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -52,7 +52,7 @@ def test(click_context: click.Context, args: Sequence[str]) -> None: """Run tests of an AEA project.""" ctx = cast(Context, click_context.obj) if click_context.invoked_subcommand is None: - test_aea_project(Path(ctx.cwd), args) + test_aea_project(click_context, Path(ctx.cwd), args) @test.command() @@ -167,7 +167,9 @@ def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> @check_aea_project -def test_aea_project(aea_project_dirpath: Path, args: Sequence[str]) -> None: +def test_aea_project( + _click_context: click.Context, aea_project_dirpath: Path, args: Sequence[str] +) -> None: """Run tests of an AEA project.""" click.echo("Executing tests of the AEA project...") test_package_by_path(aea_project_dirpath, args) From d6679f839147e2540508e37f223b4f98f6860b08 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 15:22:52 +0200 Subject: [PATCH 14/93] feat: in 'aea test ', import neeed packages recursively --- aea/cli/test.py | 10 +++++++++- aea/components/base.py | 33 +++++++++++++++++++++++++++++++++ tests/test_cli/test_test.py | 37 +++++++++++++++++++++++++++++-------- 3 files changed, 71 insertions(+), 9 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 3bc976a83c..02d05adf31 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -33,6 +33,7 @@ from aea.cli.utils.context import Context from aea.cli.utils.decorators import check_aea_project, pass_ctx, pytest_args from aea.cli.utils.package_utils import get_package_path +from aea.components.base import load_aea_packages_recursively from aea.configurations.constants import ( AEA_TEST_DIRNAME, CONNECTION, @@ -40,7 +41,8 @@ PROTOCOL, SKILL, ) -from aea.configurations.data_types import PublicId +from aea.configurations.data_types import ComponentType, PublicId +from aea.configurations.loader import load_component_configuration from aea.exceptions import enforce from aea.helpers.base import cd @@ -142,6 +144,12 @@ def test_item( exception_text=f"package {item_public_id} of type {item_type} not found", exception_class=click.ClickException, ) + + configuration = load_component_configuration( + ComponentType(item_type), package_dirpath + ) + configuration.directory = package_dirpath + load_aea_packages_recursively(Path(ctx.cwd), configuration) test_package_by_path(package_dirpath, pytest_arguments) diff --git a/aea/components/base.py b/aea/components/base.py index db51307a03..a9f63c66a3 100644 --- a/aea/components/base.py +++ b/aea/components/base.py @@ -38,6 +38,8 @@ ) from aea.configurations.constants import PACKAGES from aea.configurations.data_types import PackageIdPrefix, PackageType +from aea.configurations.loader import load_component_configuration +from aea.configurations.manager import find_component_directory_from_component_id from aea.exceptions import AEAEnforceError, AEAPackageLoadingError, enforce from aea.helpers.logging import WithLogger @@ -366,3 +368,34 @@ def perform_load_aea_package( sys.modules[import_path] = module _default_logger.debug(f"loading {import_path}: {module}") spec.loader.exec_module(module) # type: ignore + + +def load_aea_packages_recursively( + aea_project_path: Path, + config: ComponentConfiguration, + already_loaded: Optional[Set[ComponentId]] = None, +) -> None: + """ + Load all AEA packages recursively. + + It works like 'load_aea_package', but recursively imports all dependencies. + + :param aea_project_path: the path to the AEA project + :param config: the component configuration + :param already_loaded: the already loaded component ids + """ + already_loaded = already_loaded if already_loaded else set() + for dependency_id in config.package_dependencies: + # TODO: load packages in topological order? Should not matter as at the moment we are not + # actually running the modules, just populating sys.modules + dependency_path = find_component_directory_from_component_id( + aea_project_path, dependency_id + ) + dependency_configuration = load_component_configuration( + dependency_id.component_type, dependency_path + ) + load_aea_packages_recursively( + aea_project_path, dependency_configuration, already_loaded + ) + load_aea_package(config) + already_loaded.add(config.component_id) diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py index 9063f301db..ff1ae55c14 100644 --- a/tests/test_cli/test_test.py +++ b/tests/test_cli/test_test.py @@ -20,6 +20,8 @@ """This test module contains the tests for CLI test command.""" import shutil import subprocess # nosec +import sys +from copy import copy from pathlib import Path from textwrap import dedent from typing import Any, Sequence, Type @@ -82,6 +84,14 @@ def fun(args) -> int: return mock.patch("aea.cli.test.pytest.main", side_effect=fun) +@pytest.fixture(scope="function") +def mock_sys_modules() -> None: + """Store previous content of sys.modules and restore it after test execution.""" + old_sys_modules = copy(sys.modules) + yield + sys.modules = old_sys_modules + + class BaseAEATestCommand(AEATestCaseEmpty): """Base class for tests related to the command `aea test`.""" @@ -215,7 +225,7 @@ def _vendorize(self, package_type: ComponentType, public_id: PublicId) -> None: class TestAgentTestEmptySuite(BaseAEATestCommand): """Test that the command 'aea test' works as expected (with an empty test suite).""" - def test_run(self): + def test_run(self, mock_sys_modules): """Assert that the exit code is equal to 5 (i.e. pytest succeeds without collecting tests).""" (self.get_aea_dirpath() / AEA_TEST_DIRNAME).mkdir(exist_ok=False) result = self.run_test_command() @@ -225,7 +235,7 @@ def test_run(self): class TestAgentTestSingleTest(BaseAEATestCommand): """Test that the command 'aea test' works as expected (with a non-empty test suite).""" - def test_run(self) -> None: + def test_run(self, mock_sys_modules) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" # write dummy test module in test/ folder self.get_test_aea_dirpath().mkdir(exist_ok=False) @@ -240,7 +250,7 @@ class TestPackageTestByTypeEmptyTestSuite(BaseAEATestCommand): """Test that the command 'aea test item_type public_id' works as expected (with an empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType) -> None: + def test_run(self, package_type: ComponentType, mock_sys_modules) -> None: """Assert that the exit code is equal to 5 (empty test suite).""" self._scaffold_item(package_type) public_id = self._public_id(package_type) @@ -253,7 +263,9 @@ class TestPackageTestByType(BaseAEATestCommand): """Test that the command 'aea test item_type public_id' works as expected (with a non-empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: + def test_run( + self, package_type: ComponentType, mock_sys_modules, *_mocks: Any + ) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._configure_package_for_testing(package_type) public_id = self._public_id(package_type) @@ -267,7 +279,7 @@ class TestVendorPackageTestByTypeEmptyTestSuite(BaseAEATestCommand): """Test that the command 'aea test item_type public_id' for vendor packages works as expected (with an empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType) -> None: + def test_run(self, package_type: ComponentType, mock_sys_modules) -> None: """Assert that the exit code is equal to 5 (empty test suite).""" self._scaffold_item(package_type) public_id = self._public_id(package_type) @@ -281,7 +293,9 @@ class TestVendorPackageTestByType(BaseAEATestCommand): """Test that the command 'aea test item_type public_id' for vendor packages works as expected (with a non-empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: + def test_run( + self, package_type: ComponentType, mock_sys_modules, *_mocks: Any + ) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._configure_package_for_testing(package_type) public_id = self._public_id(package_type) @@ -289,6 +303,11 @@ def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: with mock_pytest_main(): result = self.run_test_command(str(package_type.value), str(public_id)) assert result.exit_code == OK_PYTEST_EXIT_CODE + # assert the module packages have been loaded + assert ( + f"packages.default_author.{package_type.to_plural()}.dummy_{package_type.value}" + in sys.modules + ) @_parametrize_class @@ -296,7 +315,7 @@ class TestPackageTestByPathEmptyTestSuite(BaseAEATestCommand): """Test that the command 'aea test by-path path-to-package' works as expected (empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType) -> None: + def test_run(self, package_type: ComponentType, mock_sys_modules) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._scaffold_item(package_type) test_package_name = self._get_dummy_package_name(package_type) @@ -311,7 +330,9 @@ class TestPackageTestByPath(BaseAEATestCommand): """Test that the command 'aea test by-path path-to-package' works as expected (non-empty test suite).""" @pytest.mark.parametrize("package_type", list(ComponentType)) - def test_run(self, package_type: ComponentType, *_mocks: Any) -> None: + def test_run( + self, package_type: ComponentType, mock_sys_modules, *_mocks: Any + ) -> None: """Assert that the exit code is equal to 0 (tests are run successfully).""" self._configure_package_for_testing(package_type) test_package_name = self._get_dummy_package_name(package_type) From 5d18127fdb5563cb6796cef5ada56503b19423e4 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 16:10:11 +0200 Subject: [PATCH 15/93] feat: add --registry-path option to aea test by-path needed to determine where to load the dependee packages from. --- aea/cli/test.py | 40 +++++++++++++++++++++++++------------ tests/test_cli/test_test.py | 14 +++++++++++-- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 02d05adf31..a123e77cf4 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -41,7 +41,7 @@ PROTOCOL, SKILL, ) -from aea.configurations.data_types import ComponentType, PublicId +from aea.configurations.data_types import ComponentType, PackageType, PublicId from aea.configurations.loader import load_component_configuration from aea.exceptions import enforce from aea.helpers.base import cd @@ -99,17 +99,24 @@ def skill(ctx: Context, skill_public_id: PublicId, args: Sequence[str]) -> None: @click.argument( "path", type=click.Path(exists=True, file_okay=False, dir_okay=True), required=True ) +@click.option( + "--registry-path", + type=click.Path(exists=True, file_okay=False, dir_okay=True), + required=True, +) @pytest_args @pass_ctx def by_path( ctx: Context, path: str, + registry_path: str, args: Sequence[str], ) -> None: """Executes a test suite of a package specified by a path.""" click.echo(f"Executing tests of package at {path}'...") full_path = Path(ctx.cwd) / Path(path) - test_package_by_path(full_path, args) + registry_path = Path(registry_path) + test_package_by_path(full_path, registry_path, args) def test_item( @@ -144,24 +151,22 @@ def test_item( exception_text=f"package {item_public_id} of type {item_type} not found", exception_class=click.ClickException, ) - - configuration = load_component_configuration( - ComponentType(item_type), package_dirpath - ) - configuration.directory = package_dirpath - load_aea_packages_recursively(Path(ctx.cwd), configuration) - test_package_by_path(package_dirpath, pytest_arguments) + # for a package in an AEA project, the "packages" dir is the AEA project dir + test_package_by_path(package_dirpath, Path(ctx.cwd), pytest_arguments) -def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> None: +def test_package_by_path( + package_dir: Path, packages_dir: Path, pytest_arguments: Sequence[str] +) -> None: """ Fingerprint package placed in package_dir. :param package_dir: directory of the package + :param packages_dir: directory of the packages to import from :param pytest_arguments: arguments to forward to Pytest """ # check the path points to a valid AEA package - determine_package_type_for_directory(package_dir) + package_type = determine_package_type_for_directory(package_dir) test_package_dir = package_dir / AEA_TEST_DIRNAME enforce( @@ -169,6 +174,13 @@ def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> f"tests directory in {package_dir} not found", click.ClickException, ) + + if package_type != PackageType.AGENT: + component_type = ComponentType(package_type.value) + configuration = load_component_configuration(component_type, package_dir) + configuration.directory = package_dir + load_aea_packages_recursively(packages_dir, configuration) + with cd(package_dir): exit_code = pytest.main([AEA_TEST_DIRNAME] + list(pytest_arguments)) sys.exit(exit_code) @@ -176,8 +188,10 @@ def test_package_by_path(package_dir: Path, pytest_arguments: Sequence[str]) -> @check_aea_project def test_aea_project( - _click_context: click.Context, aea_project_dirpath: Path, args: Sequence[str] + click_context: click.Context, aea_project_dirpath: Path, args: Sequence[str] ) -> None: """Run tests of an AEA project.""" click.echo("Executing tests of the AEA project...") - test_package_by_path(aea_project_dirpath, args) + ctx = cast(Context, click_context.obj) + # in case of an AEA project, the 'packages' directory is the AEA project path itself + test_package_by_path(aea_project_dirpath, Path(ctx.cwd), args) diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py index ff1ae55c14..fe95874217 100644 --- a/tests/test_cli/test_test.py +++ b/tests/test_cli/test_test.py @@ -321,7 +321,12 @@ def test_run(self, package_type: ComponentType, mock_sys_modules) -> None: test_package_name = self._get_dummy_package_name(package_type) package_dirpath = self.dummy_package_dirpath(package_type, test_package_name) with mock_pytest_main(): - result = self.run_test_command("by-path", str(package_dirpath)) + result = self.run_test_command( + "by-path", + str(package_dirpath), + "--registry-path", + str(self.t / self.packages_dir_path), + ) assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE @@ -338,5 +343,10 @@ def test_run( test_package_name = self._get_dummy_package_name(package_type) package_dirpath = self.dummy_package_dirpath(package_type, test_package_name) with mock_pytest_main(): - result = self.run_test_command("by-path", str(package_dirpath)) + result = self.run_test_command( + "by-path", + str(package_dirpath), + "--registry-path", + str(self.t / self.packages_dir_path), + ) assert result.exit_code == OK_PYTEST_EXIT_CODE From 64cb7392b91eec5091339d18ef94497a0477145a Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 17:12:10 +0200 Subject: [PATCH 16/93] feat: make 'aea test by-path' work also for non-aea-project packages --- aea/cli/test.py | 91 +++++++++++++++++++++++++++++++++++++----- aea/components/base.py | 33 --------------- 2 files changed, 82 insertions(+), 42 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index a123e77cf4..eb0a18ddd1 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -21,7 +21,7 @@ """Implementation of the 'aea test' command.""" import sys from pathlib import Path -from typing import Sequence, cast +from typing import Callable, Optional, Sequence, Set, cast import click import pytest @@ -33,7 +33,8 @@ from aea.cli.utils.context import Context from aea.cli.utils.decorators import check_aea_project, pass_ctx, pytest_args from aea.cli.utils.package_utils import get_package_path -from aea.components.base import load_aea_packages_recursively +from aea.components.base import load_aea_package +from aea.configurations.base import ComponentConfiguration from aea.configurations.constants import ( AEA_TEST_DIRNAME, CONNECTION, @@ -41,8 +42,14 @@ PROTOCOL, SKILL, ) -from aea.configurations.data_types import ComponentType, PackageType, PublicId +from aea.configurations.data_types import ( + ComponentId, + ComponentType, + PackageType, + PublicId, +) from aea.configurations.loader import load_component_configuration +from aea.configurations.manager import find_component_directory_from_component_id from aea.exceptions import enforce from aea.helpers.base import cd @@ -116,7 +123,7 @@ def by_path( click.echo(f"Executing tests of package at {path}'...") full_path = Path(ctx.cwd) / Path(path) registry_path = Path(registry_path) - test_package_by_path(full_path, registry_path, args) + test_package_by_path(full_path, args, packages_dir=registry_path) def test_item( @@ -152,19 +159,37 @@ def test_item( exception_class=click.ClickException, ) # for a package in an AEA project, the "packages" dir is the AEA project dir - test_package_by_path(package_dirpath, Path(ctx.cwd), pytest_arguments) + aea_project_path = Path(ctx.cwd) + test_package_by_path( + package_dirpath, pytest_arguments, aea_project_path=aea_project_path + ) def test_package_by_path( - package_dir: Path, packages_dir: Path, pytest_arguments: Sequence[str] + package_dir: Path, + pytest_arguments: Sequence[str], + aea_project_path: Optional[Path] = None, + packages_dir: Optional[Path] = None, ) -> None: """ Fingerprint package placed in package_dir. :param package_dir: directory of the package - :param packages_dir: directory of the packages to import from :param pytest_arguments: arguments to forward to Pytest + :param aea_project_path: directory to the AEA project + :param packages_dir: directory of the packages to import from """ + enforce( + (aea_project_path is None) != (packages_dir is None), + "one of either aea_project_path or packages_dir must be specified", + ) + root_packages = aea_project_path if aea_project_path else packages_dir + package_path_finder = ( + find_component_directory_from_component_id + if aea_project_path + else find_component_directory_from_component_id_in_registry + ) + # check the path points to a valid AEA package package_type = determine_package_type_for_directory(package_dir) @@ -179,7 +204,7 @@ def test_package_by_path( component_type = ComponentType(package_type.value) configuration = load_component_configuration(component_type, package_dir) configuration.directory = package_dir - load_aea_packages_recursively(packages_dir, configuration) + load_aea_packages_recursively(configuration, package_path_finder, root_packages) with cd(package_dir): exit_code = pytest.main([AEA_TEST_DIRNAME] + list(pytest_arguments)) @@ -194,4 +219,52 @@ def test_aea_project( click.echo("Executing tests of the AEA project...") ctx = cast(Context, click_context.obj) # in case of an AEA project, the 'packages' directory is the AEA project path itself - test_package_by_path(aea_project_dirpath, Path(ctx.cwd), args) + test_package_by_path(aea_project_dirpath, args, aea_project_path=Path(ctx.cwd)) + + +def load_aea_packages_recursively( + config: ComponentConfiguration, + package_path_finder: Callable[[Path, ComponentId], Path], + root_packages: Path, + already_loaded: Optional[Set[ComponentId]] = None, +) -> None: + """ + Load all AEA packages recursively. + + It works like 'load_aea_package', but recursively imports all dependencies. + + :param config: the component configuration + :param package_path_finder: a function that find packages from the packages dir + :param root_packages: the path to the root of packages dir + :param already_loaded: the already loaded component ids + """ + already_loaded = already_loaded if already_loaded else set() + for dependency_id in config.package_dependencies: + # TODO: load packages in topological order? Should not matter as at the moment we are not + # actually running the modules, just populating sys.modules + dependency_path = package_path_finder(root_packages, dependency_id) + dependency_configuration = load_component_configuration( + dependency_id.component_type, dependency_path + ) + dependency_configuration.directory = dependency_path + load_aea_packages_recursively( + dependency_configuration, package_path_finder, root_packages, already_loaded + ) + load_aea_package(config) + already_loaded.add(config.component_id) + + +def find_component_directory_from_component_id_in_registry( + registry_path: Path, component_id: ComponentId +) -> Path: + """Find a component directory from component id in a registry.""" + package_path = ( + registry_path + / component_id.author + / component_id.component_type.to_plural() + / component_id.public_id.name + ) + if package_path.exists() and package_path.is_dir(): + return package_path + + raise ValueError("Package {} not found.".format(component_id)) diff --git a/aea/components/base.py b/aea/components/base.py index a9f63c66a3..db51307a03 100644 --- a/aea/components/base.py +++ b/aea/components/base.py @@ -38,8 +38,6 @@ ) from aea.configurations.constants import PACKAGES from aea.configurations.data_types import PackageIdPrefix, PackageType -from aea.configurations.loader import load_component_configuration -from aea.configurations.manager import find_component_directory_from_component_id from aea.exceptions import AEAEnforceError, AEAPackageLoadingError, enforce from aea.helpers.logging import WithLogger @@ -368,34 +366,3 @@ def perform_load_aea_package( sys.modules[import_path] = module _default_logger.debug(f"loading {import_path}: {module}") spec.loader.exec_module(module) # type: ignore - - -def load_aea_packages_recursively( - aea_project_path: Path, - config: ComponentConfiguration, - already_loaded: Optional[Set[ComponentId]] = None, -) -> None: - """ - Load all AEA packages recursively. - - It works like 'load_aea_package', but recursively imports all dependencies. - - :param aea_project_path: the path to the AEA project - :param config: the component configuration - :param already_loaded: the already loaded component ids - """ - already_loaded = already_loaded if already_loaded else set() - for dependency_id in config.package_dependencies: - # TODO: load packages in topological order? Should not matter as at the moment we are not - # actually running the modules, just populating sys.modules - dependency_path = find_component_directory_from_component_id( - aea_project_path, dependency_id - ) - dependency_configuration = load_component_configuration( - dependency_id.component_type, dependency_path - ) - load_aea_packages_recursively( - aea_project_path, dependency_configuration, already_loaded - ) - load_aea_package(config) - already_loaded.add(config.component_id) From 073c3814db4ad286e9fb715e36db61a875a4a9b9 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 17:25:10 +0200 Subject: [PATCH 17/93] fix: bandit command in tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 2e8987a0f5..a6ee9d12b7 100644 --- a/tox.ini +++ b/tox.ini @@ -93,12 +93,12 @@ skipsdist = True skip_install = True deps = bandit==1.7.0 -commands = bandit -r aea benchmark examples packages --exclude packages/*/*/*/tests \ - bandit -s B101 -r packages/*/*/*/tests \ +commands = bandit -r aea benchmark examples \ plugins/aea-ledger-fetchai/aea_ledger_fetchai \ plugins/aea-ledger-ethereum/aea_ledger_ethereum \ plugins/aea-ledger-cosmos/aea_ledger_cosmos \ plugins/aea-cli-ipfs/aea_cli_ipfs + bandit -s B101 -r packages bandit -s B101 -r tests scripts [testenv:black] From a5c3512d143f5bb8fc9800ac7816dfd39f11e5b8 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 17:29:47 +0200 Subject: [PATCH 18/93] fix: gym connection tests --- packages/fetchai/agents/gym_aea/aea-config.yaml | 4 ++-- packages/fetchai/connections/gym/connection.yaml | 2 +- packages/fetchai/connections/gym/tests/test_gym.py | 14 ++++++++++---- packages/fetchai/skills/gym/skill.yaml | 2 +- packages/hashes.csv | 8 ++++---- packages/open_aea/agents/gym_aea/aea-config.yaml | 4 ++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index bfffc61e0f..4cf9bc44f3 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 +- fetchai/gym:0.19.0:bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeiamoluhbqneq3kdjvuafley3nbjvp5qeqxwkteh2r4y23slpsx2zq +- fetchai/gym:0.20.0:bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 6819be442e..007a849a42 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -10,7 +10,7 @@ fingerprint: __init__.py: bafybeiacpcxqwod5ppgwckp36jj3ax2ymzkrv4tlalzcatxrx4tblbvfvq connection.py: bafybeiacf4utttdtrp2zb5wjrksatswb7dtlgnzafxiofuvzxot53oqdd4 tests/__init__.py: bafybeielwxjlvbzufqr3wgv4jrzbi6kquzelxbczla4cvpoiuz2no5eqp4 - tests/test_gym.py: bafybeicajocxzl3rxzwq6cyuzxyo5zdmjxbh4pl5nfcjilkeoznlaz5soe + tests/test_gym.py: bafybeihgbs7javpak2ex6sdh44ox5nfj4w4j7yqxq4qvpatk65guqt2e74 fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/gym/tests/test_gym.py b/packages/fetchai/connections/gym/tests/test_gym.py index ca303a6b07..d58d5b41af 100644 --- a/packages/fetchai/connections/gym/tests/test_gym.py +++ b/packages/fetchai/connections/gym/tests/test_gym.py @@ -19,6 +19,7 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the gym connection module.""" import asyncio +import inspect import logging import os from typing import cast @@ -29,6 +30,7 @@ from aea.common import Address from aea.configurations.base import ConnectionConfig +from aea.configurations.data_types import PublicId from aea.identity.base import Identity from aea.mail.base import Envelope, Message from aea.protocols.dialogue.base import Dialogue as BaseDialogue @@ -38,20 +40,24 @@ from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues from packages.fetchai.protocols.gym.message import GymMessage -from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID - logger = logging.getLogger(__name__) +CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) +ROOT_DIR = os.path.join(CUR_PATH, "..", "..", "..", "..", "..") + +UNKNOWN_PROTOCOL_PUBLIC_ID = PublicId("unknown_author", "unknown_protocol", "0.1.0") + class GymDialogues(BaseGymDialogues): """The dialogues class keeps track of all gym dialogues.""" - def __init__(self, self_address: Address, **kwargs) -> None: + def __init__(self, self_address: Address, **_kwargs) -> None: """ Initialize dialogues. - :return: None + :param self_address: the self address + :param _kwargs: keyword arguments """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 7d589af62f..ca72284780 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,7 +15,7 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 +- fetchai/gym:0.19.0:bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index 50762c5031..8608a19b4c 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,7 +1,7 @@ fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe -fetchai/agents/gym_aea,bafybeiabzmgtujkjbhzeejrxkir2wcuyzbj3ar6mz6avk5j7w7go37epp4 +fetchai/agents/gym_aea,bafybeicu6bltesbwu5gjqnxtsaglpgcjjkwtpm4kndqczvneack2faqt2e fetchai/agents/my_first_aea,bafybeibvkkunphzs77yf4e2vmcjskcfprjsdsnhzrxtkchmshurpph5dxu -fetchai/connections/gym,bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 +fetchai/connections/gym,bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey fetchai/connections/ledger,bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe @@ -25,10 +25,10 @@ fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6at fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a fetchai/skills/generic_buyer,bafybeiaoaph55jeyugeehl3w626mui7freeapv2y2mkq64m4e6gf5ryb4y fetchai/skills/generic_seller,bafybeiaacd3auwavycrqb4sl5lwxhaobaeghuvfrgzz3ybwzy3h6e3jrrq -fetchai/skills/gym,bafybeiamoluhbqneq3kdjvuafley3nbjvp5qeqxwkteh2r4y23slpsx2zq +fetchai/skills/gym,bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeib4eybwgfgezzskodw4rm5qkmfty7j4twv7kxmr3wi6gmsge4ba6a +open_aea/agents/gym_aea,bafybeifcqqehxmqza75rgfxi2pzh7cokwpnrsfzetj2prhpkxzfmsa6hei open_aea/agents/http_echo,bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 open_aea/agents/my_first_aea,bafybeidr6hcyc6wnsvxnru5nj25gys3di3ntotacgu6g4k5n2fsrqh2u2y open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index ca325fdb5e..260818e253 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibaxegsznh2yt7nynyqzsm3icaupwbvozgcazoqnuvvepyjya6kk4 +- fetchai/gym:0.19.0:bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeiamoluhbqneq3kdjvuafley3nbjvp5qeqxwkteh2r4y23slpsx2zq +- fetchai/gym:0.20.0:bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} From 5243e1eecda1ca10ed7608bee895f89633fa7da4 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 18:12:48 +0200 Subject: [PATCH 19/93] fix: attach modules to their parent when loading aea package modules in sys.modules --- aea/components/base.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/aea/components/base.py b/aea/components/base.py index db51307a03..4f858abb8e 100644 --- a/aea/components/base.py +++ b/aea/components/base.py @@ -339,15 +339,22 @@ def perform_load_aea_package( prefix_root_module = types.ModuleType(prefix_root) prefix_root_module.__path__ = None # type: ignore - sys.modules[prefix_root] = sys.modules.get(prefix_root, prefix_root_module) + actual_prefix_root_module = sys.modules.get(prefix_root, prefix_root_module) + sys.modules[prefix_root] = actual_prefix_root_module author_module = types.ModuleType(prefix_author) author_module.__path__ = None # type: ignore - sys.modules[prefix_author] = sys.modules.get(prefix_author, author_module) + actual_prefix_author_module = sys.modules.get(prefix_author, author_module) + sys.modules[prefix_author] = actual_prefix_author_module + setattr(actual_prefix_root_module, author, actual_prefix_author_module) prefix_pkg_type_module = types.ModuleType(prefix_pkg_type) prefix_pkg_type_module.__path__ = None # type: ignore - sys.modules[prefix_pkg_type] = sys.modules.get( + actual_prefix_pkg_type_module = sys.modules.get( prefix_pkg_type, prefix_pkg_type_module ) + sys.modules[prefix_pkg_type] = actual_prefix_pkg_type_module + setattr( + actual_prefix_author_module, package_type_plural, actual_prefix_pkg_type_module + ) prefix_pkg = prefix_pkg_type + f".{package_name}" @@ -366,3 +373,10 @@ def perform_load_aea_package( sys.modules[import_path] = module _default_logger.debug(f"loading {import_path}: {module}") spec.loader.exec_module(module) # type: ignore + + # attach child module to parent module + import_path_parts = import_path.split(".") + parent_module_import_path = ".".join(import_path_parts[:-1]) + module_name = import_path_parts[-1] + parent_module = sys.modules[parent_module_import_path] + setattr(parent_module, module_name, module) From c51c14a0ee17e74f77fae144e19a2397211f6806 Mon Sep 17 00:00:00 2001 From: MarcoFavorito Date: Sun, 28 Aug 2022 18:20:54 +0200 Subject: [PATCH 20/93] test: update contract_api tests --- .../fetchai/connections/ledger/connection.yaml | 2 +- .../protocols/contract_api/protocol.yaml | 2 +- .../contract_api/tests/test_contract_api.py | 18 ++++-------------- .../fetchai/skills/erc1155_client/skill.yaml | 4 ++-- .../fetchai/skills/erc1155_deploy/skill.yaml | 4 ++-- .../fetchai/skills/generic_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_seller/skill.yaml | 2 +- packages/hashes.csv | 12 ++++++------ 8 files changed, 18 insertions(+), 28 deletions(-) diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index f429bef1dd..b388ef18df 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -15,7 +15,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm +- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 - fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae class_name: LedgerConnection config: diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml index f7966d691f..fae96ba596 100644 --- a/packages/fetchai/protocols/contract_api/protocol.yaml +++ b/packages/fetchai/protocols/contract_api/protocol.yaml @@ -16,7 +16,7 @@ fingerprint: message.py: bafybeigftvzbo5xf42rxvyjqj3f3sladfpm3dikjymasasu73uo3emfrn4 serialization.py: bafybeif7ij4l5e6mx7gfuwggdlarohqblpluik6hkfq4s2ha7nubwwiwyy tests/__init__.py: bafybeiebqiklu6bfyzb6x6q7yby632h3nfncwzi3i7mjvombiq2eugpcym - tests/test_contract_api.py: bafybeigelatk4moe7svwqonti3kv7csp4wtxv4zfvl2f4xqeq4aughd554 + tests/test_contract_api.py: bafybeifpn4c7wvzl3d4d7nreoxabflsvj72h7styq7wc7vmkkrhcqkgnfq fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py index 1616f90e26..2d0ebc3522 100644 --- a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py +++ b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py @@ -20,8 +20,6 @@ """This module contains the tests of the contract_api protocol package.""" -import logging -import sys from typing import Type from unittest import mock @@ -44,12 +42,6 @@ _default_logger as contract_api_message_logger, ) -from tests.conftest import ROOT_DIR - - -logger = logging.getLogger(__name__) -sys.path.append(ROOT_DIR) - def test_get_deploy_transaction_serialization(): """Test the serialization for 'get_deploy_transaction' speech-act works.""" @@ -481,8 +473,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the class of a message type of the contract api protocol """ ContractApiDialogue.__init__( self, @@ -500,7 +491,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the self-address """ def role_from_first_message( # pylint: disable=unused-argument @@ -538,8 +529,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the class of a message type of the contract api protocol """ ContractApiDialogue.__init__( self, @@ -557,7 +547,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the self-address """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index d9c8df211e..dd3fdea91a 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -15,11 +15,11 @@ fingerprint: strategy.py: bafybeifudijy3opr6srw5kik3x3rmv6f75dts2pcqtlhjwkkzcafpad4em fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe +- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq contracts: - fetchai/erc1155:0.22.0:bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 protocols: -- fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm +- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm - fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose - fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index bdd0ee9d4b..4d68d5265f 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -15,11 +15,11 @@ fingerprint: strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe +- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq contracts: - fetchai/erc1155:0.22.0:bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 protocols: -- fetchai/contract_api:1.0.0:bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm +- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm - fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose - fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 0dec466f20..00525403c7 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -14,7 +14,7 @@ fingerprint: strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe +- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index d49d0ab1db..1ae0b259e1 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -15,7 +15,7 @@ fingerprint: strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe +- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index 8608a19b4c..92ea19c8c4 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -4,11 +4,11 @@ fetchai/agents/my_first_aea,bafybeibvkkunphzs77yf4e2vmcjskcfprjsdsnhzrxtkchmshur fetchai/connections/gym,bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey -fetchai/connections/ledger,bafybeieavlckizkdikqaofr53aqbsn2rs66kwuzhr2klpjnzasz3qf65oe +fetchai/connections/ledger,bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq fetchai/connections/local,bafybeidu5cgji37wuczrecdfni6h6zarzqno2liycr4niozxqpxsrmnny4 fetchai/connections/stub,bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu fetchai/contracts/erc1155,bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 -fetchai/protocols/contract_api,bafybeihtiorm5perbmetkzqlktzlcibmvtfjap2ldkokiiyyydb5soh5gm +fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose fetchai/protocols/gym,bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe @@ -18,13 +18,13 @@ fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollob fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm fetchai/skills/echo,bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu -fetchai/skills/erc1155_client,bafybeicrmo562aihmvt2homynyksgzcvrymnvtnd6zqehajhqyn3rx4oty -fetchai/skills/erc1155_deploy,bafybeifbg2cfmt3hahpx3ycfdctdp6bkkf5ptuxukauy7iurqrpq4bxtma +fetchai/skills/erc1155_client,bafybeic3egxoim2oqypkrrwxibx2izynyff2f7wcyhwiq5shi5gwsn2gcu +fetchai/skills/erc1155_deploy,bafybeiaw7axycucpkex7aghrkwyj5fdq4jv3fpil7ypocvdhsnf7grdc6e fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a -fetchai/skills/generic_buyer,bafybeiaoaph55jeyugeehl3w626mui7freeapv2y2mkq64m4e6gf5ryb4y -fetchai/skills/generic_seller,bafybeiaacd3auwavycrqb4sl5lwxhaobaeghuvfrgzz3ybwzy3h6e3jrrq +fetchai/skills/generic_buyer,bafybeicgmsry7np5djwdwidp5p53ab3rosuh6szgkg6yeezytcrulh7jla +fetchai/skills/generic_seller,bafybeiaddns2uygyqhgrkd4apgbxh2osl6qs6psz3r7zu66ahtoqyajy6a fetchai/skills/gym,bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble From a9d156fd75f7dce47aa08155feb5a75e58b301b3 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Wed, 31 Aug 2022 08:56:27 +0200 Subject: [PATCH 21/93] chore: remove external dep from gym package --- .../fetchai/agents/gym_aea/aea-config.yaml | 4 +-- .../fetchai/connections/gym/connection.yaml | 2 +- .../fetchai/connections/gym/tests/test_gym.py | 25 ---------------- packages/fetchai/skills/gym/skill.yaml | 2 +- packages/hashes.csv | 8 ++--- .../open_aea/agents/gym_aea/aea-config.yaml | 4 +-- tests/test_examples/test_gym_ex.py | 29 +++++++++++++++++++ 7 files changed, 39 insertions(+), 35 deletions(-) diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 4cf9bc44f3..4da51758c2 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu +- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 +- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 007a849a42..ff08db8c42 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -10,7 +10,7 @@ fingerprint: __init__.py: bafybeiacpcxqwod5ppgwckp36jj3ax2ymzkrv4tlalzcatxrx4tblbvfvq connection.py: bafybeiacf4utttdtrp2zb5wjrksatswb7dtlgnzafxiofuvzxot53oqdd4 tests/__init__.py: bafybeielwxjlvbzufqr3wgv4jrzbi6kquzelxbczla4cvpoiuz2no5eqp4 - tests/test_gym.py: bafybeihgbs7javpak2ex6sdh44ox5nfj4w4j7yqxq4qvpatk65guqt2e74 + tests/test_gym.py: bafybeihbednroqhfubwok367pbttg6wo6o22jpwocdmfsvo7lsf363ke2u fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/gym/tests/test_gym.py b/packages/fetchai/connections/gym/tests/test_gym.py index d58d5b41af..a4155de178 100644 --- a/packages/fetchai/connections/gym/tests/test_gym.py +++ b/packages/fetchai/connections/gym/tests/test_gym.py @@ -19,9 +19,7 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the gym connection module.""" import asyncio -import inspect import logging -import os from typing import cast from unittest.mock import MagicMock, patch @@ -43,9 +41,6 @@ logger = logging.getLogger(__name__) -CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) -ROOT_DIR = os.path.join(CUR_PATH, "..", "..", "..", "..", "..") - UNKNOWN_PROTOCOL_PUBLIC_ID = PublicId("unknown_author", "unknown_protocol", "0.1.0") @@ -263,23 +258,3 @@ async def test_receive_connection_error(self): """Test receive connection error and Cancel Error.""" with pytest.raises(ConnectionError): await self.gym_con.receive() - - def test_gym_env_load(self): - """Load gym env from file.""" - curdir = os.getcwd() - os.chdir(os.path.join(ROOT_DIR, "examples", "gym_ex")) - gym_env_path = "gyms.env.BanditNArmedRandom" - configuration = ConnectionConfig( - connection_id=GymConnection.connection_id, env=gym_env_path - ) - identity = Identity( - "name", address=self.agent_address, public_key=self.agent_public_key - ) - gym_con = GymConnection( - gym_env=None, - identity=identity, - configuration=configuration, - data_dir=MagicMock(), - ) - assert gym_con.channel.gym_env is not None - os.chdir(curdir) diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index ca72284780..6aea634435 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,7 +15,7 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu +- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index 92ea19c8c4..57c2322ddf 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,7 +1,7 @@ fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe -fetchai/agents/gym_aea,bafybeicu6bltesbwu5gjqnxtsaglpgcjjkwtpm4kndqczvneack2faqt2e +fetchai/agents/gym_aea,bafybeigrzuxo5amvwn56ikypgmriuw4ixc4znyab3sdssqzosm7c4l4og4 fetchai/agents/my_first_aea,bafybeibvkkunphzs77yf4e2vmcjskcfprjsdsnhzrxtkchmshurpph5dxu -fetchai/connections/gym,bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu +fetchai/connections/gym,bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey fetchai/connections/ledger,bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq @@ -25,10 +25,10 @@ fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6at fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a fetchai/skills/generic_buyer,bafybeicgmsry7np5djwdwidp5p53ab3rosuh6szgkg6yeezytcrulh7jla fetchai/skills/generic_seller,bafybeiaddns2uygyqhgrkd4apgbxh2osl6qs6psz3r7zu66ahtoqyajy6a -fetchai/skills/gym,bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 +fetchai/skills/gym,bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeifcqqehxmqza75rgfxi2pzh7cokwpnrsfzetj2prhpkxzfmsa6hei +open_aea/agents/gym_aea,bafybeic4xvz5hwabultbdczapr34gttobhqw5r3k5c25tsprozx2gwyjku open_aea/agents/http_echo,bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 open_aea/agents/my_first_aea,bafybeidr6hcyc6wnsvxnru5nj25gys3di3ntotacgu6g4k5n2fsrqh2u2y open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 260818e253..9f2f182d72 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeif7qvleot7u2gr7t6oenj3op4qa74xbl6752i6a6xzuzwd4ggpqzu +- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeibgxruc6rndias5wpgr67xmzhdwmn53fzvnkytddbsiyhxsst6zn4 +- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/tests/test_examples/test_gym_ex.py b/tests/test_examples/test_gym_ex.py index 447d902b9d..6e021074ed 100644 --- a/tests/test_examples/test_gym_ex.py +++ b/tests/test_examples/test_gym_ex.py @@ -24,6 +24,12 @@ import sys import tempfile from pathlib import Path +from unittest.mock import MagicMock + +from aea.configurations.base import ConnectionConfig +from aea.identity.base import Identity + +from packages.fetchai.connections.gym.connection import GymConnection from tests.common.pexpect_popen import PexpectWrapper from tests.conftest import ROOT_DIR, env_path_separator @@ -82,3 +88,26 @@ def teardown_class(cls): shutil.rmtree(cls.t) except (OSError, IOError): pass + + +def test_gym_env_load(self): + """Load gym env from file.""" + try: + curdir = os.getcwd() + os.chdir(os.path.join(ROOT_DIR, "examples", "gym_ex")) + gym_env_path = "gyms.env.BanditNArmedRandom" + configuration = ConnectionConfig( + connection_id=GymConnection.connection_id, env=gym_env_path + ) + identity = Identity( + "name", address=self.agent_address, public_key=self.agent_public_key + ) + gym_con = GymConnection( + gym_env=None, + identity=identity, + configuration=configuration, + data_dir=MagicMock(), + ) + assert gym_con.channel.gym_env is not None + finally: + os.chdir(curdir) From d21f12d90b035d292d1a23727e8c87c19e8ceb64 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Wed, 31 Aug 2022 09:09:58 +0200 Subject: [PATCH 22/93] fix: echo test --- packages/fetchai/agents/my_first_aea/aea-config.yaml | 2 +- packages/fetchai/skills/echo/skill.yaml | 6 +++--- packages/fetchai/skills/echo/tests/test_behaviours.py | 7 ++++--- packages/fetchai/skills/echo/tests/test_dialogues.py | 6 ++++-- packages/fetchai/skills/echo/tests/test_handlers.py | 6 ++++-- packages/hashes.csv | 6 +++--- packages/open_aea/agents/my_first_aea/aea-config.yaml | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index ebfd89069c..7c30423d18 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu +- fetchai/echo:0.19.0:bafybeiapq3npfk62s36rdnfd2is5kgmz6jw4nyoiggj3t4pslab2cazczq default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 24faeaea58..44252c61c7 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -12,9 +12,9 @@ fingerprint: dialogues.py: bafybeici4rlde6qdpjtftn4xgelrrphpwzzymvhjrgua7frx7qvyw32gue handlers.py: bafybeihjjglefhpwbprqu6anjpmhj3nn7p53nsci3kmueab7hnhchfcmsi tests/__init__.py: bafybeidedsb72is3z5jndaoh232r7y5qvqb3acotjm6xi4pea3bmkoq6le - tests/test_behaviours.py: bafybeihe72d7uw5kqes2rxxhsipctumojmdyozlsb55m3jgb3s2ao3yiwa - tests/test_dialogues.py: bafybeie2xzn4bielsz365yme74j2zydo5wuqkwjgcbuv3yig3uhoa3y7uu - tests/test_handlers.py: bafybeiaw5z3ppktc74rphsd7ppiswnr4jsmph7w7w2tx56mbdxuhpcpwm4 + tests/test_behaviours.py: bafybeid52a5hc2jrtyvaj3535ottlyvsxzunha4jfd3bnrl2emfu7gpy4a + tests/test_dialogues.py: bafybeihavnuflot553ihhakfeonlyhxicd7mkebvv76rlh4fe77yedushi + tests/test_handlers.py: bafybeifejrmrep6f2wxuarowhbcpzs6rvtiv3y4vimaoxyuv5jdyg5lzwa fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/packages/fetchai/skills/echo/tests/test_behaviours.py b/packages/fetchai/skills/echo/tests/test_behaviours.py index 7dbee7f3c8..99be0084f9 100644 --- a/packages/fetchai/skills/echo/tests/test_behaviours.py +++ b/packages/fetchai/skills/echo/tests/test_behaviours.py @@ -19,6 +19,8 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour class of the echo skill.""" +import os +import inspect import logging from pathlib import Path from typing import cast @@ -28,13 +30,12 @@ from packages.fetchai.skills.echo.behaviours import EchoBehaviour -from tests.conftest import ROOT_DIR - +CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore class TestEchoBehaviour(BaseSkillTestCase): """Test EchoBehaviour behaviour of echo.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") + path_to_skill = Path(CUR_PATH, "..") is_agent_to_agent_messages = False @classmethod diff --git a/packages/fetchai/skills/echo/tests/test_dialogues.py b/packages/fetchai/skills/echo/tests/test_dialogues.py index 9cad9c27cb..87a8815c25 100644 --- a/packages/fetchai/skills/echo/tests/test_dialogues.py +++ b/packages/fetchai/skills/echo/tests/test_dialogues.py @@ -19,6 +19,8 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the echo skill.""" +import os +import inspect from pathlib import Path from typing import cast @@ -27,13 +29,13 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.skills.echo.dialogues import DefaultDialogue, DefaultDialogues -from tests.conftest import ROOT_DIR +CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore class TestDialogues(BaseSkillTestCase): """Test dialogue class of echo.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") + path_to_skill = Path(CUR_PATH, "..") @classmethod def setup(cls): diff --git a/packages/fetchai/skills/echo/tests/test_handlers.py b/packages/fetchai/skills/echo/tests/test_handlers.py index bd95293206..faf3f41cc3 100644 --- a/packages/fetchai/skills/echo/tests/test_handlers.py +++ b/packages/fetchai/skills/echo/tests/test_handlers.py @@ -19,6 +19,8 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the handler class of the echo skill.""" +import os +import inspect import logging from pathlib import Path from typing import cast @@ -31,13 +33,13 @@ from packages.fetchai.skills.echo.dialogues import DefaultDialogues from packages.fetchai.skills.echo.handlers import EchoHandler -from tests.conftest import ROOT_DIR +CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore class TestEchoHandler(BaseSkillTestCase): """Test EchoHandler of echo.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") + path_to_skill = Path(CUR_PATH, "..") @classmethod def setup(cls): diff --git a/packages/hashes.csv b/packages/hashes.csv index 57c2322ddf..f5559c89bf 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,6 +1,6 @@ fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe fetchai/agents/gym_aea,bafybeigrzuxo5amvwn56ikypgmriuw4ixc4znyab3sdssqzosm7c4l4og4 -fetchai/agents/my_first_aea,bafybeibvkkunphzs77yf4e2vmcjskcfprjsdsnhzrxtkchmshurpph5dxu +fetchai/agents/my_first_aea,bafybeidkana63rewyecu3hfnjrnk6wlbspqe5k5eqwgci53lrb3l4i3al4 fetchai/connections/gym,bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey @@ -17,7 +17,7 @@ fetchai/protocols/ledger_api,bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiese fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm -fetchai/skills/echo,bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu +fetchai/skills/echo,bafybeiapq3npfk62s36rdnfd2is5kgmz6jw4nyoiggj3t4pslab2cazczq fetchai/skills/erc1155_client,bafybeic3egxoim2oqypkrrwxibx2izynyff2f7wcyhwiq5shi5gwsn2gcu fetchai/skills/erc1155_deploy,bafybeiaw7axycucpkex7aghrkwyj5fdq4jv3fpil7ypocvdhsnf7grdc6e fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6 fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeic4xvz5hwabultbdczapr34gttobhqw5r3k5c25tsprozx2gwyjku open_aea/agents/http_echo,bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 -open_aea/agents/my_first_aea,bafybeidr6hcyc6wnsvxnru5nj25gys3di3ntotacgu6g4k5n2fsrqh2u2y +open_aea/agents/my_first_aea,bafybeiev6rhcgye47q3zifdbe7rkyh5ghtq7h4nhufmfwubrfxygu5un5a open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index bcac0f0d3d..37bd37381e 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeiazkwgjmt6scuapd33anqicqt5hqk6mttxpwl74rh4qv5mlvhyrvu +- fetchai/echo:0.19.0:bafybeiapq3npfk62s36rdnfd2is5kgmz6jw4nyoiggj3t4pslab2cazczq default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From c30166e005bf660f514896e33f18cf0aa704f359 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 11:23:56 +0000 Subject: [PATCH 23/93] feat: add `docker_image` module --- aea/test_tools/docker_image.py | 204 +++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 aea/test_tools/docker_image.py diff --git a/aea/test_tools/docker_image.py b/aea/test_tools/docker_image.py new file mode 100644 index 0000000000..8f7b513a67 --- /dev/null +++ b/aea/test_tools/docker_image.py @@ -0,0 +1,204 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains testing utilities.""" +import logging +import os +import re +import shutil +import subprocess # nosec +import tempfile +import time +from abc import ABC, abstractmethod +from typing import Dict, List, Optional + +import docker +import pytest +from docker import DockerClient +from docker.models.containers import Container + +from aea.exceptions import enforce +from aea.helpers import http_requests as requests + + +logger = logging.getLogger(__name__) + + +class DockerImage(ABC): + """A class to wrap interatction with a Docker image.""" + + MINIMUM_DOCKER_VERSION = (19, 0, 0) + + def __init__(self, client: docker.DockerClient): + """Initialize.""" + self._client = client + + def check_skip(self) -> None: + """ + Check whether the test should be skipped. + + By default, nothing happens. + """ + self._check_docker_binary_available() + + def _check_docker_binary_available(self) -> None: + """Check the 'Docker' CLI tool is in the OS PATH.""" + result = shutil.which("docker") + if result is None: + pytest.skip("Docker not in the OS Path; skipping the test") + + result = subprocess.run( # nosec + ["docker", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + if result.returncode != 0: + pytest.skip(f"'docker --version' failed with exit code {result.returncode}") + + match = re.search( + r"Docker version ([0-9]+)\.([0-9]+)\.([0-9]+)", + result.stdout.decode("utf-8"), + ) + if match is None: + pytest.skip("cannot read version from the output of 'docker --version'") + version = (int(match.group(1)), int(match.group(2)), int(match.group(3))) + if version < self.MINIMUM_DOCKER_VERSION: + pytest.skip( + f"expected Docker version to be at least {'.'.join(self.MINIMUM_DOCKER_VERSION)}, found {'.'.join(version)}" + ) + + @property + @abstractmethod + def tag(self) -> str: + """Return the tag of the image.""" + + def stop_if_already_running(self) -> None: + """Stop the running images with the same tag, if any.""" + client = docker.from_env() + for container in client.containers.list(): + if self.tag in container.image.tags: + logger.info(f"Stopping image {self.tag}...") + container.stop() + + @abstractmethod + def create(self) -> Container: + """Instantiate the image in a container.""" + + @abstractmethod + def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: + """ + Wait until the image is running. + + :param max_attempts: max number of attempts. + :param sleep_rate: the amount of time to sleep between different requests. + :return: True if the wait was successful, False otherwise. + """ + return True + + +class GanacheDockerImage(DockerImage): + """Wrapper to Ganache Docker image.""" + + def __init__( + self, + client: DockerClient, + addr: str, + port: int, + config: Optional[Dict] = None, + gas_limit: str = "0x9184e72a000", # 10000000000000, + ): + """ + Initialize the Ganache Docker image. + + :param client: the Docker client. + :param addr: the address. + :param port: the port. + :param config: optional configuration to command line. + :param gas_limit: the gas limit for blocks. + """ + super().__init__(client) + self._addr = addr + self._port = port + self._config = config or {} + self._gas_limit = gas_limit + + @property + def tag(self) -> str: + """Get the image tag.""" + return "trufflesuite/ganache:beta" + + def _make_ports(self) -> Dict: + """Make ports dictionary for Docker.""" + return {f"{self._port}/tcp": ("0.0.0.0", self._port)} # nosec + + def _build_command(self) -> List[str]: + """Build command.""" + # cmd = ["--chain.hardfork=london"] # noqa: E800 + cmd = ["--miner.blockGasLimit=" + str(self._gas_limit)] + # cmd += ["--miner.callGasLimit=" + "0x1fffffffffffff"] # noqa: E800 + accounts_balances = self._config.get("accounts_balances", []) + for account, balance in accounts_balances: + cmd += [f"--wallet.accounts='{account},{balance}'"] + return cmd + + def create(self) -> Container: + """Create the container.""" + cmd = self._build_command() + container = self._client.containers.run( + self.tag, command=cmd, detach=True, ports=self._make_ports() + ) + return container + + def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: + """Wait until the image is up.""" + request = dict(jsonrpc=2.0, method="web3_clientVersion", params=[], id=1) + for i in range(max_attempts): + try: + response = requests.post(f"{self._addr}:{self._port}", json=request) + enforce(response.status_code == 200, "") + return True + except Exception: + logger.info( + "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate + ) + time.sleep(sleep_rate) + return False + + +def launch_image(image: DockerImage, timeout: float = 2.0, max_attempts: int = 10): + """Launch image.""" + + image.check_skip() + image.stop_if_already_running() + container = image.create() + container.start() + logger.info(f"Setting up image {image.tag}...") + success = image.wait(max_attempts, timeout) + if not success: + container.stop() + container.remove() + pytest.fail(f"{image.tag} doesn't work. Exiting...") + else: + try: + logger.info("Done!") + time.sleep(timeout) + yield + finally: + logger.info(f"Stopping the image {image.tag}...") + container.stop() + container.remove() From d8cc95eab6bb38f206b43c667b7ae5f0bac2314a Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 11:24:19 +0000 Subject: [PATCH 24/93] feat: add `test_tools` module in plugins --- .../test_tools/__init__.py | 20 +++++ .../test_tools/constants.py | 65 +++++++++++++++ .../test_tools/data/ethereum_private_key.txt | 1 + .../data/ethereum_private_key_two.txt | 1 + .../test_tools/fixture_helpers.py | 81 +++++++++++++++++++ .../aea_ledger_fetchai/test_tools/__init__.py | 20 +++++ .../test_tools/constants.py | 30 +++++++ 7 files changed, 218 insertions(+) create mode 100644 plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/__init__.py create mode 100644 plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/constants.py create mode 100644 plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key.txt create mode 100644 plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key_two.txt create mode 100644 plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py create mode 100644 plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/__init__.py create mode 100644 plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/__init__.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/__init__.py new file mode 100644 index 0000000000..5743c73ef0 --- /dev/null +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Test tools.""" diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/constants.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/constants.py new file mode 100644 index 0000000000..fa4796fb84 --- /dev/null +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/constants.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Constants.""" + + +import os +from pathlib import Path + +from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.ethereum import ( + DEFAULT_EIP1559_STRATEGY, + DEFAULT_GAS_STATION_STRATEGY, +) + +from aea.configurations.constants import PRIVATE_KEY_PATH_SCHEMA +from aea.crypto.ledger_apis import ETHEREUM_DEFAULT_ADDRESS, ETHEREUM_DEFAULT_CHAIN_ID + + +DATA_DIR = Path(__file__).parent / "data" + +ETHEREUM_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(EthereumCrypto.identifier) +ETHEREUM_PRIVATE_KEY_TWO_FILE = "ethereum_private_key_two.txt" + +ETHEREUM_ADDRESS_ONE = "0x46F415F7BF30f4227F98def9d2B22ff62738fD68" +ETHEREUM_ADDRESS_TWO = "0x7A1236d5195e31f1F573AD618b2b6FEFC85C5Ce6" + +ETHEREUM_PRIVATE_KEY_PATH = os.path.join(DATA_DIR, ETHEREUM_PRIVATE_KEY_FILE) +ETHEREUM_PRIVATE_KEY_TWO_PATH = os.path.join(DATA_DIR, ETHEREUM_PRIVATE_KEY_TWO_FILE) + +ETHEREUM_TESTNET_CONFIG = { + "address": ETHEREUM_DEFAULT_ADDRESS, + "chain_id": ETHEREUM_DEFAULT_CHAIN_ID, + "default_gas_price_strategy": "gas_station", + "gas_price_strategies": { + "gas_station": DEFAULT_GAS_STATION_STRATEGY, + "eip1559": DEFAULT_EIP1559_STRATEGY, + }, +} + +FUNDED_ETH_PRIVATE_KEY_1 = ( + "0xa337a9149b4e1eafd6c21c421254cf7f98130233595db25f0f6f0a545fb08883" +) +FUNDED_ETH_PRIVATE_KEY_2 = ( + "0x04b4cecf78288f2ab09d1b4c60219556928f86220f0fb2dcfc05e6a1c1149dbf" +) +FUNDED_ETH_PRIVATE_KEY_3 = ( + "0x6F611408F7EF304947621C51A4B7D84A13A2B9786E9F984DA790A096E8260C64" +) diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key.txt b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key.txt new file mode 100644 index 0000000000..09064f89fa --- /dev/null +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key.txt @@ -0,0 +1 @@ +0x6F611408F7EF304947621C51A4B7D84A13A2B9786E9F984DA790A096E8260C64 \ No newline at end of file diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key_two.txt b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key_two.txt new file mode 100644 index 0000000000..70dbc46eb7 --- /dev/null +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/data/ethereum_private_key_two.txt @@ -0,0 +1 @@ +0x04b4cecf78288f2ab09d1b4c60219556928f86220f0fb2dcfc05e6a1c1149dbf \ No newline at end of file diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py new file mode 100644 index 0000000000..9607dfa6e0 --- /dev/null +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Fixture helpers""" + +from contextlib import contextmanager +from pathlib import Path +from typing import Dict +from urllib.parse import urlparse + +import docker +import pytest +from aea_ledger_ethereum.test_tools.constants import ( + ETHEREUM_PRIVATE_KEY_PATH, + FUNDED_ETH_PRIVATE_KEY_1, + FUNDED_ETH_PRIVATE_KEY_2, + FUNDED_ETH_PRIVATE_KEY_3, +) + +from aea.test_tools.docker_image import GanacheDockerImage, launch_image + + +LOCAL_HOST = urlparse("http://127.0.0.1") +DEFAULT_GANACHE_ADDR = LOCAL_HOST.geturl() +DEFAULT_GANACHE_PORT = 8545 +DEFAULT_GANACHE_CHAIN_ID = 1337 +DEFAULT_AMOUNT = 1000000000000000000000 + +GANACHE_CONFIGURATION = dict( + accounts_balances=[ + (FUNDED_ETH_PRIVATE_KEY_1, DEFAULT_AMOUNT), + (FUNDED_ETH_PRIVATE_KEY_2, DEFAULT_AMOUNT), + (FUNDED_ETH_PRIVATE_KEY_3, DEFAULT_AMOUNT), + (Path(ETHEREUM_PRIVATE_KEY_PATH).read_text().strip(), DEFAULT_AMOUNT), + ], +) + + +@contextmanager +def _ganache_context( + ganache_configuration: Dict, + ganache_addr: str = DEFAULT_GANACHE_ADDR, + ganache_port: int = DEFAULT_GANACHE_PORT, + timeout: float = 2.0, + max_attempts: int = 10, +): + client = docker.from_env() + image = GanacheDockerImage( + client, ganache_addr, ganache_port, config=ganache_configuration + ) + yield from launch_image(image, timeout=timeout, max_attempts=max_attempts) + + +@pytest.fixture(scope="class") +def ganache( + ganache_addr=DEFAULT_GANACHE_ADDR, + ganache_port=DEFAULT_GANACHE_PORT, + timeout: float = 2.0, + max_attempts: int = 10, +): + """Launch the Ganache image.""" + with _ganache_context( + GANACHE_CONFIGURATION.copy(), ganache_addr, ganache_port, timeout, max_attempts + ) as image: + yield image diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/__init__.py b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/__init__.py new file mode 100644 index 0000000000..5743c73ef0 --- /dev/null +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Test tools.""" diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py new file mode 100644 index 0000000000..115e7d6628 --- /dev/null +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Constants.""" + + +from pathlib import Path + +from aea.crypto.ledger_apis import FETCHAI_DEFAULT_ADDRESS + + +DATA_DIR = Path(__file__).parent / "data" + +FETCHAI_TESTNET_CONFIG = {"address": FETCHAI_DEFAULT_ADDRESS} From ffb800a280cd6cbd0e41e7275e1a957ed527cf5b Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 11:24:40 +0000 Subject: [PATCH 25/93] feat: use ported test tools for contract tests --- .../fetchai/contracts/erc1155/contract.yaml | 2 +- .../contracts/erc1155/tests/test_contract.py | 133 +++++++++--------- .../skills/echo/tests/test_behaviours.py | 4 +- .../skills/echo/tests/test_dialogues.py | 3 +- .../skills/echo/tests/test_handlers.py | 3 +- 5 files changed, 76 insertions(+), 69 deletions(-) diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index 81aca86236..fcd0d6f9cb 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -17,7 +17,7 @@ fingerprint: migrations/1_initial_migration.js: bafybeigzg7dadlq7sepncquzoo5hgs7q2pwvbhzilolgkjkr3jacb2owvy migrations/2_deploy_contracts.js: bafybeihnzburnurq4gvp4rj36b57uzrlgif5y73ggyu3rfc3iot4e5zppy tests/__init__.py: bafybeidgqgy32gwubf3eu7ijc7ddq4bm675oxyfqevm5j2ew2zcu4p6tm4 - tests/test_contract.py: bafybeienxes6xv3lqkfrrzirrrfxxvop2yk5ab3iy2zqnpkw47wzlmny4q + tests/test_contract.py: bafybeiesmoo6ol5c5bvbiwtsfl22nltef7okgfmd662usz5ezatv3wxuae fingerprint_ignore_patterns: [] class_name: ERC1155Contract contract_interface_paths: diff --git a/packages/fetchai/contracts/erc1155/tests/test_contract.py b/packages/fetchai/contracts/erc1155/tests/test_contract.py index 458ee66773..fa147c9873 100644 --- a/packages/fetchai/contracts/erc1155/tests/test_contract.py +++ b/packages/fetchai/contracts/erc1155/tests/test_contract.py @@ -28,7 +28,18 @@ import pytest from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ( + ETHEREUM_ADDRESS_ONE, + ETHEREUM_ADDRESS_TWO, + ETHEREUM_PRIVATE_KEY_PATH, + ETHEREUM_PRIVATE_KEY_TWO_PATH, + ETHEREUM_TESTNET_CONFIG, +) +from aea_ledger_ethereum.test_tools.fixture_helpers import ( # noqa # pylint: disable=unsed-import + ganache, +) from aea_ledger_fetchai import FetchAIApi, FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_TESTNET_CONFIG from aea.configurations.loader import ( ComponentType, @@ -38,28 +49,22 @@ from aea.contracts.base import Contract, contract_registry from aea.test_tools.test_contract import BaseContractTestCase -from tests.conftest import ( - ETHEREUM_ADDRESS_ONE, - ETHEREUM_ADDRESS_TWO, - ETHEREUM_PRIVATE_KEY_PATH, - ETHEREUM_PRIVATE_KEY_TWO_PATH, - ETHEREUM_TESTNET_CONFIG, - FETCHAI_TESTNET_CONFIG, - MAX_FLAKY_RERUNS, - ROOT_DIR, - UseGanache, -) + +PACKAGE_DIR = Path(__file__).parent.parent +MAX_FLAKY_RERUNS = 3 @pytest.mark.ledger -class TestERC1155ContractEthereum(BaseContractTestCase, UseGanache): +@pytest.mark.integration +@pytest.mark.usefixtures("ganache") +class TestERC1155ContractEthereum(BaseContractTestCase): """Test the ERC1155 contract on Ethereum.""" ledger_identifier = EthereumCrypto.identifier - path_to_contract = Path(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155") + path_to_contract = PACKAGE_DIR @classmethod - def setup(cls): + def setup(cls) -> None: """Setup.""" super().setup( ledger_config=ETHEREUM_TESTNET_CONFIG, @@ -98,7 +103,7 @@ def finish_contract_deployment(cls) -> str: return contract_address - def test_generate_token_ids(self): + def test_generate_token_ids(self) -> None: """Test the generate_token_ids method of the ERC1155 contract.""" # setup nft_token_type = 1 @@ -114,7 +119,7 @@ def test_generate_token_ids(self): # after assert actual_toke_ids == expected_toke_ids - def test_generate_id(self): + def test_generate_id(self) -> None: """Test the _generate_id method of the ERC1155 contract.""" # setup ft_token_type = 2 @@ -127,7 +132,7 @@ def test_generate_id(self): # after assert actual_toke_id == expected_toke_id - def test_get_create_batch_transaction(self): + def test_get_create_batch_transaction(self) -> None: """Test the get_create_batch_transaction method of the ERC1155 contract.""" # operation tx = self.contract.get_create_batch_transaction( @@ -147,7 +152,7 @@ def test_get_create_batch_transaction(self): tx, self.ledger_api, [self.deployer_crypto] ) - def test_get_create_single_transaction(self): + def test_get_create_single_transaction(self) -> None: """Test the get_create_single_transaction method of the ERC1155 contract.""" # operation tx = self.contract.get_create_single_transaction( @@ -167,7 +172,7 @@ def test_get_create_single_transaction(self): tx, self.ledger_api, [self.deployer_crypto] ) - def test_get_mint_batch_transaction(self): + def test_get_mint_batch_transaction(self) -> None: """Test the get_mint_batch_transaction method of the ERC1155 contract.""" # operation tx = self.contract.get_mint_batch_transaction( @@ -189,7 +194,7 @@ def test_get_mint_batch_transaction(self): tx, self.ledger_api, [self.deployer_crypto] ) - def test_validate_mint_quantities(self): + def test_validate_mint_quantities(self) -> None: """Test the validate_mint_quantities method of the ERC1155 contract.""" # Valid NFTs self.contract.validate_mint_quantities( @@ -233,7 +238,7 @@ def test_validate_mint_quantities(self): mint_quantities=[mint_quantity], ) - def test_decode_id(self): + def test_decode_id(self) -> None: """Test the decode_id method of the ERC1155 contract.""" # FT expected_token_type = 2 @@ -247,7 +252,7 @@ def test_decode_id(self): actual_token_type = self.contract.decode_id(token_id) assert actual_token_type == expected_token_type - def test_get_mint_single_transaction(self): + def test_get_mint_single_transaction(self) -> None: """Test the get_mint_single_transaction method of the ERC1155 contract.""" # operation tx = self.contract.get_mint_single_transaction( @@ -269,7 +274,7 @@ def test_get_mint_single_transaction(self): tx, self.ledger_api, [self.deployer_crypto] ) - def test_get_balance(self): + def test_get_balance(self) -> None: """Test the get_balance method of the ERC1155 contract.""" # operation result = self.contract.get_balance( @@ -283,7 +288,7 @@ def test_get_balance(self): assert "balance" in result assert result["balance"][self.token_id_b] == 0 - def test_get_balances(self): + def test_get_balances(self) -> None: """Test the get_balances method of the ERC1155 contract.""" # operation result = self.contract.get_balances( @@ -297,7 +302,7 @@ def test_get_balances(self): assert "balances" in result assert all(result["balances"][token_id] == 0 for token_id in self.token_ids_a) - def test_get_hash_single(self): + def test_get_hash_single(self) -> None: """Test the get_hash_single method of the ERC1155 contract.""" # operation result = self.contract.get_hash_single( @@ -315,7 +320,7 @@ def test_get_hash_single(self): # after assert isinstance(result, bytes) - def test_get_hash_batch(self): + def test_get_hash_batch(self) -> None: """Test the get_hash_batch method of the ERC1155 contract.""" # operation result = self.contract.get_hash_batch( @@ -333,7 +338,7 @@ def test_get_hash_batch(self): # after assert isinstance(result, bytes) - def test_generate_trade_nonce(self): + def test_generate_trade_nonce(self) -> None: """Test the generate_trade_nonce method of the ERC1155 contract.""" # operation result = self.contract.generate_trade_nonce( @@ -347,7 +352,7 @@ def test_generate_trade_nonce(self): assert isinstance(result["trade_nonce"], int) @pytest.mark.integration - def test_helper_methods_and_get_transactions(self): + def test_helper_methods_and_get_transactions(self) -> None: """Test helper methods and get transactions.""" expected_a = [ 340282366920938463463374607431768211456, @@ -446,7 +451,7 @@ def test_helper_methods_and_get_transactions(self): ), "Error, found: {}".format(tx) @pytest.mark.integration - def test_get_single_atomic_swap(self): + def test_get_single_atomic_swap(self) -> None: """Test get single atomic swap.""" from_address = ETHEREUM_ADDRESS_ONE to_address = ETHEREUM_ADDRESS_TWO @@ -499,7 +504,7 @@ def test_get_single_atomic_swap(self): ), "Error, found: {}".format(tx) @pytest.mark.integration - def test_get_batch_atomic_swap(self): + def test_get_batch_atomic_swap(self) -> None: """Test get batch atomic swap.""" from_address = ETHEREUM_ADDRESS_ONE to_address = ETHEREUM_ADDRESS_TWO @@ -552,7 +557,7 @@ def test_get_batch_atomic_swap(self): ), "Error, found: {}".format(tx) @pytest.mark.integration - def test_full(self): + def test_full(self) -> None: """Setup.""" # Test tokens IDs token_ids = self.contract.generate_token_ids(token_type=2, nb_tokens=10) @@ -645,11 +650,11 @@ class TestCosmWasmContract(BaseContractTestCase): """Test the cosmwasm contract.""" ledger_identifier = FetchAICrypto.identifier - path_to_contract = Path(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155") + path_to_contract = PACKAGE_DIR fund_from_faucet = True @classmethod - def setup(cls): + def setup(cls) -> None: """Setup.""" # Test tokens IDs super().setup(ledger_config=FETCHAI_TESTNET_CONFIG) @@ -710,7 +715,7 @@ def finish_contract_deployment(cls) -> str: @pytest.mark.integration @pytest.mark.ledger @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) - def test_create_and_mint_and_balances(self): + def test_create_and_mint_and_balances(self) -> None: """Test cosmwasm contract create, mint and balances functionalities.""" # Create single token tx = self.contract.get_create_single_transaction( @@ -787,7 +792,7 @@ def test_create_and_mint_and_balances(self): @pytest.mark.integration @pytest.mark.ledger @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) - def test_cosmwasm_single_atomic_swap(self): + def test_cosmwasm_single_atomic_swap(self) -> None: """Test single atomic swap.""" # Create batch of tokens tx = self.contract.get_create_batch_transaction( @@ -911,7 +916,7 @@ def test_cosmwasm_single_atomic_swap(self): @pytest.mark.integration @pytest.mark.ledger @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) - def test_cosmwasm_batch_atomic_swap(self): + def test_cosmwasm_batch_atomic_swap(self) -> None: """Test batch atomic swap.""" # Create batch of tokens @@ -1013,13 +1018,11 @@ class TestContractCommon: """Other tests for the contract.""" @classmethod - def setup(cls): + def setup(cls) -> None: """Setup.""" # Register smart contract used for testing - cls.path_to_contract = Path( - ROOT_DIR, "packages", "fetchai", "contracts", "erc1155" - ) + cls.path_to_contract = PACKAGE_DIR # register contract configuration = cast( @@ -1044,7 +1047,7 @@ def setup(cls): cls.ledger_api.configure_mock(**attrs) @pytest.mark.ledger - def test_get_create_batch_transaction_wrong_identifier(self): + def test_get_create_batch_transaction_wrong_identifier(self) -> None: """Test if get_create_batch_transaction with wrong api identifier fails.""" # Test if function is not implemented for unknown ledger @@ -1057,7 +1060,7 @@ def test_get_create_batch_transaction_wrong_identifier(self): ) @pytest.mark.ledger - def test_get_create_single_transaction_wrong_identifier(self): + def test_get_create_single_transaction_wrong_identifier(self) -> None: """Test if get_create_single_transaction with wrong api identifier fails.""" # Test if function is not implemented for unknown ledger @@ -1070,7 +1073,7 @@ def test_get_create_single_transaction_wrong_identifier(self): ) @pytest.mark.ledger - def test_get_mint_batch_transaction_wrong_identifier(self): + def test_get_mint_batch_transaction_wrong_identifier(self) -> None: """Test if get_mint_batch_transaction with wrong api identifier fails.""" # Test if function is not implemented for unknown ledger @@ -1085,7 +1088,7 @@ def test_get_mint_batch_transaction_wrong_identifier(self): ) @pytest.mark.ledger - def test_get_mint_single_transaction_wrong_identifier(self): + def test_get_mint_single_transaction_wrong_identifier(self) -> None: """Test if get_mint_single_transaction with wrong api identifier fails.""" # Test if function is not implemented for unknown ledger @@ -1100,7 +1103,7 @@ def test_get_mint_single_transaction_wrong_identifier(self): ) @pytest.mark.ledger - def test_get_balance_wrong_identifier(self): + def test_get_balance_wrong_identifier(self) -> None: """Test if get_balance with wrong api identifier fails.""" # Test if function is not implemented for unknown ledger @@ -1113,7 +1116,7 @@ def test_get_balance_wrong_identifier(self): ) @pytest.mark.ledger - def test_get_balance_wrong_query_res(self): + def test_get_balance_wrong_query_res(self) -> None: """Test if get_balance with wrong api identifier fails.""" # Create mock fetchai ledger that returns None on execute_contract_query @@ -1130,7 +1133,7 @@ def test_get_balance_wrong_query_res(self): ) @pytest.mark.ledger - def test_get_balances_wrong_query_res(self): + def test_get_balances_wrong_query_res(self) -> None: """Test if get_balances with wrong api identifier fails.""" # Create mock fetchai ledger that returns None on execute_contract_query @@ -1147,7 +1150,7 @@ def test_get_balances_wrong_query_res(self): ) @pytest.mark.ledger - def test_get_hash_batch_not_same(self): + def test_get_hash_batch_not_same(self) -> None: """Test if get_hash_batch returns ValueError when on-chain hash is not same as computed hash.""" self.ledger_api.identifier = "ethereum" @@ -1168,7 +1171,7 @@ def test_get_hash_batch_not_same(self): ) @pytest.mark.ledger - def test_generate_trade_nonce_if_exist(self): + def test_generate_trade_nonce_if_exist(self) -> None: """Test if generate_trade_nonce retries when nonce already exist.""" # Etherem ledger api mock @@ -1202,7 +1205,7 @@ def test_generate_trade_nonce_if_exist(self): assert is_nonce_used_mock.call.call_count == 2 @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_eth_no_signature(self): + def test_get_atomic_swap_single_transaction_eth_no_signature(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError if signature not present on Ethereum case.""" self.ledger_api.identifier = "ethereum" @@ -1222,7 +1225,7 @@ def test_get_atomic_swap_single_transaction_eth_no_signature(self): ) @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_eth_pubkeys(self): + def test_get_atomic_swap_single_transaction_eth_pubkeys(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError if pubkeys are present on Ethereum case.""" self.ledger_api.identifier = "ethereum" @@ -1245,7 +1248,7 @@ def test_get_atomic_swap_single_transaction_eth_pubkeys(self): ) @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_signature(self): + def test_get_atomic_swap_single_transaction_cosmos_signature(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError if signature is present on Cosmos/Fetch case.""" self.ledger_api.identifier = "fetchai" @@ -1268,7 +1271,7 @@ def test_get_atomic_swap_single_transaction_cosmos_signature(self): ) @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_valid(self): + def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_valid(self) -> None: """Test if get_atomic_swap_single_transaction allows one pubkey in case of only one direction of transfers.""" self.ledger_api.identifier = "fetchai" @@ -1289,7 +1292,7 @@ def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_valid(self): assert tx is not None @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_invalid(self): + def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_invalid(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError with missing from_pubkey.""" self.ledger_api.identifier = "fetchai" @@ -1310,7 +1313,7 @@ def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_invalid(self): ) @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing(self): + def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError with missing to_pubkey.""" self.ledger_api.identifier = "fetchai" @@ -1331,7 +1334,7 @@ def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing(self): ) @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_eth_pubkeys(self): + def test_get_atomic_swap_batch_transaction_eth_pubkeys(self) -> None: """Test if get_atomic_swap_batch_transaction returns RuntimeError if pubkeys are present on Ethereum case.""" self.ledger_api.identifier = "ethereum" @@ -1353,7 +1356,7 @@ def test_get_atomic_swap_batch_transaction_eth_pubkeys(self): ) @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_signature(self): + def test_get_atomic_swap_batch_transaction_cosmos_signature(self) -> None: """Test if get_atomic_swap_batch_transaction returns RuntimeError if signature is present on Cosmos/Fetch case.""" self.ledger_api.identifier = "fetchai" @@ -1376,7 +1379,7 @@ def test_get_atomic_swap_batch_transaction_cosmos_signature(self): ) @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_valid(self): + def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_valid(self) -> None: """Test if get_atomic_swap_batch_transaction allows one pubkey in case of only one direction of transfers.""" self.ledger_api.identifier = "fetchai" @@ -1397,7 +1400,7 @@ def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_valid(self): assert tx is not None @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_invalid(self): + def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_invalid(self) -> None: """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing from_pubkey.""" self.ledger_api.identifier = "fetchai" @@ -1418,7 +1421,7 @@ def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_invalid(self): ) @pytest.mark.ledger - def test_get_atomic_swap_ba_transaction_eth_no_signature(self): + def test_get_atomic_swap_ba_transaction_eth_no_signature(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError if signature not present on Ethereum case.""" self.ledger_api.identifier = "ethereum" @@ -1438,7 +1441,7 @@ def test_get_atomic_swap_ba_transaction_eth_no_signature(self): ) @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_to_pubkey_missing(self): + def test_get_atomic_swap_batch_transaction_cosmos_to_pubkey_missing(self) -> None: """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing to_pubkey.""" self.ledger_api.identifier = "fetchai" @@ -1503,7 +1506,7 @@ def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_missing_no_to_pubk ) @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_only(self): + def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_only(self) -> None: """Test if get_atomic_swap_batch_transaction returns Tx in case with only from_pubkey.""" self.ledger_api.identifier = "fetchai" @@ -1524,7 +1527,7 @@ def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_only(self): assert res is not None @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_amounts_missing(self): + def test_get_atomic_swap_single_transaction_amounts_missing(self) -> None: """Test if get_atomic_swap_single_transaction returns RuntimeError with missing amounts.""" self.ledger_api.identifier = "fetchai" @@ -1545,7 +1548,7 @@ def test_get_atomic_swap_single_transaction_amounts_missing(self): ) @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_amounts_missing(self): + def test_get_atomic_swap_batch_transaction_amounts_missing(self) -> None: """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing amounts.""" self.ledger_api.identifier = "fetchai" @@ -1610,7 +1613,7 @@ def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_missing_no_to_pub ) @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_only(self): + def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_only(self) -> None: """Test if get_atomic_swap_single_transaction returns Tx in case with only from_pubkey.""" self.ledger_api.identifier = "fetchai" diff --git a/packages/fetchai/skills/echo/tests/test_behaviours.py b/packages/fetchai/skills/echo/tests/test_behaviours.py index 99be0084f9..a18be71548 100644 --- a/packages/fetchai/skills/echo/tests/test_behaviours.py +++ b/packages/fetchai/skills/echo/tests/test_behaviours.py @@ -19,9 +19,9 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour class of the echo skill.""" -import os import inspect import logging +import os from pathlib import Path from typing import cast from unittest.mock import patch @@ -30,8 +30,10 @@ from packages.fetchai.skills.echo.behaviours import EchoBehaviour + CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore + class TestEchoBehaviour(BaseSkillTestCase): """Test EchoBehaviour behaviour of echo.""" diff --git a/packages/fetchai/skills/echo/tests/test_dialogues.py b/packages/fetchai/skills/echo/tests/test_dialogues.py index 87a8815c25..49f874ce42 100644 --- a/packages/fetchai/skills/echo/tests/test_dialogues.py +++ b/packages/fetchai/skills/echo/tests/test_dialogues.py @@ -19,8 +19,8 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the echo skill.""" -import os import inspect +import os from pathlib import Path from typing import cast @@ -29,6 +29,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.skills.echo.dialogues import DefaultDialogue, DefaultDialogues + CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore diff --git a/packages/fetchai/skills/echo/tests/test_handlers.py b/packages/fetchai/skills/echo/tests/test_handlers.py index faf3f41cc3..7d7e6656e7 100644 --- a/packages/fetchai/skills/echo/tests/test_handlers.py +++ b/packages/fetchai/skills/echo/tests/test_handlers.py @@ -19,9 +19,9 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the handler class of the echo skill.""" -import os import inspect import logging +import os from pathlib import Path from typing import cast from unittest.mock import patch @@ -36,6 +36,7 @@ CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore + class TestEchoHandler(BaseSkillTestCase): """Test EchoHandler of echo.""" From 7dcfbbfa22cbe504dc6478a4fe15c71c7aec78ca Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 11:25:03 +0000 Subject: [PATCH 26/93] chore: use test tools module to import constants --- tests/conftest.py | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index d26716de01..9277d8d561 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -47,9 +47,19 @@ from aea_cli_ipfs.ipfs_utils import IPFSDaemon # type: ignore from aea_ledger_cosmos import CosmosCrypto from aea_ledger_ethereum import EthereumCrypto -from aea_ledger_ethereum.ethereum import ( +from aea_ledger_ethereum.test_tools.constants import ( DEFAULT_EIP1559_STRATEGY, DEFAULT_GAS_STATION_STRATEGY, + ETHEREUM_ADDRESS_ONE, + ETHEREUM_ADDRESS_TWO, + ETHEREUM_PRIVATE_KEY_FILE, + ETHEREUM_PRIVATE_KEY_PATH, + ETHEREUM_PRIVATE_KEY_TWO_FILE, + ETHEREUM_PRIVATE_KEY_TWO_PATH, + ETHEREUM_TESTNET_CONFIG, + FUNDED_ETH_PRIVATE_KEY_1, + FUNDED_ETH_PRIVATE_KEY_2, + FUNDED_ETH_PRIVATE_KEY_3, ) from aea_ledger_fetchai import FetchAIApi, FetchAICrypto, FetchAIFaucetApi from cosmpy.aerial.client import LedgerClient, NetworkConfig @@ -76,8 +86,6 @@ from aea.crypto.ledger_apis import ( COSMOS_DEFAULT_ADDRESS, DEFAULT_LEDGER_CONFIGS, - ETHEREUM_DEFAULT_ADDRESS, - ETHEREUM_DEFAULT_CHAIN_ID, ETHEREUM_DEFAULT_CURRENCY_DENOM, FETCHAI_DEFAULT_ADDRESS, ) @@ -158,10 +166,8 @@ FETCHAI_PRIVATE_KEY_FILE_CONNECTION = "fetchai_connection_private_key.txt" COSMOS_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(CosmosCrypto.identifier) -ETHEREUM_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(EthereumCrypto.identifier) FETCHAI_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(FetchAICrypto.identifier) -ETHEREUM_PRIVATE_KEY_TWO_FILE = "ethereum_private_key_two.txt" DEFAULT_AMOUNT = 1000000000000000000000 GAS_PRICE_API_KEY = "" @@ -170,25 +176,11 @@ COSMOS_PRIVATE_KEY_PATH = os.path.join( ROOT_DIR, "tests", "data", COSMOS_PRIVATE_KEY_FILE ) -ETHEREUM_PRIVATE_KEY_PATH = os.path.join( - ROOT_DIR, "tests", "data", ETHEREUM_PRIVATE_KEY_FILE -) -ETHEREUM_PRIVATE_KEY_TWO_PATH = os.path.join( - ROOT_DIR, "tests", "data", ETHEREUM_PRIVATE_KEY_TWO_FILE -) FETCHAI_PRIVATE_KEY_PATH = os.path.join( ROOT_DIR, "tests", "data", FETCHAI_PRIVATE_KEY_FILE ) DEFAULT_PRIVATE_KEY_PATH = COSMOS_PRIVATE_KEY_PATH -FUNDED_ETH_PRIVATE_KEY_1 = ( - "0xa337a9149b4e1eafd6c21c421254cf7f98130233595db25f0f6f0a545fb08883" -) -FUNDED_ETH_PRIVATE_KEY_2 = ( - "0x04b4cecf78288f2ab09d1b4c60219556928f86220f0fb2dcfc05e6a1c1149dbf" -) -FUNDED_ETH_PRIVATE_KEY_3 = ( - "0x6F611408F7EF304947621C51A4B7D84A13A2B9786E9F984DA790A096E8260C64" -) + NON_FUNDED_COSMOS_PRIVATE_KEY_1 = ( "81b0352f99a08a754b56e529dda965c4ce974edb6db7e90035e01ed193e1b7bc" ) @@ -205,8 +197,6 @@ # addresses with no value on testnet COSMOS_ADDRESS_ONE = "cosmos1z4ftvuae5pe09jy2r7udmk6ftnmx504alwd5qf" COSMOS_ADDRESS_TWO = "cosmos1gssy8pmjdx8v4reg7lswvfktsaucp0w95nk78m" -ETHEREUM_ADDRESS_ONE = "0x46F415F7BF30f4227F98def9d2B22ff62738fD68" -ETHEREUM_ADDRESS_TWO = "0x7A1236d5195e31f1F573AD618b2b6FEFC85C5Ce6" FETCHAI_ADDRESS_ONE = "fetch1paqxtqnfh7da7z9c05l3y3lahe8rhd0nm0jk98" FETCHAI_ADDRESS_TWO = "fetch19j4dc3e6fgle98pj06l5ehhj6zdejcddx7teac" FUNDED_FETCHAI_ADDRESS_ONE = "fetch1k9dns2fd74644g0q9mfpsmfeqg0h2ym2cm6wdh" @@ -234,15 +224,6 @@ # testnets COSMOS_TESTNET_CONFIG = {"address": COSMOS_DEFAULT_ADDRESS} -ETHEREUM_TESTNET_CONFIG = { - "address": ETHEREUM_DEFAULT_ADDRESS, - "chain_id": ETHEREUM_DEFAULT_CHAIN_ID, - "default_gas_price_strategy": "gas_station", - "gas_price_strategies": { - "gas_station": DEFAULT_GAS_STATION_STRATEGY, - "eip1559": DEFAULT_EIP1559_STRATEGY, - }, -} FETCHAI_TESTNET_CONFIG = {"address": FETCHAI_DEFAULT_ADDRESS} # common public ids used in the tests From b599ad09a1d0ccb0391b5cb7621ee132c6516698 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 11:26:16 +0000 Subject: [PATCH 27/93] chore: linters --- scripts/whitelist.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/whitelist.py b/scripts/whitelist.py index 0c4ce9c4c7..c39faa62f3 100644 --- a/scripts/whitelist.py +++ b/scripts/whitelist.py @@ -306,3 +306,5 @@ to_v1_string # unused function (aea/cli/ipfs_hash.py:382) BTC_ENCODING # unused variable (aea/helpers/cid.py:32) is_cid # unused method (aea/helpers/cid.py:200) +GanacheDockerImage # unused class (aea/test_tools/docker_image.py:114) +launch_image # unused function (aea/test_tools/docker_image.py:183) From 579366b3168ce20043e5bccd91ba1426106a6c60 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 14:47:05 +0000 Subject: [PATCH 28/93] feat: add default registry path on test command --- aea/cli/test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index eb0a18ddd1..2b195d8cca 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -39,6 +39,7 @@ AEA_TEST_DIRNAME, CONNECTION, CONTRACT, + PACKAGES, PROTOCOL, SKILL, ) @@ -109,20 +110,19 @@ def skill(ctx: Context, skill_public_id: PublicId, args: Sequence[str]) -> None: @click.option( "--registry-path", type=click.Path(exists=True, file_okay=False, dir_okay=True), - required=True, ) @pytest_args @pass_ctx def by_path( ctx: Context, path: str, - registry_path: str, + registry_path: Optional[str], args: Sequence[str], ) -> None: """Executes a test suite of a package specified by a path.""" click.echo(f"Executing tests of package at {path}'...") full_path = Path(ctx.cwd) / Path(path) - registry_path = Path(registry_path) + registry_path = Path(registry_path or Path.cwd() / PACKAGES) test_package_by_path(full_path, args, packages_dir=registry_path) From a8918a874db78a53e5b276ea921419685ea6a274 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 14:47:38 +0000 Subject: [PATCH 29/93] feat: port mocks module to test_tools --- aea/test_tools/mocks.py | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 aea/test_tools/mocks.py diff --git a/aea/test_tools/mocks.py b/aea/test_tools/mocks.py new file mode 100644 index 0000000000..e85e4ec1c9 --- /dev/null +++ b/aea/test_tools/mocks.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains mocking utils testing purposes.""" +import re +import unittest +from contextlib import contextmanager +from typing import Generator +from unittest.mock import MagicMock + + +class AnyStringWith(str): + """ + Helper class to assert calls of mocked method with string arguments. + + It will use string inclusion as equality comparator. + """ + + def __eq__(self, other): + """Check equality.""" + return self in other + + +class RegexComparator(str): + """ + Helper class to assert calls of mocked method with string arguments. + + It will use regex matching as equality comparator. + """ + + def __eq__(self, other): + """Check equality.""" + regex = re.compile(str(self), re.MULTILINE | re.DOTALL) + s = str(other) + return bool(regex.search(s)) + + +@contextmanager +def ctx_mock_Popen() -> Generator: + """ + Mock subprocess.Popen. + + Act as context manager. + + :return: mock object. + """ + return_value = MagicMock() + return_value.communicate.return_value = (MagicMock(), MagicMock()) + + with unittest.mock.patch("subprocess.Popen", return_value=return_value) as mocked: + yield mocked From 63019eedf49e636d5e9c82e5db5ce6fe4db7eaf9 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 14:48:10 +0000 Subject: [PATCH 30/93] feat: introduce network module in test_tools --- aea/test_tools/network.py | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 aea/test_tools/network.py diff --git a/aea/test_tools/network.py b/aea/test_tools/network.py new file mode 100644 index 0000000000..1763f70885 --- /dev/null +++ b/aea/test_tools/network.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Helper utils.""" + +import socket +from urllib.parse import urlparse + + +LOCALHOST = urlparse("http://127.0.0.1") + + +def get_unused_tcp_port(): + """Get an unused TCP port.""" + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.bind((LOCALHOST.hostname, 0)) + s.listen(1) + port = s.getsockname()[1] + s.close() + return port + + +def get_host(): + """Get the host.""" + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + try: + # doesn't even have to be reachable + s.connect(("10.255.255.255", 1)) + IP = s.getsockname()[0] + except Exception: + IP = LOCALHOST.hostname + finally: + s.close() + return IP From db28e61a2c777176d7f99e52cc6b56388c7ee679 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 14:49:05 +0000 Subject: [PATCH 31/93] chore: update constants --- aea/test_tools/constants.py | 6 +++ tests/conftest.py | 53 ++++++------------- .../test_p2p_libp2p/test_aea_cli.py | 4 +- .../test_p2p_libp2p_client/test_aea_cli.py | 4 +- 4 files changed, 27 insertions(+), 40 deletions(-) diff --git a/aea/test_tools/constants.py b/aea/test_tools/constants.py index c1957cfeed..35955af6cf 100644 --- a/aea/test_tools/constants.py +++ b/aea/test_tools/constants.py @@ -20,4 +20,10 @@ """This is a module with constants for test tools.""" +from aea.configurations.data_types import PublicId + + DEFAULT_AUTHOR = "default_author" + +UNKNOWN_PROTOCOL_PUBLIC_ID = PublicId("unknown_author", "unknown_protocol", "0.1.0") +UNKNOWN_CONNECTION_PUBLIC_ID = PublicId("unknown_author", "unknown_connection", "0.1.0") diff --git a/tests/conftest.py b/tests/conftest.py index 9277d8d561..2bcd3bb4a5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -49,19 +49,20 @@ from aea_ledger_ethereum import EthereumCrypto from aea_ledger_ethereum.test_tools.constants import ( DEFAULT_EIP1559_STRATEGY, - DEFAULT_GAS_STATION_STRATEGY, - ETHEREUM_ADDRESS_ONE, - ETHEREUM_ADDRESS_TWO, - ETHEREUM_PRIVATE_KEY_FILE, ETHEREUM_PRIVATE_KEY_PATH, - ETHEREUM_PRIVATE_KEY_TWO_FILE, ETHEREUM_PRIVATE_KEY_TWO_PATH, - ETHEREUM_TESTNET_CONFIG, FUNDED_ETH_PRIVATE_KEY_1, FUNDED_ETH_PRIVATE_KEY_2, FUNDED_ETH_PRIVATE_KEY_3, ) from aea_ledger_fetchai import FetchAIApi, FetchAICrypto, FetchAIFaucetApi +from aea_ledger_fetchai.test_tools.constants import ( + FETCHAI_P2P_ADDRESS, + FETCHAI_TESTNET_CONFIG, + FUNDED_FETCHAI_ADDRESS_ONE, + FUNDED_FETCHAI_ADDRESS_TWO, + FUNDED_FETCHAI_PRIVATE_KEY_1, +) from cosmpy.aerial.client import LedgerClient, NetworkConfig from cosmpy.aerial.wallet import LocalWallet from cosmpy.crypto.address import Address as CosmpyAddress @@ -87,7 +88,6 @@ COSMOS_DEFAULT_ADDRESS, DEFAULT_LEDGER_CONFIGS, ETHEREUM_DEFAULT_CURRENCY_DENOM, - FETCHAI_DEFAULT_ADDRESS, ) from aea.crypto.registries import ledger_apis_registry, make_crypto, make_ledger_api from aea.crypto.wallet import CryptoStore @@ -96,6 +96,7 @@ from aea.identity.base import Identity from aea.test_tools.click_testing import CliRunner as ImportedCliRunner from aea.test_tools.constants import DEFAULT_AUTHOR +from aea.test_tools.network import LOCALHOST from aea.test_tools.test_cases import BaseAEATestCase from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection @@ -140,10 +141,9 @@ DUMMY_ENV = gym.GoalEnv -LOCAL_HOST = urlparse("http://127.0.0.1") # URL to local Ganache instance -DEFAULT_GANACHE_ADDR = LOCAL_HOST.geturl() +DEFAULT_GANACHE_ADDR = LOCALHOST.geturl() DEFAULT_GANACHE_PORT = 8545 DEFAULT_GANACHE_CHAIN_ID = 1337 DEFAULT_MAX_PRIORITY_FEE_PER_GAS = 1_000_000_000 @@ -151,7 +151,7 @@ # URL to local Fetch ledger instance DEFAULT_FETCH_DOCKER_IMAGE_TAG = "fetchai/fetchd:0.10.2" -DEFAULT_FETCH_LEDGER_ADDR = LOCAL_HOST.geturl() +DEFAULT_FETCH_LEDGER_ADDR = LOCALHOST.geturl() DEFAULT_FETCH_LEDGER_RPC_PORT = 26657 DEFAULT_FETCH_LEDGER_REST_PORT = 1317 DEFAULT_FETCH_ADDR_REMOTE = "https://rest-dorado.fetch.ai:443" @@ -163,10 +163,7 @@ FETCHD_INITIAL_TX_SLEEP = 6 COSMOS_PRIVATE_KEY_FILE_CONNECTION = "cosmos_connection_private_key.txt" -FETCHAI_PRIVATE_KEY_FILE_CONNECTION = "fetchai_connection_private_key.txt" - COSMOS_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(CosmosCrypto.identifier) -FETCHAI_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(FetchAICrypto.identifier) DEFAULT_AMOUNT = 1000000000000000000000 @@ -176,35 +173,21 @@ COSMOS_PRIVATE_KEY_PATH = os.path.join( ROOT_DIR, "tests", "data", COSMOS_PRIVATE_KEY_FILE ) -FETCHAI_PRIVATE_KEY_PATH = os.path.join( - ROOT_DIR, "tests", "data", FETCHAI_PRIVATE_KEY_FILE -) + DEFAULT_PRIVATE_KEY_PATH = COSMOS_PRIVATE_KEY_PATH NON_FUNDED_COSMOS_PRIVATE_KEY_1 = ( "81b0352f99a08a754b56e529dda965c4ce974edb6db7e90035e01ed193e1b7bc" ) -NON_FUNDED_FETCHAI_PRIVATE_KEY_1 = ( - "b6ef49c3078f300efe2d4480e179362bd39f20cbb2087e970c8f345473661aa5" -) -FUNDED_FETCHAI_PRIVATE_KEY_1 = ( - "bbaef7511f275dc15f47436d14d6d3c92d4d01befea073d23d0c2750a46f6cb3" -) -FUNDED_FETCHAI_PRIVATE_KEY_2 = ( - "9d6459d1f93dd153335291af940f6b5224a34a9a1e1062e2158a45fa4901ed3f" -) # addresses with no value on testnet COSMOS_ADDRESS_ONE = "cosmos1z4ftvuae5pe09jy2r7udmk6ftnmx504alwd5qf" COSMOS_ADDRESS_TWO = "cosmos1gssy8pmjdx8v4reg7lswvfktsaucp0w95nk78m" -FETCHAI_ADDRESS_ONE = "fetch1paqxtqnfh7da7z9c05l3y3lahe8rhd0nm0jk98" -FETCHAI_ADDRESS_TWO = "fetch19j4dc3e6fgle98pj06l5ehhj6zdejcddx7teac" -FUNDED_FETCHAI_ADDRESS_ONE = "fetch1k9dns2fd74644g0q9mfpsmfeqg0h2ym2cm6wdh" -FUNDED_FETCHAI_ADDRESS_TWO = "fetch1x2vfp8ec2yk8nnlzn52agflpmpwtucm6yj2hw4" + # P2P addresses COSMOS_P2P_ADDRESS = "/dns4/127.0.0.1/tcp/9000/p2p/16Uiu2HAmAzvu5uNbcnD2qaqrkSULhJsc6GJUg3iikWerJkoD72pr" # relates to NON_FUNDED_COSMOS_PRIVATE_KEY_1 -FETCHAI_P2P_ADDRESS = "/dns4/127.0.0.1/tcp/9000/p2p/16Uiu2HAmLBCAqHL8SuFosyDhAKYsLKXBZBWXBsB9oFw2qU4Kckun" # relates to NON_FUNDED_FETCHAI_PRIVATE_KEY_1 + NON_GENESIS_CONFIG = { "delegate_uri": "127.0.0.1:11001", "entry_peers": [FETCHAI_P2P_ADDRESS], @@ -224,11 +207,9 @@ # testnets COSMOS_TESTNET_CONFIG = {"address": COSMOS_DEFAULT_ADDRESS} -FETCHAI_TESTNET_CONFIG = {"address": FETCHAI_DEFAULT_ADDRESS} # common public ids used in the tests -UNKNOWN_PROTOCOL_PUBLIC_ID = PublicId("unknown_author", "unknown_protocol", "0.1.0") -UNKNOWN_CONNECTION_PUBLIC_ID = PublicId("unknown_author", "unknown_connection", "0.1.0") + MY_FIRST_AEA_PUBLIC_ID = PublicId.from_str("fetchai/my_first_aea:0.27.0") DUMMY_SKILL_PATH = os.path.join(CUR_PATH, "data", "dummy_skill", SKILL_YAML) @@ -338,7 +319,7 @@ ), ] -DEFAULT_HOST = LOCAL_HOST.hostname +DEFAULT_HOST = LOCALHOST.hostname def remove_test_directory(directory: str, retries: int = 3) -> bool: @@ -755,7 +736,7 @@ def reset_aea_cli_config() -> None: def get_unused_tcp_port(): """Get an unused TCP port.""" s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.bind((LOCAL_HOST.hostname, 0)) + s.bind((LOCALHOST.hostname, 0)) s.listen(1) port = s.getsockname()[1] s.close() @@ -770,7 +751,7 @@ def get_host(): s.connect(("10.255.255.255", 1)) IP = s.getsockname()[0] except Exception: - IP = LOCAL_HOST.hostname + IP = LOCALHOST.hostname finally: s.close() return IP diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py index 52a24d3db2..09a729e9a4 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py @@ -34,7 +34,7 @@ PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID, ) -from tests.conftest import DEFAULT_LEDGER, LOCAL_HOST +from tests.conftest import DEFAULT_LEDGER, LOCALHOST from tests.test_packages.test_connections.test_p2p_libp2p.base import ( LIBP2P_CERT_NOT_AFTER, LIBP2P_CERT_NOT_BEFORE, @@ -207,7 +207,7 @@ def test_agent(self): # setup a full node: with public uri, relay service, and delegate service config_path = f"{p2p_libp2p_path}.config" - hostname = LOCAL_HOST.hostname + hostname = LOCALHOST.hostname self.set_config(f"{config_path}.local_uri", f"{hostname}:{next(ports)}") self.set_config(f"{config_path}.public_uri", f"{hostname}:{next(ports)}") self.set_config(f"{config_path}.delegate_uri", f"{hostname}:{next(ports)}") diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py index 4d0012fb07..18596f522b 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py @@ -28,7 +28,7 @@ from packages.valory.connections import p2p_libp2p_client from packages.valory.connections.p2p_libp2p_client.connection import PUBLIC_ID -from tests.conftest import DEFAULT_LEDGER, LOCAL_HOST +from tests.conftest import DEFAULT_LEDGER, LOCALHOST from tests.test_packages.test_connections.test_p2p_libp2p.base import ( _make_libp2p_connection, libp2p_log_on_failure_all, @@ -37,7 +37,7 @@ ) -DEFAULT_HOST = LOCAL_HOST.hostname +DEFAULT_HOST = LOCALHOST.hostname DEFAULT_CLIENTS_PER_NODE = 4 DEFAULT_LAUNCH_TIMEOUT = 10 From adb46b44afa7d4c5fbacd9b1863ed6a5f844a0b9 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 14:49:46 +0000 Subject: [PATCH 32/93] feat: update constants on fetchai ledger plugin --- .../test_tools/fixture_helpers.py | 4 +-- .../test_tools/constants.py | 26 +++++++++++++++++++ .../test_tools/data/fetchai_private_key.txt | 1 + 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/data/fetchai_private_key.txt diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py index 9607dfa6e0..3dff4887ad 100644 --- a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py @@ -34,10 +34,10 @@ ) from aea.test_tools.docker_image import GanacheDockerImage, launch_image +from aea.test_tools.network import LOCALHOST -LOCAL_HOST = urlparse("http://127.0.0.1") -DEFAULT_GANACHE_ADDR = LOCAL_HOST.geturl() +DEFAULT_GANACHE_ADDR = LOCALHOST.geturl() DEFAULT_GANACHE_PORT = 8545 DEFAULT_GANACHE_CHAIN_ID = 1337 DEFAULT_AMOUNT = 1000000000000000000000 diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py index 115e7d6628..8e4959e58a 100644 --- a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/constants.py @@ -20,11 +20,37 @@ """Constants.""" +import os from pathlib import Path +from aea_ledger_fetchai.fetchai import FetchAICrypto + +from aea.configurations.constants import PRIVATE_KEY_PATH_SCHEMA from aea.crypto.ledger_apis import FETCHAI_DEFAULT_ADDRESS DATA_DIR = Path(__file__).parent / "data" FETCHAI_TESTNET_CONFIG = {"address": FETCHAI_DEFAULT_ADDRESS} + +FETCHAI_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(FetchAICrypto.identifier) +FETCHAI_PRIVATE_KEY_FILE_CONNECTION = "fetchai_connection_private_key.txt" + +FETCHAI_ADDRESS_ONE = "fetch1paqxtqnfh7da7z9c05l3y3lahe8rhd0nm0jk98" +FETCHAI_ADDRESS_TWO = "fetch19j4dc3e6fgle98pj06l5ehhj6zdejcddx7teac" +FUNDED_FETCHAI_ADDRESS_ONE = "fetch1k9dns2fd74644g0q9mfpsmfeqg0h2ym2cm6wdh" +FUNDED_FETCHAI_ADDRESS_TWO = "fetch1x2vfp8ec2yk8nnlzn52agflpmpwtucm6yj2hw4" + +NON_FUNDED_FETCHAI_PRIVATE_KEY_1 = ( + "b6ef49c3078f300efe2d4480e179362bd39f20cbb2087e970c8f345473661aa5" +) +FUNDED_FETCHAI_PRIVATE_KEY_1 = ( + "bbaef7511f275dc15f47436d14d6d3c92d4d01befea073d23d0c2750a46f6cb3" +) +FUNDED_FETCHAI_PRIVATE_KEY_2 = ( + "9d6459d1f93dd153335291af940f6b5224a34a9a1e1062e2158a45fa4901ed3f" +) + +FETCHAI_P2P_ADDRESS = "/dns4/127.0.0.1/tcp/9000/p2p/16Uiu2HAmLBCAqHL8SuFosyDhAKYsLKXBZBWXBsB9oFw2qU4Kckun" # relates to NON_FUNDED_FETCHAI_PRIVATE_KEY_1 + +FETCHAI_PRIVATE_KEY_PATH = os.path.join(DATA_DIR, FETCHAI_PRIVATE_KEY_FILE) diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/data/fetchai_private_key.txt b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/data/fetchai_private_key.txt new file mode 100644 index 0000000000..354995852b --- /dev/null +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/data/fetchai_private_key.txt @@ -0,0 +1 @@ +6d56fd47e98465824aa85dfe620ad3dbf092b772abc6c6a182e458b5c56ad13b \ No newline at end of file From c2fa221b659ad840f9f36244835e8f7b30faab53 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:18:56 +0000 Subject: [PATCH 33/93] feat: port client connection tests to package --- .../connections/http_client/connection.yaml | 2 + .../connections/http_client/tests/__init__.py | 20 + .../http_client/tests/test_http_client.py | 357 ++++++++++++++++++ 3 files changed, 379 insertions(+) create mode 100644 packages/fetchai/connections/http_client/tests/__init__.py create mode 100644 packages/fetchai/connections/http_client/tests/test_http_client.py diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index 9c840e331b..e369ed2865 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -10,6 +10,8 @@ fingerprint: README.md: bafybeibx4ko4f5xbgozqlgfnxwc3rksm5b7khtikf46izrlndjrojv2lw4 __init__.py: bafybeiateb3vma46yihntj5gbai3eqcy3fkx55lkrwye6tbr4cuo5xktdm connection.py: bafybeihlwvleotrr5cgzokgcia7wek36c7pcflbuaminiqgvdrt2iuihoe + tests/__init__.py: bafybeic5mqiqjs46dbrhwepcsgm6wkq5az5lzzi2gtavcyskn4cbe2yuvi + tests/test_http_client.py: bafybeiclx3iqqx3fo54puqaen22avlpofwzprqeebbza2pgjpvddexvppm fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/http_client/tests/__init__.py b/packages/fetchai/connections/http_client/tests/__init__.py new file mode 100644 index 0000000000..c7f4dc6bcc --- /dev/null +++ b/packages/fetchai/connections/http_client/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the HTTP client connection implementation.""" diff --git a/packages/fetchai/connections/http_client/tests/test_http_client.py b/packages/fetchai/connections/http_client/tests/test_http_client.py new file mode 100644 index 0000000000..2b74ceff3e --- /dev/null +++ b/packages/fetchai/connections/http_client/tests/test_http_client.py @@ -0,0 +1,357 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""Tests for the HTTP Client connection and channel.""" +import asyncio +import logging +from asyncio import CancelledError +from typing import cast +from unittest.mock import MagicMock, Mock, patch + +import aiohttp +import pytest + +from aea.common import Address +from aea.configurations.base import ConnectionConfig +from aea.identity.base import Identity +from aea.mail.base import Envelope, Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.test_tools.constants import UNKNOWN_PROTOCOL_PUBLIC_ID +from aea.test_tools.mocks import AnyStringWith +from aea.test_tools.network import get_host, get_unused_tcp_port + +from packages.fetchai.connections.http_client.connection import HTTPClientConnection +from packages.fetchai.protocols.http.dialogues import HttpDialogue +from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues +from packages.fetchai.protocols.http.message import HttpMessage + + +logger = logging.getLogger(__name__) + + +class _MockRequest: + """Fake request for aiohttp client session.""" + + def __init__(self, response: Mock) -> None: + """Init with mock response.""" + self.response = response + + async def __aenter__(self) -> Mock: + """Enter async context.""" + return self.response + + async def __aexit__(self, *args, **kwargs) -> None: + """Exit async context.""" + return None + + +class HttpDialogues(BaseHttpDialogues): + """The dialogues class keeps track of all http dialogues.""" + + def __init__(self, self_address: Address, **kwargs) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return HttpDialogue.Role.CLIENT + + BaseHttpDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + ) + + +@pytest.mark.asyncio +class TestHTTPClientConnect: + """Tests the http client connection's 'connect' functionality.""" + + def setup(self): + """Initialise the class.""" + self.address = get_host() + self.port = get_unused_tcp_port() + self.agent_identity = Identity( + "name", address="some string", public_key="some public_key" + ) + self.client_skill_id = "some/skill:0.1.0" + configuration = ConnectionConfig( + host=self.address, + port=self.port, + connection_id=HTTPClientConnection.connection_id, + ) + self.http_client_connection = HTTPClientConnection( + configuration=configuration, + data_dir=MagicMock(), + identity=self.agent_identity, + ) + self.connection_address = str(HTTPClientConnection.connection_id) + self.http_dialogs = HttpDialogues(self.client_skill_id) + + @pytest.mark.asyncio + async def test_initialization(self): + """Test the initialisation of the class.""" + assert self.http_client_connection.address == self.agent_identity.address + + @pytest.mark.asyncio + async def test_connection(self): + """Test the connect functionality of the http client connection.""" + await self.http_client_connection.connect() + assert self.http_client_connection.is_connected is True + + @pytest.mark.asyncio + async def test_disconnect(self): + """Test the disconnect functionality of the http client connection.""" + await self.http_client_connection.connect() + assert self.http_client_connection.is_connected is True + + await self.http_client_connection.disconnect() + assert self.http_client_connection.is_connected is False + + @pytest.mark.asyncio + async def test_http_send_error(self): + """Test request fails and send back result with code 600.""" + await self.http_client_connection.connect() + request_http_message, _ = self.http_dialogs.create( + counterparty=self.connection_address, + performative=HttpMessage.Performative.REQUEST, + method="get", + url="bad url", + headers="", + version="", + body=b"", + ) + request_envelope = Envelope( + to=self.connection_address, + sender=self.client_skill_id, + protocol_specification_id=UNKNOWN_PROTOCOL_PUBLIC_ID, + message=request_http_message, + ) + + connection_response_mock = Mock() + connection_response_mock.status_code = 200 + + await self.http_client_connection.send(envelope=request_envelope) + # TODO: Consider returning the response from the server in order to be able to assert that the message send! + envelope = await asyncio.wait_for( + self.http_client_connection.receive(), timeout=10 + ) + assert envelope + assert envelope.message.status_code == 600 + + await self.http_client_connection.disconnect() + + @pytest.mark.asyncio + async def test_http_client_send_not_connected_error(self): + """Test connection.send error if not conencted.""" + with pytest.raises(ConnectionError): + await self.http_client_connection.send(Mock()) + + @pytest.mark.asyncio + async def test_http_channel_send_not_connected_error(self): + """Test channel.send error if not conencted.""" + with pytest.raises(ValueError): + self.http_client_connection.channel.send(Mock()) + + @pytest.mark.asyncio + async def test_send_empty_envelope_skip(self): + """Test skip on empty envelope request sent.""" + await self.http_client_connection.connect() + with patch.object( + self.http_client_connection.channel, "_http_request_task" + ) as mock: + await self.http_client_connection.send(None) + mock.assert_not_called() + + @pytest.mark.asyncio + async def test_channel_get_message_not_connected(self): + """Test errro on message get if not connected.""" + with pytest.raises(ValueError): + await self.http_client_connection.channel.get_message() + + @pytest.mark.asyncio + async def test_channel_cancel_tasks_on_disconnect(self): + """Test requests tasks cancelled on disconnect.""" + await self.http_client_connection.connect() + request_http_message, _ = self.http_dialogs.create( + counterparty=self.connection_address, + performative=HttpMessage.Performative.REQUEST, + method="get", + url="https://not-a-google.com", + headers="", + version="", + body=b"", + ) + request_envelope = Envelope( + to=self.connection_address, + sender=self.client_skill_id, + protocol_specification_id=UNKNOWN_PROTOCOL_PUBLIC_ID, + message=request_http_message, + ) + + connection_response_mock = Mock() + connection_response_mock.status_code = 200 + + response_mock = Mock() + response_mock.status = 200 + response_mock.headers = {"headers": "some header"} + response_mock.reason = "OK" + response_mock._body = b"Some content" + response_mock.read.return_value = asyncio.Future() + + with patch.object( + aiohttp.ClientSession, + "request", + return_value=_MockRequest(response_mock), + ): + await self.http_client_connection.send(envelope=request_envelope) + + assert self.http_client_connection.channel._tasks + task = list(self.http_client_connection.channel._tasks)[0] + assert not task.done() + await self.http_client_connection.disconnect() + + assert not self.http_client_connection.channel._tasks + assert task.done() + with pytest.raises(CancelledError): + await task + + @pytest.mark.asyncio + async def test_http_send_ok(self): + """Test request is ok cause mocked.""" + await self.http_client_connection.connect() + request_http_message, sending_dialogue = self.http_dialogs.create( + counterparty=self.connection_address, + performative=HttpMessage.Performative.REQUEST, + method="get", + url="https://not-a-google.com", + headers="", + version="", + body=b"", + ) + request_envelope = Envelope( + to=self.connection_address, + sender=self.client_skill_id, + message=request_http_message, + ) + + connection_response_mock = Mock() + connection_response_mock.status_code = 200 + + response_mock = Mock() + response_mock.status = 200 + response_mock.headers = {"headers": "some header"} + response_mock.reason = "OK" + response_mock._body = b"Some content" + response_mock.read.return_value = asyncio.Future() + response_mock.read.return_value.set_result("") + + with patch.object( + aiohttp.ClientSession, + "request", + return_value=_MockRequest(response_mock), + ): + await self.http_client_connection.send(envelope=request_envelope) + # TODO: Consider returning the response from the server in order to be able to assert that the message send! + envelope = await asyncio.wait_for( + self.http_client_connection.receive(), timeout=10 + ) + + assert envelope is not None and envelope.message is not None + message = envelope.message + response_dialogue = self.http_dialogs.update(message) + assert message.status_code == response_mock.status, message.body.decode("utf-8") + assert sending_dialogue == response_dialogue + await self.http_client_connection.disconnect() + + @pytest.mark.asyncio + async def test_http_dialogue_construct_fail(self): + """Test dialogue not properly constructed.""" + await self.http_client_connection.connect() + + incorrect_http_message = HttpMessage( + dialogue_reference=self.http_dialogs.new_self_initiated_dialogue_reference(), + performative=HttpMessage.Performative.RESPONSE, + status_code=500, + headers="", + status_text="", + body=b"", + version="", + ) + incorrect_http_message.to = self.connection_address + incorrect_http_message.sender = self.client_skill_id + + # the incorrect message cannot be sent into a dialogue, so this is omitted. + + envelope = Envelope( + to=incorrect_http_message.to, + sender=incorrect_http_message.sender, + message=incorrect_http_message, + ) + with patch.object( + self.http_client_connection.channel.logger, "warning" + ) as mock_logger: + await self.http_client_connection.channel._http_request_task(envelope) + mock_logger.assert_any_call( + AnyStringWith("Could not create dialogue for message=") + ) + + @pytest.mark.asyncio + async def test_http_send_exception(self): + """Test request is ok cause mocked.""" + await self.http_client_connection.connect() + request_http_message, sending_dialogue = self.http_dialogs.create( + counterparty=self.connection_address, + performative=HttpMessage.Performative.REQUEST, + method="get", + url="https://not-a-google.com", + headers="", + version="", + body=b"", + ) + request_envelope = Envelope( + to=self.connection_address, + sender=self.client_skill_id, + message=request_http_message, + ) + + with patch.object( + aiohttp.ClientSession, + "request", + side_effect=asyncio.TimeoutError("expected exception"), + ): + await self.http_client_connection.send(envelope=request_envelope) + envelope = await asyncio.wait_for( + self.http_client_connection.receive(), timeout=10 + ) + + assert envelope + message = cast(HttpMessage, envelope.message) + assert message.performative == HttpMessage.Performative.RESPONSE + assert b"expected exception" in message.body From f383a7cbeae3f8569b3348f0e63b3ed924c016b2 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:19:34 +0000 Subject: [PATCH 34/93] feat: port http server connection tests to packages --- .../connections/http_server/connection.yaml | 6 + .../connections/http_server/tests/__init__.py | 19 + .../http_server/tests/data/certs/server.crt | 17 + .../http_server/tests/data/certs/server.csr | 15 + .../http_server/tests/data/certs/server.key | 27 + .../http_server/tests/data/petstore_sim.yaml | 111 ++++ .../http_server/tests/test_http_server.py | 593 ++++++++++++++++++ 7 files changed, 788 insertions(+) create mode 100644 packages/fetchai/connections/http_server/tests/__init__.py create mode 100644 packages/fetchai/connections/http_server/tests/data/certs/server.crt create mode 100644 packages/fetchai/connections/http_server/tests/data/certs/server.csr create mode 100644 packages/fetchai/connections/http_server/tests/data/certs/server.key create mode 100644 packages/fetchai/connections/http_server/tests/data/petstore_sim.yaml create mode 100644 packages/fetchai/connections/http_server/tests/test_http_server.py diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index e54af65ae9..23cfb7ca79 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -10,6 +10,12 @@ fingerprint: README.md: bafybeihkuhhsdfw5qqtz2jwpfppub6yvsehzmvmaqjlxnal4v76x47mcrq __init__.py: bafybeif5pkr5oarwd7yagdgn46miolmdmvgdyxv4kadgws2bf3iwshom24 connection.py: bafybeicqhb5zrdmjt6vtb253luc7nfr4p4vrxkmniigqsokgatrsoeptoa + tests/__init__.py: bafybeiewlnh2eycgprywqi54fy766qorufe4qpjip4son4zvebwtut3p2m + tests/data/certs/server.crt: bafybeiev5i3xxkvn36wflf633gkumuxexsw4y2bubwbvl7edrz4igfgv34 + tests/data/certs/server.csr: bafybeicvp7xdl5w3o4bzikkudpduitss3bpp6xqfwlxbw6kabdangohy5u + tests/data/certs/server.key: bafybeiabvpkpqr4fctrbssfal6pviv5otgmu32qyrfpyhcql5wgmlzjtoe + tests/data/petstore_sim.yaml: bafybeiaekkfxljlv57uviz4ug6isdqbzsnuxpsgy3dvhzh22daql3xh2i4 + tests/test_http_server.py: bafybeic5pemoh6utlnhjo6e2dytloxzhzirogzidexvowqq3uxlqz7slym fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/http_server/tests/__init__.py b/packages/fetchai/connections/http_server/tests/__init__.py new file mode 100644 index 0000000000..8b4d45bce1 --- /dev/null +++ b/packages/fetchai/connections/http_server/tests/__init__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the HTTP Server connection implementation.""" diff --git a/packages/fetchai/connections/http_server/tests/data/certs/server.crt b/packages/fetchai/connections/http_server/tests/data/certs/server.crt new file mode 100644 index 0000000000..b2ae04f896 --- /dev/null +++ b/packages/fetchai/connections/http_server/tests/data/certs/server.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICsTCCAZkCFGqNcoSHEADDJ5wZBtczunKoFWBVMA0GCSqGSIb3DQEBCwUAMBQx +EjAQBgNVBAMMCWxvY2FsaG9zdDAgFw0yMTA5MDYwOTU2MTVaGA8yMTIxMDgxMzA5 +NTYxNVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC +AQ8AMIIBCgKCAQEAxX8TpWN5cE9oGotbTlEDVst1at0ZgYlgKwCVconrOQ77AhD4 +MyJZ++Poy2i9N1JKYclT9ZrSRtqh+djILaCVeHHgwqFgwpGJuupunv/5o8fX9k1/ +YUs3MQou9STiOLS+B/MK25Fi/LUvr1ZYJzAViekgV1yv7Sn/n2mpQe66ByyNZt3D +Tzid9f3d7FHY6HBkxaoaUxkSIJeHcHy6qUXdiEeoPWBbkp6JjFqKW6mynwnDP4Wc +zGerRtLo69rxtaaES0aboOjA6bk1Ab+4XmSH+Kv6r7CzArLFHJO+ZUU6Pqxd2ehR +L9qicTzOQyN7ygVlBwZWpioOSRzGROgrNhQniQIDAQABMA0GCSqGSIb3DQEBCwUA +A4IBAQBxSEAWtXQUq8qW8XHRcw1loBoxIus1+ajkMX9/pN0SFuNBq8P61TLtMjM1 +G0czcgyXVqjMFtudY+CJa6yn+WWnp6oqDkjcu8Z5SdFfM677pQwF4R1nylb1aLP+ +X+7NxVIs2pHNzYvxRm/OQ1Q6rVWVq3omludCcxHd3+y5kW5enG1Dp2yLXsdatNjj +2DzLF2WNMVXuXmFC9GVZpSsP5qCYD8rfqNvLaV6oxZ+woJ+UX8Q5YlEB1/2LtRBf +x+XiiKXY2h4ZTHGjCO+Pu6FKOxf4JxWoBirCe7WOjfOJUdQYLOk6nT+qSP8iLFaS +/DBRpBw/kJjec5xedh2CZOEC8NLw +-----END CERTIFICATE----- diff --git a/packages/fetchai/connections/http_server/tests/data/certs/server.csr b/packages/fetchai/connections/http_server/tests/data/certs/server.csr new file mode 100644 index 0000000000..b11586e882 --- /dev/null +++ b/packages/fetchai/connections/http_server/tests/data/certs/server.csr @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAxX8TpWN5cE9oGotbTlEDVst1at0ZgYlgKwCVconr +OQ77AhD4MyJZ++Poy2i9N1JKYclT9ZrSRtqh+djILaCVeHHgwqFgwpGJuupunv/5 +o8fX9k1/YUs3MQou9STiOLS+B/MK25Fi/LUvr1ZYJzAViekgV1yv7Sn/n2mpQe66 +ByyNZt3DTzid9f3d7FHY6HBkxaoaUxkSIJeHcHy6qUXdiEeoPWBbkp6JjFqKW6my +nwnDP4WczGerRtLo69rxtaaES0aboOjA6bk1Ab+4XmSH+Kv6r7CzArLFHJO+ZUU6 +Pqxd2ehRL9qicTzOQyN7ygVlBwZWpioOSRzGROgrNhQniQIDAQABoAAwDQYJKoZI +hvcNAQELBQADggEBAH9MeBQNrb081LoPDk3C/C4zH6BoVtxkQXoPXGv6+wijNju5 +wAUZc26VGdawW3Scqj9kboObi5NwI7o8ZMsOx2V8MT5FjSl79DoAszwww19J48J4 +6qGRPuph3c48Gz1eZCCQscaEG4pYqdL3aS6Jt/HmKkZGIAZvNGwzaBOGTIJTZHSU +9W9gV3RAL1unLgZKYAmKVStFtCOjARbn0wlBOeT2nkqRsckACgxxDNAjDPmKVmUK +x6BSPttFWIVc/FXvkIBpwbxKAlwK9amtko0VGgw3WC7kBq13/ijNeQV/PaqFbSWF +MshUv0YLv0aKVwFN1oRYiDYuwSXyRK5PYW4VNhQ= +-----END CERTIFICATE REQUEST----- diff --git a/packages/fetchai/connections/http_server/tests/data/certs/server.key b/packages/fetchai/connections/http_server/tests/data/certs/server.key new file mode 100644 index 0000000000..a98c11c105 --- /dev/null +++ b/packages/fetchai/connections/http_server/tests/data/certs/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAxX8TpWN5cE9oGotbTlEDVst1at0ZgYlgKwCVconrOQ77AhD4 +MyJZ++Poy2i9N1JKYclT9ZrSRtqh+djILaCVeHHgwqFgwpGJuupunv/5o8fX9k1/ +YUs3MQou9STiOLS+B/MK25Fi/LUvr1ZYJzAViekgV1yv7Sn/n2mpQe66ByyNZt3D +Tzid9f3d7FHY6HBkxaoaUxkSIJeHcHy6qUXdiEeoPWBbkp6JjFqKW6mynwnDP4Wc +zGerRtLo69rxtaaES0aboOjA6bk1Ab+4XmSH+Kv6r7CzArLFHJO+ZUU6Pqxd2ehR +L9qicTzOQyN7ygVlBwZWpioOSRzGROgrNhQniQIDAQABAoIBAHao81Tbf4tLKnFI +aYOUiT0M4W9jiH+b2nv7zc8TrpCJv6ZuK7INYaNGPAh61bT3bFl0bU2Tx+NqWQeU +iDFh2myTf0dxToGYj/gOAojlo0gUOl1yEqaSWobMZ4pCrukDL2n3TP6/S4oqEox2 +hGCHM2m4+AWFWu5T3ZIaGefTV1IXEqghj7L+53UI4qksnJDEQ9GT34KnlJhQKZmw +E6St5F2xfXTKq6EWBIC23RNo4kAgDHBTE8MVRZdUEPmipf564NEVtxLFTKUi+tue +GbiagtCWeGeEGZ2uFyr+HWIQUz4qLcMR6hp+hxh2VP3U52/0I5PKngSO0G6IemMD +Hxj6DEECgYEA/A7Vjy9Or7DEIWZcsm44kyl79qUbzAlqDtG2RmOc6DDiWM3jQ/OR +bOW4wNCFxv/KOsoeB7FxP7kKTupwj2u1Y9krAsHifXyFtHilZy9yTo4h8wHy40ae +4B8sP4+xEhppfjoFg5ySdF1BF1prwh34YSlFEkD+Q3Uu4Hr3+Ph8Pk8CgYEAyJXL +TKT3zUUD6BhtJ74jtmwSW7SZx+lgbgzEtAHTwcZZllaTCdBY6H3im5pJ9LettymT +PtSVn2EYVULtJJiT0qm3rqkqDQ8QImdx+T2V/GL9Oo8T1LdYud2J+f7+pEAn9Ud3 +/XL6kZUXm/CpwIGIx3tB09kSsLxCGRnyrdhR3qcCgYEA3TCLWg5yp5ygUIsKV45/ +2SxzWzsCzKeKSZzgrp5lqCCV0MZEZHIOsRhaa+HRM5NuPO73MVsWfYv9Lsluo30q +fYeqxc2s2t/2WSvyQj2RurvhsOWJ5sYnT5grdU+8XJ2O67Uw95DjuHfJUhwIKh2w +xFq6AU3Fkx73VwiyKOqt5OMCgYBiIh7/VWpCy/QYVfL5UaXpNsBYi2f9DSl3Tdni +c05lbCQiUCLJ11vYCtaV6Asspbxgcv+t6pV1Dyy3cfHRSLBxjUTnN63yC5+KJW/2 +T3IUs11Oi/dYx4aqED/TxjRQqW6jKp8CqYD7PqT5TunN29HOPng7K+VgAAqaez5m +XQHY2wKBgErzDsGHH+0XktR7HCZJMmuc/1HnDzfENnfpRIjjlwJF8xn/HymS0OP+ +3AsfN0g60Qutng62wthkzeUheD3UM2nwpmatuP4UXUFGkGcwmCdvzMf/SvyKIjmQ +Mxiu8flSlCWlvP5e+Rrmd3RitOXeCqZLKbywMnlWHHfL33d1LWlf +-----END RSA PRIVATE KEY----- diff --git a/packages/fetchai/connections/http_server/tests/data/petstore_sim.yaml b/packages/fetchai/connections/http_server/tests/data/petstore_sim.yaml new file mode 100644 index 0000000000..dd8ea80ed7 --- /dev/null +++ b/packages/fetchai/connections/http_server/tests/data/petstore_sim.yaml @@ -0,0 +1,111 @@ +openapi: "3.0.0" +info: + version: 1.0.0 + title: Swagger Petstore + license: + name: MIT +servers: + - url: '' +paths: + /pets: + get: + summary: List all pets + operationId: listPets + tags: + - pets + parameters: + - name: limit + in: query + description: How many items to return at one time (max 100) + required: false + schema: + type: integer + format: int32 + responses: + '200': + description: A paged array of pets + headers: + x-next: + description: A link to the next page of responses + schema: + type: string + content: + application/json: + schema: + $ref: "#/components/schemas/Pets" + default: + description: unexpected error + content: + application/json: + schema: + $ref: "#/components/schemas/Error" + post: + summary: Create a pet + operationId: createPets + tags: + - pets + responses: + '201': + description: Null response + default: + description: unexpected error + content: + application/json: + schema: + $ref: "#/components/schemas/Error" + /pets/{petId}: + get: + summary: Info for a specific pet + operationId: showPetById + tags: + - pets + parameters: + - name: petId + in: path + required: true + description: The id of the pet to retrieve + schema: + type: string + responses: + '200': + description: Expected response to a valid request + content: + application/json: + schema: + $ref: "#/components/schemas/Pet" + default: + description: unexpected error + content: + application/json: + schema: + $ref: "#/components/schemas/Error" +components: + schemas: + Pet: + type: object + required: + - id + - name + properties: + id: + type: integer + format: int64 + name: + type: string + tag: + type: string + Pets: + type: array + items: + $ref: "#/components/schemas/Pet" + Error: + type: object + required: + - code + - message + properties: + code: + type: integer + format: int32 + message: + type: string \ No newline at end of file diff --git a/packages/fetchai/connections/http_server/tests/test_http_server.py b/packages/fetchai/connections/http_server/tests/test_http_server.py new file mode 100644 index 0000000000..d5a7759337 --- /dev/null +++ b/packages/fetchai/connections/http_server/tests/test_http_server.py @@ -0,0 +1,593 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the HTTP Server connection module.""" +import asyncio +import logging +import os +import ssl +from pathlib import Path +from traceback import print_exc +from typing import Tuple, cast +from unittest.mock import MagicMock, Mock, patch + +import aiohttp +import pytest +from aiohttp.client_reqrep import ClientResponse + +from aea.common import Address +from aea.configurations.base import ConnectionConfig +from aea.identity.base import Identity +from aea.mail.base import Envelope, Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.test_tools.mocks import RegexComparator +from aea.test_tools.network import get_host, get_unused_tcp_port + +from packages.fetchai.connections.http_server.connection import ( + APISpec, + HTTPServerConnection, + Response, +) +from packages.fetchai.protocols.http.dialogues import HttpDialogue +from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues +from packages.fetchai.protocols.http.message import HttpMessage + + +logger = logging.getLogger(__name__) + +DATA_DIR = str(Path(__file__).parent / "data") + + +class HttpDialogues(BaseHttpDialogues): + """The dialogues class keeps track of all http dialogues.""" + + def __init__(self, self_address: Address, **kwargs) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return HttpDialogue.Role.SERVER + + BaseHttpDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + ) + + +@pytest.mark.asyncio +class TestHTTPServer: + """Tests for HTTPServer connection.""" + + async def request(self, method: str, path: str, **kwargs) -> ClientResponse: + """ + Make a http request. + + :param method: HTTP method: GET, POST etc + :param path: path to request on server. full url constructed automatically + + :return: http response + """ + try: + url = f"http://{self.host}:{self.port}{path}" + async with aiohttp.ClientSession() as session: + async with session.request(method, url, **kwargs) as resp: + await resp.read() + return resp + except Exception: + print_exc() + raise + + def setup(self): + """Initialise the test case.""" + self.identity = Identity("name", address="my_key", public_key="my_public_key") + self.agent_address = self.identity.address + self.host = get_host() + self.port = get_unused_tcp_port() + self.api_spec_path = os.path.join(DATA_DIR, "petstore_sim.yaml") + self.connection_id = HTTPServerConnection.connection_id + self.protocol_id = HttpMessage.protocol_id + self.target_skill_id = "some_author/some_skill:0.1.0" + + self.configuration = ConnectionConfig( + host=self.host, + port=self.port, + target_skill_id=self.target_skill_id, + api_spec_path=self.api_spec_path, + connection_id=HTTPServerConnection.connection_id, + restricted_to_protocols={HttpMessage.protocol_id}, + ) + self.http_connection = HTTPServerConnection( + configuration=self.configuration, + data_dir=MagicMock(), + identity=self.identity, + ) + self.loop = asyncio.get_event_loop() + self.loop.run_until_complete(self.http_connection.connect()) + self.connection_address = str(HTTPServerConnection.connection_id) + self._dialogues = HttpDialogues(self.target_skill_id) + self.original_timeout = self.http_connection.channel.timeout_window + + @pytest.mark.asyncio + async def test_http_connection_disconnect_channel(self): + """Test the disconnect.""" + await self.http_connection.channel.disconnect() + assert self.http_connection.channel.is_stopped + + def _get_message_and_dialogue( + self, envelope: Envelope + ) -> Tuple[HttpMessage, HttpDialogue]: + message = cast(HttpMessage, envelope.message) + dialogue = cast(HttpDialogue, self._dialogues.update(message)) + assert dialogue is not None + return message, dialogue + + @pytest.mark.asyncio + async def test_get_200(self): + """Test send get request w/ 200 response.""" + request_task = self.loop.create_task(self.request("get", "/pets")) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + message = dialogue.reply( + target_message=incoming_message, + performative=HttpMessage.Performative.RESPONSE, + version=incoming_message.version, + status_code=200, + status_text="Success", + body=b"Response body", + ) + response_envelope = Envelope( + to=envelope.sender, + sender=envelope.to, + context=envelope.context, + message=message, + ) + await self.http_connection.send(response_envelope) + + response = await asyncio.wait_for( + request_task, + timeout=20, + ) + + assert ( + response.status == 200 + and response.reason == "Success" + and await response.text() == "Response body" + ) + + @pytest.mark.asyncio + async def test_header_content_type(self): + """Test send get request w/ 200 response.""" + content_type = "something/unique" + request_task = self.loop.create_task(self.request("get", "/pets")) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + message = dialogue.reply( + target_message=incoming_message, + performative=HttpMessage.Performative.RESPONSE, + version=incoming_message.version, + headers=f"Content-Type: {content_type}", + status_code=200, + status_text="Success", + body=b"Response body", + ) + response_envelope = Envelope( + to=envelope.sender, + sender=envelope.to, + context=envelope.context, + message=message, + ) + await self.http_connection.send(response_envelope) + + response = await asyncio.wait_for( + request_task, + timeout=20, + ) + assert ( + response.status == 200 + and response.reason == "Success" + and await response.text() == "Response body" + ) + assert response.headers["Content-Type"] == content_type + + @pytest.mark.asyncio + async def test_bad_performative_get_timeout_error(self): + """Test send get request w/ 200 response.""" + self.http_connection.channel.timeout_window = 3 + request_task = self.loop.create_task(self.request("get", "/pets")) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=10) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + incorrect_message = HttpMessage( + performative=HttpMessage.Performative.REQUEST, + dialogue_reference=dialogue.dialogue_label.dialogue_reference, + target=incoming_message.message_id, + message_id=incoming_message.message_id + 1, + method="post", + url="/pets", + version=incoming_message.version, + headers=incoming_message.headers, + body=b"Request body", + ) + incorrect_message.to = incoming_message.sender + + # the incorrect message cannot be sent into a dialogue, so this is omitted. + + response_envelope = Envelope( + to=incorrect_message.to, + sender=envelope.to, + context=envelope.context, + message=incorrect_message, + ) + with patch.object(self.http_connection.logger, "warning") as mock_logger: + await self.http_connection.send(response_envelope) + mock_logger.assert_any_call( + f"Could not create dialogue for message={incorrect_message}" + ) + + response = await asyncio.wait_for(request_task, timeout=10) + + assert ( + response.status == 408 + and response.reason == "Request Timeout" + and await response.text() == "" + ) + + @pytest.mark.asyncio + async def test_late_message_get_timeout_error(self): + """Test send get request w/ 200 response.""" + self.http_connection.channel.timeout_window = 1 + request_task = self.loop.create_task(self.request("get", "/pets")) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=10) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + message = dialogue.reply( + target_message=incoming_message, + performative=HttpMessage.Performative.RESPONSE, + version=incoming_message.version, + headers=incoming_message.headers, + status_code=200, + status_text="Success", + body=b"Response body", + ) + response_envelope = Envelope( + to=message.to, + sender=envelope.to, + context=envelope.context, + message=message, + ) + await asyncio.sleep(1.5) + with patch.object(self.http_connection.logger, "warning") as mock_logger: + await self.http_connection.send(response_envelope) + mock_logger.assert_any_call( + RegexComparator( + "Dropping message=.* for incomplete_dialogue_label=.* which has timed out." + ) + ) + + response = await asyncio.wait_for(request_task, timeout=10) + + assert ( + response.status == 408 + and response.reason == "Request Timeout" + and await response.text() == "" + ) + + @pytest.mark.asyncio + async def test_post_201(self): + """Test send get request w/ 200 response.""" + request_task = self.loop.create_task( + self.request( + "post", + "/pets", + ) + ) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + message = dialogue.reply( + target_message=incoming_message, + performative=HttpMessage.Performative.RESPONSE, + version=incoming_message.version, + status_code=201, + status_text="Created", + body=b"Response body", + ) + response_envelope = Envelope( + to=message.to, + sender=envelope.to, + context=envelope.context, + message=message, + ) + + await self.http_connection.send(response_envelope) + + response = await asyncio.wait_for( + request_task, + timeout=20, + ) + assert ( + response.status == 201 + and response.reason == "Created" + and await response.text() == "Response body" + ) + + @pytest.mark.asyncio + async def test_get_404(self): + """Test send post request w/ 404 response.""" + response = await self.request("get", "/url-non-exists") + + assert ( + response.status == 404 + and response.reason == "Request Not Found" + and await response.text() == "" + ) + + @pytest.mark.asyncio + async def test_post_404(self): + """Test send post request w/ 404 response.""" + response = await self.request("get", "/url-non-exists", data="some data") + + assert ( + response.status == 404 + and response.reason == "Request Not Found" + and await response.text() == "" + ) + + @pytest.mark.asyncio + async def test_get_408(self): + """Test send post request w/ 404 response.""" + await self.http_connection.connect() + self.http_connection.channel.timeout_window = 0.1 + with patch.object( + self.http_connection.channel.logger, "warning" + ) as mock_logger: + response = await self.request("get", "/pets") + mock_logger.assert_any_call( + RegexComparator("Request timed out! Request=.*") + ) + + assert ( + response.status == 408 + and response.reason == "Request Timeout" + and await response.text() == "" + ) + + @pytest.mark.asyncio + async def test_post_408(self): + """Test send post request w/ 404 response.""" + self.http_connection.channel.timeout_window = 0.1 + response = await self.request("post", "/pets", data="somedata") + + assert ( + response.status == 408 + and response.reason == "Request Timeout" + and await response.text() == "" + ) + + @pytest.mark.asyncio + async def test_send_connection_drop(self): + """Test unexpected response.""" + message = HttpMessage( + performative=HttpMessage.Performative.RESPONSE, + dialogue_reference=("", ""), + target=1, + message_id=2, + headers="", + version="", + status_code=200, + status_text="Success", + body=b"", + ) + message.to = str(HTTPServerConnection.connection_id) + message.sender = self.target_skill_id + envelope = Envelope( + to=message.to, + sender=message.sender, + message=message, + ) + await self.http_connection.send(envelope) + + @pytest.mark.asyncio + async def test_get_message_channel_not_connected(self): + """Test error on channel get message if not connected.""" + await self.http_connection.disconnect() + with pytest.raises(ValueError): + await self.http_connection.channel.get_message() + + @pytest.mark.asyncio + async def test_fail_connect(self): + """Test error on server connection.""" + await self.http_connection.disconnect() + + with patch.object( + self.http_connection.channel, + "_start_http_server", + side_effect=Exception("expected"), + ): + await self.http_connection.connect() + assert not self.http_connection.is_connected + + @pytest.mark.asyncio + async def test_server_error_on_send_response(self): + """Test exception raised on response sending to the client.""" + request_task = self.loop.create_task( + self.request( + "post", + "/pets", + ) + ) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + message = dialogue.reply( + target_message=incoming_message, + performative=HttpMessage.Performative.RESPONSE, + version=incoming_message.version, + headers=incoming_message.headers, + status_code=201, + status_text="Created", + body=b"Response body", + ) + response_envelope = Envelope( + to=message.to, + sender=envelope.to, + context=envelope.context, + message=message, + ) + + with patch.object(Response, "from_message", side_effect=Exception("expected")): + await self.http_connection.send(response_envelope) + response = await asyncio.wait_for( + request_task, + timeout=20, + ) + + assert response and response.status == 500 and response.reason == "Server Error" + + def teardown(self): + """Teardown the test case.""" + self.loop.run_until_complete(self.http_connection.disconnect()) + self.http_connection.channel.timeout_window = self.original_timeout + + +def test_bad_api_spec(): + """Test error on apispec file is invalid.""" + with pytest.raises(FileNotFoundError): + APISpec("not_exist_file") + + +def test_apispec_verify_if_no_validator_set(): + """Test api spec ok if no spec file provided.""" + assert APISpec().verify(Mock()) + + +@pytest.mark.asyncio +class TestHTTPSServer: + """Tests for HTTPServer connection.""" + + async def request(self, method: str, path: str, **kwargs) -> ClientResponse: + """ + Make a http request. + + :param method: HTTP method: GET, POST etc + :param path: path to request on server. full url constructed automatically + + :return: http response + """ + try: + url = f"https://{self.host}:{self.port}{path}" + sslcontext = ssl.create_default_context(cafile=self.ssl_cert) + async with aiohttp.ClientSession() as session: + async with session.request( + method, url, **kwargs, ssl=sslcontext + ) as resp: + await resp.read() + return resp + except Exception: + print_exc() + raise + + def setup(self): + """Initialise the test case.""" + self.identity = Identity("name", address="my_key", public_key="my_public_key") + self.agent_address = self.identity.address + self.host = "localhost" + self.port = get_unused_tcp_port() + self.api_spec_path = os.path.join(DATA_DIR, "petstore_sim.yaml") + self.connection_id = HTTPServerConnection.connection_id + self.protocol_id = HttpMessage.protocol_id + self.target_skill_id = "some_author/some_skill:0.1.0" + self.ssl_cert = os.path.join(DATA_DIR, "certs", "server.crt") + self.ssl_key = os.path.join(DATA_DIR, "certs", "server.key") + self.configuration = ConnectionConfig( + host=self.host, + port=self.port, + target_skill_id=self.target_skill_id, + api_spec_path=self.api_spec_path, + connection_id=HTTPServerConnection.connection_id, + restricted_to_protocols={HttpMessage.protocol_id}, + ssl_cert=self.ssl_cert, + ssl_key=self.ssl_key, + ) + self.http_connection = HTTPServerConnection( + configuration=self.configuration, + data_dir=MagicMock(), + identity=self.identity, + ) + self.loop = asyncio.get_event_loop() + self.loop.run_until_complete(self.http_connection.connect()) + self.connection_address = str(HTTPServerConnection.connection_id) + self._dialogues = HttpDialogues(self.target_skill_id) + self.original_timeout = self.http_connection.channel.timeout_window + + @pytest.mark.asyncio + async def test_get_200(self): + """Test send get request w/ 200 response.""" + request_task = self.loop.create_task(self.request("get", "/pets")) + envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) + assert envelope + incoming_message, dialogue = self._get_message_and_dialogue(envelope) + message = dialogue.reply( + target_message=incoming_message, + performative=HttpMessage.Performative.RESPONSE, + version=incoming_message.version, + status_code=200, + status_text="Success", + body=b"Response body", + ) + response_envelope = Envelope( + to=envelope.sender, + sender=envelope.to, + context=envelope.context, + message=message, + ) + await self.http_connection.send(response_envelope) + + response = await asyncio.wait_for( + request_task, + timeout=20, + ) + + assert ( + response.status == 200 + and response.reason == "Success" + and await response.text() == "Response body" + ) + + def _get_message_and_dialogue( + self, envelope: Envelope + ) -> Tuple[HttpMessage, HttpDialogue]: + message = cast(HttpMessage, envelope.message) + dialogue = cast(HttpDialogue, self._dialogues.update(message)) + assert dialogue is not None + return message, dialogue From 9da6de9bf605056624df2e02994aafbc35ab1b07 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:20:44 +0000 Subject: [PATCH 35/93] feat: port ledger connection tests to package --- .../connections/ledger/connection.yaml | 3 + .../connections/ledger/tests/__init__.py | 21 + .../connections/ledger/tests/conftest.py | 98 ++++ .../ledger/tests/test_ledger_api.py | 477 ++++++++++++++++++ 4 files changed, 599 insertions(+) create mode 100644 packages/fetchai/connections/ledger/tests/__init__.py create mode 100644 packages/fetchai/connections/ledger/tests/conftest.py create mode 100644 packages/fetchai/connections/ledger/tests/test_ledger_api.py diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index b388ef18df..40b86f922f 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -12,6 +12,9 @@ fingerprint: connection.py: bafybeiaopv7sdzqibxnbo3epvu7ufdnwdliml2lzssxuaer337xzgiheqi contract_dispatcher.py: bafybeigpzih7porhorupuu5zlrg7ho6fswf4qc65xq22wypgqzwxowqlay ledger_dispatcher.py: bafybeicrjfb2f4ngb3lvwgfbxf3r3ukk7pgm3oaour4htmnuqqn44ltmku + tests/__init__.py: bafybeibx5zdcpx3u6sglbpp7yflnr7uaz557e6wqltawtzclubhhvaiw5e + tests/conftest.py: bafybeihisqmg4u2akda7fxba4tsq7zde53ygvaarayynkgdzyvc75l2ygu + tests/test_ledger_api.py: bafybeicwpepqcim6l4ni34a24jqqoaunik55gbrd5pwt4h66mo6a3ae7oq fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/ledger/tests/__init__.py b/packages/fetchai/connections/ledger/tests/__init__.py new file mode 100644 index 0000000000..76949444fb --- /dev/null +++ b/packages/fetchai/connections/ledger/tests/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains tests for the ledger API connection module, plus some utils.""" diff --git a/packages/fetchai/connections/ledger/tests/conftest.py b/packages/fetchai/connections/ledger/tests/conftest.py new file mode 100644 index 0000000000..f1e5075446 --- /dev/null +++ b/packages/fetchai/connections/ledger/tests/conftest.py @@ -0,0 +1,98 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Conftest module.""" +import logging +from pathlib import Path +from typing import cast +from unittest.mock import MagicMock + +import pytest +from aea_ledger_ethereum import DEFAULT_EIP1559_STRATEGY, EthereumCrypto +from aea_ledger_ethereum.test_tools.fixture_helpers import ( + DEFAULT_GANACHE_ADDR, + DEFAULT_GANACHE_CHAIN_ID, + DEFAULT_GANACHE_PORT, + ganache, +) + +from aea.configurations.constants import DEFAULT_LEDGER +from aea.connections.base import Connection +from aea.crypto.ledger_apis import ( + DEFAULT_LEDGER_CONFIGS, + ETHEREUM_DEFAULT_CURRENCY_DENOM, +) +from aea.crypto.registries import ledger_apis_registry, make_crypto, make_ledger_api +from aea.crypto.wallet import CryptoStore +from aea.identity.base import Identity + + +PACKAGE_DIR = Path(__file__).parent.parent + + +@pytest.fixture(scope="session") +def ethereum_testnet_config(): + """Get Ethereum ledger api configurations using Ganache.""" + new_uri = f"{DEFAULT_GANACHE_ADDR}:{DEFAULT_GANACHE_PORT}" + new_config = { + "address": new_uri, + "chain_id": DEFAULT_GANACHE_CHAIN_ID, + "denom": ETHEREUM_DEFAULT_CURRENCY_DENOM, + "default_gas_price_strategy": "gas_station", + "gas_price_strategies": { + "eip1559": DEFAULT_EIP1559_STRATEGY, + "gas_station": { + "gas_price_api_key": "", + "gas_price_strategy": "fast", + }, + }, + } + return new_config + + +@pytest.fixture(scope="function") +def update_default_ethereum_ledger_api(ethereum_testnet_config): + """Change temporarily default Ethereum ledger api configurations to interact with local Ganache.""" + old_config = DEFAULT_LEDGER_CONFIGS.pop(EthereumCrypto.identifier, None) + DEFAULT_LEDGER_CONFIGS[EthereumCrypto.identifier] = ethereum_testnet_config + yield + DEFAULT_LEDGER_CONFIGS.pop(EthereumCrypto.identifier) + DEFAULT_LEDGER_CONFIGS[EthereumCrypto.identifier] = old_config + + +@pytest.fixture() +async def ledger_apis_connection(request, ethereum_testnet_config): + """Make a connection.""" + crypto = make_crypto(DEFAULT_LEDGER) + identity = Identity("name", crypto.address, crypto.public_key) + crypto_store = CryptoStore() + connection = Connection.from_dir( + PACKAGE_DIR, data_dir=MagicMock(), identity=identity, crypto_store=crypto_store + ) + connection = cast(Connection, connection) + connection._logger = logging.getLogger("aea.packages.fetchai.connections.ledger") + + # use testnet config + connection.configuration.config.get("ledger_apis", {})[ + "ethereum" + ] = ethereum_testnet_config + + await connection.connect() + yield connection + await connection.disconnect() diff --git a/packages/fetchai/connections/ledger/tests/test_ledger_api.py b/packages/fetchai/connections/ledger/tests/test_ledger_api.py new file mode 100644 index 0000000000..c5bef9a853 --- /dev/null +++ b/packages/fetchai/connections/ledger/tests/test_ledger_api.py @@ -0,0 +1,477 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2022 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + +"""This module contains the tests of the ledger API connection module.""" +import asyncio +import logging +from typing import cast +from unittest.mock import Mock, patch + +import pytest +from aea_ledger_ethereum import ( + DEFAULT_EIP1559_STRATEGY, + DEFAULT_GAS_STATION_STRATEGY, + EthereumCrypto, +) +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_PATH +from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import ( + FETCHAI_ADDRESS_ONE, + FETCHAI_TESTNET_CONFIG, +) + +from aea.common import Address +from aea.configurations.base import PublicId +from aea.connections.base import Connection, ConnectionStates +from aea.crypto.ledger_apis import LedgerApis +from aea.crypto.registries import make_crypto, make_ledger_api +from aea.helpers.async_utils import AsyncState +from aea.helpers.transaction.base import ( + RawTransaction, + SignedTransaction, + Terms, + TransactionDigest, + TransactionReceipt, +) +from aea.mail.base import Envelope, Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.test_tools.network import LOCALHOST + +from packages.fetchai.connections.ledger.connection import LedgerConnection +from packages.fetchai.connections.ledger.ledger_dispatcher import ( + LedgerApiRequestDispatcher, +) +from packages.fetchai.connections.ledger.tests.conftest import ledger_apis_connection +from packages.fetchai.protocols.ledger_api.custom_types import Kwargs +from packages.fetchai.protocols.ledger_api.dialogues import LedgerApiDialogue +from packages.fetchai.protocols.ledger_api.dialogues import ( + LedgerApiDialogues as BaseLedgerApiDialogues, +) +from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage + + +DEFAULT_GANACHE_ADDR = LOCALHOST.geturl() +DEFAULT_GANACHE_PORT = 8545 +DEFAULT_GANACHE_CHAIN_ID = 1337 +DEFAULT_MAX_PRIORITY_FEE_PER_GAS = 1_000_000_000 +DEFAULT_MAX_FEE_PER_GAS = 1_000_000_000 + +logger = logging.getLogger(__name__) + +GAS_PRICE_STRATEGIES = { + "gas_station": DEFAULT_GAS_STATION_STRATEGY, + "eip1559": DEFAULT_EIP1559_STRATEGY, +} + +ledger_ids = pytest.mark.parametrize( + "ledger_id,address", + [ + (FetchAICrypto.identifier, FETCHAI_ADDRESS_ONE), + (EthereumCrypto.identifier, EthereumCrypto(ETHEREUM_PRIVATE_KEY_PATH).address), + ], +) +gas_strategies = pytest.mark.parametrize( + "gas_strategies", + [ + {"gas_price_strategy": None}, + {"gas_price_strategy": "gas_station"}, + {"gas_price_strategy": "eip1559"}, + { + "max_fee_per_gas": DEFAULT_MAX_FEE_PER_GAS, + "max_priority_fee_per_gas": DEFAULT_MAX_PRIORITY_FEE_PER_GAS, + }, + ], +) + +SOME_SKILL_ID = "some/skill:0.1.0" + + +class LedgerApiDialogues(BaseLedgerApiDialogues): + """The dialogues class keeps track of all ledger_api dialogues.""" + + def __init__(self, self_address: Address, **kwargs) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return LedgerApiDialogue.Role.AGENT + + BaseLedgerApiDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + ) + + +@pytest.mark.integration +@pytest.mark.ledger +@pytest.mark.asyncio +@ledger_ids +async def test_get_balance( + ledger_id, + address, + ledger_apis_connection: Connection, + update_default_ethereum_ledger_api, + ethereum_testnet_config, + ganache, +): + """Test get balance.""" + import aea # noqa # to load registries + + if ledger_id == FetchAICrypto.identifier: + config = FETCHAI_TESTNET_CONFIG + else: + config = ethereum_testnet_config + + ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID) + request, ledger_api_dialogue = ledger_api_dialogues.create( + counterparty=str(ledger_apis_connection.connection_id), + performative=LedgerApiMessage.Performative.GET_BALANCE, + ledger_id=ledger_id, + address=address, + ) + envelope = Envelope( + to=request.to, + sender=request.sender, + message=request, + ) + + await ledger_apis_connection.send(envelope) + await asyncio.sleep(0.01) + response = await ledger_apis_connection.receive() + + assert response is not None + assert type(response.message) == LedgerApiMessage + response_msg = cast(LedgerApiMessage, response.message) + response_dialogue = ledger_api_dialogues.update(response_msg) + assert response_dialogue == ledger_api_dialogue + assert response_msg.performative == LedgerApiMessage.Performative.BALANCE + actual_balance_amount = response_msg.balance + expected_balance_amount = make_ledger_api(ledger_id, **config).get_balance(address) + assert actual_balance_amount == expected_balance_amount + + +@pytest.mark.integration +@pytest.mark.ledger +@pytest.mark.flaky(reruns=2, reruns_delay=5) +@pytest.mark.asyncio +@ledger_ids +async def test_get_state( + ledger_id, + address, + ledger_apis_connection: Connection, + update_default_ethereum_ledger_api, + ethereum_testnet_config, + ganache, +): + """Test get state.""" + import aea # noqa # to load registries + + if ledger_id == FetchAICrypto.identifier: + config = FETCHAI_TESTNET_CONFIG + else: + config = ethereum_testnet_config + + if "ethereum" in ledger_id: + callable_name = "get_block" + else: + callable_name = "blocks" + args = ("latest",) + kwargs = Kwargs({}) + + ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID) + request, ledger_api_dialogue = ledger_api_dialogues.create( + counterparty=str(ledger_apis_connection.connection_id), + performative=LedgerApiMessage.Performative.GET_STATE, + ledger_id=ledger_id, + callable=callable_name, + args=args, + kwargs=kwargs, + ) + envelope = Envelope( + to=request.to, + sender=request.sender, + message=request, + ) + + await ledger_apis_connection.send(envelope) + await asyncio.sleep(0.01) + response = await ledger_apis_connection.receive() + + assert response is not None + assert type(response.message) == LedgerApiMessage + response_msg = cast(LedgerApiMessage, response.message) + response_dialogue = ledger_api_dialogues.update(response_msg) + assert response_dialogue == ledger_api_dialogue + + assert ( + response_msg.performative == LedgerApiMessage.Performative.STATE + ), response_msg + actual_block = response_msg.state.body + expected_block = make_ledger_api(ledger_id, **config).get_state( + callable_name, *args + ) + assert actual_block == expected_block + + +@pytest.mark.integration +@pytest.mark.ledger +@pytest.mark.asyncio +@gas_strategies +async def test_send_signed_transaction_ethereum( + gas_strategies, + ledger_apis_connection: Connection, + update_default_ethereum_ledger_api, + ganache, +): + """Test send signed transaction with Ethereum APIs.""" + import aea # noqa # to load registries + + crypto1 = make_crypto( + EthereumCrypto.identifier, private_key_path=ETHEREUM_PRIVATE_KEY_PATH + ) + crypto2 = make_crypto(EthereumCrypto.identifier) + ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID) + + amount = 40000 + fee = 30000 + + request, ledger_api_dialogue = ledger_api_dialogues.create( + counterparty=str(ledger_apis_connection.connection_id), + performative=LedgerApiMessage.Performative.GET_RAW_TRANSACTION, + terms=Terms( + ledger_id=EthereumCrypto.identifier, + sender_address=crypto1.address, + counterparty_address=crypto2.address, + amount_by_currency_id={"ETH": -amount}, + quantities_by_good_id={"some_service_id": 1}, + is_sender_payable_tx_fee=True, + nonce="", + fee_by_currency_id={"ETH": fee}, + chain_id=DEFAULT_GANACHE_CHAIN_ID, + **gas_strategies, + ), + ) + request = cast(LedgerApiMessage, request) + envelope = Envelope( + to=request.to, + sender=request.sender, + message=request, + ) + await ledger_apis_connection.send(envelope) + await asyncio.sleep(0.01) + response = await ledger_apis_connection.receive() + + assert response is not None + assert type(response.message) == LedgerApiMessage + response_message = cast(LedgerApiMessage, response.message) + assert ( + response_message.performative == LedgerApiMessage.Performative.RAW_TRANSACTION + ) + response_dialogue = ledger_api_dialogues.update(response_message) + assert response_dialogue == ledger_api_dialogue + assert type(response_message.raw_transaction) == RawTransaction + assert response_message.raw_transaction.ledger_id == request.terms.ledger_id + + signed_transaction = crypto1.sign_transaction(response_message.raw_transaction.body) + request = cast( + LedgerApiMessage, + ledger_api_dialogue.reply( + performative=LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION, + target_message=response_message, + signed_transaction=SignedTransaction( + EthereumCrypto.identifier, signed_transaction + ), + ), + ) + envelope = Envelope( + to=request.to, + sender=request.sender, + message=request, + ) + await ledger_apis_connection.send(envelope) + await asyncio.sleep(0.01) + response = await ledger_apis_connection.receive() + + assert response is not None + assert type(response.message) == LedgerApiMessage + response_message = cast(LedgerApiMessage, response.message) + assert ( + response_message.performative != LedgerApiMessage.Performative.ERROR + ), f"Received error: {response_message.message}" + assert ( + response_message.performative + == LedgerApiMessage.Performative.TRANSACTION_DIGEST + ) + response_dialogue = ledger_api_dialogues.update(response_message) + assert response_dialogue == ledger_api_dialogue + assert type(response_message.transaction_digest) == TransactionDigest + assert type(response_message.transaction_digest.body) == str + assert ( + response_message.transaction_digest.ledger_id + == request.signed_transaction.ledger_id + ) + assert type(response_message.transaction_digest.body.startswith("0x")) + + request = cast( + LedgerApiMessage, + ledger_api_dialogue.reply( + performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT, + target_message=response_message, + transaction_digest=response_message.transaction_digest, + ), + ) + envelope = Envelope( + to=request.to, + sender=request.sender, + message=request, + ) + await ledger_apis_connection.send(envelope) + await asyncio.sleep(0.01) + response = await ledger_apis_connection.receive() + + assert response is not None + assert type(response.message) == LedgerApiMessage + response_message = cast(LedgerApiMessage, response.message) + assert ( + response_message.performative + == LedgerApiMessage.Performative.TRANSACTION_RECEIPT + ) + response_dialogue = ledger_api_dialogues.update(response_message) + assert response_dialogue == ledger_api_dialogue + assert type(response_message.transaction_receipt) == TransactionReceipt + assert response_message.transaction_receipt.receipt is not None + assert response_message.transaction_receipt.transaction is not None + assert ( + response_message.transaction_receipt.ledger_id + == request.transaction_digest.ledger_id + ) + assert LedgerApis.is_transaction_settled( + response_message.transaction_receipt.ledger_id, + response_message.transaction_receipt.receipt, + ), "Transaction not settled." + + +@pytest.mark.asyncio +async def test_unsupported_protocol(ledger_apis_connection: LedgerConnection): + """Test fail on protocol not supported.""" + envelope = Envelope( + to=str(ledger_apis_connection.connection_id), + sender="test/skill:0.1.0", + protocol_specification_id=PublicId.from_str("author/package_name:0.1.0"), + message=b"message", + ) + with pytest.raises(ValueError): + ledger_apis_connection._schedule_request(envelope) + + +@pytest.mark.asyncio +async def test_new_message_wait_flag(ledger_apis_connection: LedgerConnection): + """Test wait for new message.""" + task = asyncio.ensure_future(ledger_apis_connection.receive()) + await asyncio.sleep(0.1) + assert not task.done() + task.cancel() + + +@pytest.mark.asyncio +async def test_no_balance(): + """Test no balance.""" + dispatcher = LedgerApiRequestDispatcher(AsyncState()) + mock_api = Mock() + message = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_BALANCE, + dialogue_reference=dispatcher.dialogues.new_self_initiated_dialogue_reference(), + ledger_id=EthereumCrypto.identifier, + address="test", + ) + message.to = dispatcher.dialogues.self_address + message.sender = "test" + dialogue = dispatcher.dialogues.update(message) + assert dialogue is not None + mock_api.get_balance.return_value = None + msg = dispatcher.get_balance(mock_api, message, dialogue) + + assert msg.performative == LedgerApiMessage.Performative.ERROR + + +@pytest.mark.asyncio +async def test_no_raw_tx(): + """Test no raw tx returned.""" + dispatcher = LedgerApiRequestDispatcher(AsyncState()) + mock_api = Mock() + message = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_RAW_TRANSACTION, + dialogue_reference=dispatcher.dialogues.new_self_initiated_dialogue_reference(), + terms=Terms( + ledger_id=EthereumCrypto.identifier, + sender_address="1111", + counterparty_address="22222", + amount_by_currency_id={"ETH": -1}, + quantities_by_good_id={"some_service_id": 1}, + is_sender_payable_tx_fee=True, + nonce="", + fee_by_currency_id={"ETH": 10}, + chain_id=3, + ), + ) + message.to = dispatcher.dialogues.self_address + message.sender = "test" + dialogue = dispatcher.dialogues.update(message) + assert dialogue is not None + mock_api.get_transfer_transaction.return_value = None + msg = dispatcher.get_raw_transaction(mock_api, message, dialogue) + + assert msg.performative == LedgerApiMessage.Performative.ERROR + + +@pytest.mark.asyncio +async def test_attempts_get_transaction_receipt(): + """Test retry and sleep.""" + dispatcher = LedgerApiRequestDispatcher(AsyncState(ConnectionStates.connected)) + mock_api = Mock() + message = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT, + dialogue_reference=dispatcher.dialogues.new_self_initiated_dialogue_reference(), + transaction_digest=TransactionDigest("asdad", "sdfdsf"), + ) + message.to = dispatcher.dialogues.self_address + message.sender = "test" + dialogue = dispatcher.dialogues.update(message) + assert dialogue is not None + mock_api.get_transaction.return_value = None + mock_api.is_transaction_settled.return_value = True + with patch.object(dispatcher, "MAX_ATTEMPTS", 2): + with patch.object(dispatcher, "TIMEOUT", 0.001): + msg = dispatcher.get_transaction_receipt(mock_api, message, dialogue) + + assert msg.performative == LedgerApiMessage.Performative.ERROR From 396d18710c8303b310a3d31ea0ed3f625e4a2351 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:21:16 +0000 Subject: [PATCH 36/93] chore: update hashes --- .../fetchai/agents/gym_aea/aea-config.yaml | 4 +-- .../agents/my_first_aea/aea-config.yaml | 2 +- .../connections/http_server/connection.yaml | 2 +- .../connections/ledger/connection.yaml | 2 +- .../fetchai/contracts/erc1155/contract.yaml | 2 +- packages/fetchai/skills/echo/skill.yaml | 6 ++-- .../fetchai/skills/erc1155_client/skill.yaml | 4 +-- .../fetchai/skills/erc1155_deploy/skill.yaml | 4 +-- .../fetchai/skills/generic_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_seller/skill.yaml | 2 +- packages/fetchai/skills/gym/skill.yaml | 2 +- packages/hashes.csv | 32 +++++++++---------- .../open_aea/agents/gym_aea/aea-config.yaml | 4 +-- .../open_aea/agents/http_echo/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 4da51758c2..46cf57ecd5 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +- fetchai/gym:0.19.0:bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu +- fetchai/gym:0.20.0:bafybeibnh47c5rw2ijq2xz4n5oyxney4zrlddq6djvhwfniudy44oj243y default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 7c30423d18..8c2c31cc7e 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeiapq3npfk62s36rdnfd2is5kgmz6jw4nyoiggj3t4pslab2cazczq +- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index 23cfb7ca79..d46868784b 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -15,7 +15,7 @@ fingerprint: tests/data/certs/server.csr: bafybeicvp7xdl5w3o4bzikkudpduitss3bpp6xqfwlxbw6kabdangohy5u tests/data/certs/server.key: bafybeiabvpkpqr4fctrbssfal6pviv5otgmu32qyrfpyhcql5wgmlzjtoe tests/data/petstore_sim.yaml: bafybeiaekkfxljlv57uviz4ug6isdqbzsnuxpsgy3dvhzh22daql3xh2i4 - tests/test_http_server.py: bafybeic5pemoh6utlnhjo6e2dytloxzhzirogzidexvowqq3uxlqz7slym + tests/test_http_server.py: bafybeibe6zpjeh3qkhnmlbmoctda42azujoiibxjunfjejridvk2wa4yni fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index 40b86f922f..4a0ca716c7 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -14,7 +14,7 @@ fingerprint: ledger_dispatcher.py: bafybeicrjfb2f4ngb3lvwgfbxf3r3ukk7pgm3oaour4htmnuqqn44ltmku tests/__init__.py: bafybeibx5zdcpx3u6sglbpp7yflnr7uaz557e6wqltawtzclubhhvaiw5e tests/conftest.py: bafybeihisqmg4u2akda7fxba4tsq7zde53ygvaarayynkgdzyvc75l2ygu - tests/test_ledger_api.py: bafybeicwpepqcim6l4ni34a24jqqoaunik55gbrd5pwt4h66mo6a3ae7oq + tests/test_ledger_api.py: bafybeic75mc5rfp3wkr3o27yivzfuwata3vhvoksghqr35zuvhslcbmsky fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index fcd0d6f9cb..316c79c9d0 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -17,7 +17,7 @@ fingerprint: migrations/1_initial_migration.js: bafybeigzg7dadlq7sepncquzoo5hgs7q2pwvbhzilolgkjkr3jacb2owvy migrations/2_deploy_contracts.js: bafybeihnzburnurq4gvp4rj36b57uzrlgif5y73ggyu3rfc3iot4e5zppy tests/__init__.py: bafybeidgqgy32gwubf3eu7ijc7ddq4bm675oxyfqevm5j2ew2zcu4p6tm4 - tests/test_contract.py: bafybeiesmoo6ol5c5bvbiwtsfl22nltef7okgfmd662usz5ezatv3wxuae + tests/test_contract.py: bafybeidclhiufk2cuqaqtabis3c6picwqsj5qumwfdh26a3jl65qi5ki3m fingerprint_ignore_patterns: [] class_name: ERC1155Contract contract_interface_paths: diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 44252c61c7..80022ae4d9 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -12,9 +12,9 @@ fingerprint: dialogues.py: bafybeici4rlde6qdpjtftn4xgelrrphpwzzymvhjrgua7frx7qvyw32gue handlers.py: bafybeihjjglefhpwbprqu6anjpmhj3nn7p53nsci3kmueab7hnhchfcmsi tests/__init__.py: bafybeidedsb72is3z5jndaoh232r7y5qvqb3acotjm6xi4pea3bmkoq6le - tests/test_behaviours.py: bafybeid52a5hc2jrtyvaj3535ottlyvsxzunha4jfd3bnrl2emfu7gpy4a - tests/test_dialogues.py: bafybeihavnuflot553ihhakfeonlyhxicd7mkebvv76rlh4fe77yedushi - tests/test_handlers.py: bafybeifejrmrep6f2wxuarowhbcpzs6rvtiv3y4vimaoxyuv5jdyg5lzwa + tests/test_behaviours.py: bafybeibea56daw5pjldrwx5dfv4w3tbmln5umzfz5ztt3p6jjaziiwczri + tests/test_dialogues.py: bafybeiafp2au3qo6xiobtdxyrviict5ssx7jygp5qbml66cthchaceismq + tests/test_handlers.py: bafybeid6xknzidjyrhooczkgolmxdesxriahb72q3be2jtk6iybfgaxbui fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index dd3fdea91a..6dbc3e7127 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -15,9 +15,9 @@ fingerprint: strategy.py: bafybeifudijy3opr6srw5kik3x3rmv6f75dts2pcqtlhjwkkzcafpad4em fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: -- fetchai/erc1155:0.22.0:bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 +- fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 4d68d5265f..53687ceb4a 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -15,9 +15,9 @@ fingerprint: strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: -- fetchai/erc1155:0.22.0:bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 +- fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 00525403c7..a57acbdfed 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -14,7 +14,7 @@ fingerprint: strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 1ae0b259e1..7aee54beeb 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -15,7 +15,7 @@ fingerprint: strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 6aea634435..d15a7f6189 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,7 +15,7 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +- fetchai/gym:0.19.0:bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/hashes.csv b/packages/hashes.csv index f5559c89bf..e0026911c8 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,13 +1,13 @@ fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe -fetchai/agents/gym_aea,bafybeigrzuxo5amvwn56ikypgmriuw4ixc4znyab3sdssqzosm7c4l4og4 -fetchai/agents/my_first_aea,bafybeidkana63rewyecu3hfnjrnk6wlbspqe5k5eqwgci53lrb3l4i3al4 -fetchai/connections/gym,bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm -fetchai/connections/http_client,bafybeid7krvs74aymwgtsayssotnm3ufdtfqpua5rlw6qsrjci4ix73p74 -fetchai/connections/http_server,bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey -fetchai/connections/ledger,bafybeigj6eetvrlddivbdebzanpyblkqarrhsc4et7exrglbxso74lzmeq +fetchai/agents/gym_aea,bafybeih53zssq6np6d4m6rgalhcrk3gznd5mlgglqdgu52o5fiicbusqeq +fetchai/agents/my_first_aea,bafybeia3qwzpoqjxpgjkz6rmpocvqwyzaepj56yvkwzeylpdivzsxidclm +fetchai/connections/gym,bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 +fetchai/connections/http_client,bafybeif27hbtpzqe54vkvbsfwsyem2fimq46cgca3rfuvbh2sdzfbgor5i +fetchai/connections/http_server,bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je +fetchai/connections/ledger,bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa fetchai/connections/local,bafybeidu5cgji37wuczrecdfni6h6zarzqno2liycr4niozxqpxsrmnny4 fetchai/connections/stub,bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu -fetchai/contracts/erc1155,bafybeid2fsfivifcpe3uij3h7xcpz7juivj2vlmnlfhf4ei7petdtlhhp4 +fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose @@ -17,20 +17,20 @@ fetchai/protocols/ledger_api,bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiese fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm -fetchai/skills/echo,bafybeiapq3npfk62s36rdnfd2is5kgmz6jw4nyoiggj3t4pslab2cazczq -fetchai/skills/erc1155_client,bafybeic3egxoim2oqypkrrwxibx2izynyff2f7wcyhwiq5shi5gwsn2gcu -fetchai/skills/erc1155_deploy,bafybeiaw7axycucpkex7aghrkwyj5fdq4jv3fpil7ypocvdhsnf7grdc6e +fetchai/skills/echo,bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy +fetchai/skills/erc1155_client,bafybeifvdtsvsojqrlbi5we5i34chobugt3g6st5ochdeujzrrl4et6spy +fetchai/skills/erc1155_deploy,bafybeihyde4lpbpm4eydveowp2kdrw25murprahrtobb4ydr6wbujf5px4 fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a -fetchai/skills/generic_buyer,bafybeicgmsry7np5djwdwidp5p53ab3rosuh6szgkg6yeezytcrulh7jla -fetchai/skills/generic_seller,bafybeiaddns2uygyqhgrkd4apgbxh2osl6qs6psz3r7zu66ahtoqyajy6a -fetchai/skills/gym,bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu +fetchai/skills/generic_buyer,bafybeieekzr3dpo3avi72l3gcxtfdjgbrfufkr542w2tclho6qe6nkv3km +fetchai/skills/generic_seller,bafybeig4kvs5pyhk4dt6xjcuvnxcajkb6t6jz74srbsxyaa33aohdtjqha +fetchai/skills/gym,bafybeibnh47c5rw2ijq2xz4n5oyxney4zrlddq6djvhwfniudy44oj243y fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeic4xvz5hwabultbdczapr34gttobhqw5r3k5c25tsprozx2gwyjku -open_aea/agents/http_echo,bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 -open_aea/agents/my_first_aea,bafybeiev6rhcgye47q3zifdbe7rkyh5ghtq7h4nhufmfwubrfxygu5un5a +open_aea/agents/gym_aea,bafybeibdnren5aarfqnd4hqoyemenv4kjdysrpsnm5wo52lrhhzhg5vr2m +open_aea/agents/http_echo,bafybeick5guncuvf3zehoqfudca6r5q3a6qktsy7k5m5feilqpw37ltopu +open_aea/agents/my_first_aea,bafybeig5qbu7wcafjxstduc5vdn6a2rkt5rakie3edltev2p6dglqnskri open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 9f2f182d72..f2de617ec4 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +- fetchai/gym:0.19.0:bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu +- fetchai/gym:0.20.0:bafybeibnh47c5rw2ijq2xz4n5oyxney4zrlddq6djvhwfniudy44oj243y default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index 662bd620e1..e8110ce74b 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey +- fetchai/http_server:0.22.0:bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 37bd37381e..924671ca3c 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeiapq3npfk62s36rdnfd2is5kgmz6jw4nyoiggj3t4pslab2cazczq +- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From 70666b4c130ae55d882b474f8fa4e7ec9ca50433 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:32:32 +0000 Subject: [PATCH 37/93] feat: move tests for local connection into package directory --- aea/test_tools/utils.py | 32 + .../fetchai/connections/local/connection.yaml | 4 + .../connections/local/tests/__init__.py | 20 + .../connections/local/tests/test_misc.py | 272 ++++++++ .../local/tests/test_search_services.py | 652 ++++++++++++++++++ packages/hashes.csv | 2 +- 6 files changed, 981 insertions(+), 1 deletion(-) create mode 100644 aea/test_tools/utils.py create mode 100644 packages/fetchai/connections/local/tests/__init__.py create mode 100644 packages/fetchai/connections/local/tests/test_misc.py create mode 100644 packages/fetchai/connections/local/tests/test_search_services.py diff --git a/aea/test_tools/utils.py b/aea/test_tools/utils.py new file mode 100644 index 0000000000..3777c08e2e --- /dev/null +++ b/aea/test_tools/utils.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""Helpful utilities.""" + +import time + + +def wait_for_condition(condition_checker, timeout=2, error_msg="Timeout", period=0.001): + """Wait for condition to occur in selected timeout.""" + + start_time = time.time() + while not condition_checker(): + time.sleep(period) + if time.time() > start_time + timeout: + raise TimeoutError(error_msg) diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index 904d25e6ab..d693220845 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -9,10 +9,14 @@ fingerprint: README.md: bafybeigayltuo3dejkvuqvm6cysyzw6xueha4ehgo23qv75xdavd7bik24 __init__.py: bafybeibojyrqpiw5xkemsnrdie572mixa5ud4sxdtmpgfutl253kj4zjga connection.py: bafybeielwpaxz4nvhbrhmg3eyp55qq42drfyicfmbfbfty45bnzat7pvwm + tests/__init__.py: bafybeihwthgb4qi2py7i5kuc4rn6n3lgxb756pxo7c7wru2ek6m2mon4ua + tests/test_misc.py: bafybeigncqgszcn5jcy4mpvk2ecjeaa2hnk5kgc2wenvssj7v34jxmftne + tests/test_search_services.py: bafybeigf4ykvxwxjjkjtqnwfzggzdux547ivfyy54mmrdv3ftpjh7f3wva fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose - fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii class_name: OEFLocalConnection config: {} diff --git a/packages/fetchai/connections/local/tests/__init__.py b/packages/fetchai/connections/local/tests/__init__.py new file mode 100644 index 0000000000..af4a4fc07b --- /dev/null +++ b/packages/fetchai/connections/local/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the local OEF node implementation.""" diff --git a/packages/fetchai/connections/local/tests/test_misc.py b/packages/fetchai/connections/local/tests/test_misc.py new file mode 100644 index 0000000000..12aefe208d --- /dev/null +++ b/packages/fetchai/connections/local/tests/test_misc.py @@ -0,0 +1,272 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the local OEF node implementation.""" +import asyncio +import unittest.mock + +import pytest + +from aea.common import Address +from aea.configurations.base import ConnectionConfig +from aea.connections.base import Connection +from aea.helpers.search.models import Constraint, ConstraintType, Description, Query +from aea.identity.base import Identity +from aea.mail.base import Envelope +from aea.multiplexer import Multiplexer + +from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.protocols.fipa.message import FipaMessage + + +def make_local_connection( + address: Address, + public_key: str, + node: LocalNode, + restricted_to_protocols=None, + excluded_protocols=None, +) -> Connection: + configuration = ConnectionConfig( + restricted_to_protocols=restricted_to_protocols, + excluded_protocols=excluded_protocols, + connection_id=OEFLocalConnection.connection_id, + ) + oef_local_connection = OEFLocalConnection( + configuration=configuration, + data_dir=unittest.mock.MagicMock(), + identity=Identity("name", address, public_key), + local_node=node, + ) + return oef_local_connection + + +def test_connection(): + """Test that two OEF local connection can connect to a local node.""" + with LocalNode() as node: + + multiplexer1 = Multiplexer( + [make_local_connection("multiplexer1", "my_public_key_1", node)] + ) + multiplexer2 = Multiplexer( + [make_local_connection("multiplexer2", "my_public_key_2", node)] + ) + + multiplexer1.connect() + multiplexer2.connect() + + multiplexer1.disconnect() + multiplexer2.disconnect() + + +@pytest.mark.asyncio +async def test_connection_twice_return_none(): + """Test that connecting twice works.""" + with LocalNode() as node: + address = "address" + public_key = "public_key" + connection = make_local_connection(address, public_key, node) + await connection.connect() + await node.connect(address, connection._reader) + message = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + expected_envelope = Envelope( + to=address, + sender=address, + message=message, + ) + await connection.send(expected_envelope) + actual_envelope = await connection.receive() + + assert expected_envelope == actual_envelope + + await connection.disconnect() + + +@pytest.mark.asyncio +async def test_receiving_when_not_connected_raise_exception(): + """Test that when we try to receive an envelope from a not connected connection we raise exception.""" + with LocalNode() as node: + with pytest.raises(ConnectionError): + address = "address" + public_key = "public_key" + connection = make_local_connection(address, public_key, node) + await connection.receive() + + +@pytest.mark.asyncio +async def test_receiving_returns_none_when_error_occurs(): + """Test that when we try to receive an envelope and an error occurs we return None.""" + with LocalNode() as node: + address = "address" + public_key = "public_key" + connection = make_local_connection(address, public_key, node) + await connection.connect() + + with unittest.mock.patch.object( + connection._reader, "get", side_effect=Exception + ): + result = await connection.receive() + assert result is None + + await connection.disconnect() + + +def test_communication(): + """Test that two multiplexer can communicate through the node.""" + with LocalNode() as node: + + multiplexer1 = Multiplexer( + [make_local_connection("multiplexer1", "multiplexer1_public_key", node)] + ) + multiplexer2 = Multiplexer( + [make_local_connection("multiplexer2", "multiplexer1_public_key", node)] + ) + + multiplexer1.connect() + multiplexer2.connect() + + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + envelope = Envelope( + to="multiplexer2", + sender="multiplexer1", + message=msg, + ) + multiplexer1.put(envelope) + + msg = FipaMessage( + performative=FipaMessage.Performative.CFP, + dialogue_reference=(str(0), ""), + message_id=1, + target=0, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + envelope = Envelope( + to="multiplexer2", + sender="multiplexer1", + message=msg, + ) + multiplexer1.put(envelope) + + msg = FipaMessage( + performative=FipaMessage.Performative.PROPOSE, + dialogue_reference=(str(0), ""), + message_id=2, + target=1, + proposal=Description({}), + ) + + envelope = Envelope( + to="multiplexer2", + sender="multiplexer1", + message=msg, + ) + multiplexer1.put(envelope) + + msg = FipaMessage( + performative=FipaMessage.Performative.ACCEPT, + dialogue_reference=(str(0), ""), + message_id=1, + target=0, + ) + envelope = Envelope( + to="multiplexer2", + sender="multiplexer1", + message=msg, + ) + multiplexer1.put(envelope) + + msg = FipaMessage( + performative=FipaMessage.Performative.DECLINE, + dialogue_reference=(str(0), ""), + message_id=1, + target=0, + ) + envelope = Envelope( + to="multiplexer2", + sender="multiplexer1", + message=msg, + ) + multiplexer1.put(envelope) + + envelope = multiplexer2.get(block=True, timeout=1.0) + msg = envelope.message + assert ( + envelope.protocol_specification_id + == DefaultMessage.protocol_specification_id + ) + assert msg.content == b"hello" + envelope = multiplexer2.get(block=True, timeout=1.0) + msg = envelope.message + assert ( + envelope.protocol_specification_id == FipaMessage.protocol_specification_id + ) + assert msg.performative == FipaMessage.Performative.CFP + envelope = multiplexer2.get(block=True, timeout=1.0) + msg = envelope.message + assert ( + envelope.protocol_specification_id == FipaMessage.protocol_specification_id + ) + assert msg.performative == FipaMessage.Performative.PROPOSE + envelope = multiplexer2.get(block=True, timeout=1.0) + msg = envelope.message + assert ( + envelope.protocol_specification_id == FipaMessage.protocol_specification_id + ) + assert msg.performative == FipaMessage.Performative.ACCEPT + envelope = multiplexer2.get(block=True, timeout=1.0) + msg = envelope.message + assert ( + envelope.protocol_specification_id == FipaMessage.protocol_specification_id + ) + assert msg.performative == FipaMessage.Performative.DECLINE + multiplexer1.disconnect() + multiplexer2.disconnect() + + +@pytest.mark.asyncio +async def test_connecting_to_node_with_same_key(): + """Test that connecting twice with the same key works correctly.""" + with LocalNode() as node: + address = "my_address" + my_queue = asyncio.Queue() + + ret = await node.connect(address, my_queue) + assert ret is not None and isinstance(ret, asyncio.Queue) + ret = await node.connect(address, my_queue) + assert ret is None + + +def test_stop_before_start(): + """Test stop called before start.""" + node = LocalNode() + with pytest.raises(ValueError, match="Connection not started!"): + node.stop() diff --git a/packages/fetchai/connections/local/tests/test_search_services.py b/packages/fetchai/connections/local/tests/test_search_services.py new file mode 100644 index 0000000000..2fb56fc1a6 --- /dev/null +++ b/packages/fetchai/connections/local/tests/test_search_services.py @@ -0,0 +1,652 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests for the search feature of the local OEF node.""" +import unittest.mock +from typing import cast + +import pytest + +from aea.common import Address +from aea.helpers.search.models import ( + Attribute, + Constraint, + ConstraintType, + DataModel, + Description, + Query, +) +from aea.mail.base import Envelope, EnvelopeContext, Message +from aea.multiplexer import InBox, Multiplexer +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.test_tools.mocks import AnyStringWith +from aea.test_tools.utils import wait_for_condition + +from packages.fetchai.connections.local.connection import ( + LocalNode, + OEFLocalConnection, + OEF_LOCAL_NODE_ADDRESS, + OEF_LOCAL_NODE_SEARCH_ADDRESS, +) +from packages.fetchai.connections.local.tests.test_misc import make_local_connection +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues +from packages.fetchai.protocols.fipa.message import FipaMessage +from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue +from packages.fetchai.protocols.oef_search.dialogues import ( + OefSearchDialogues as BaseOefSearchDialogues, +) +from packages.fetchai.protocols.oef_search.message import OefSearchMessage + + +MAX_FLAKY_RERUNS = 3 + + +class OefSearchDialogues(BaseOefSearchDialogues): + """The dialogues class keeps track of all http dialogues.""" + + def __init__(self, self_address: Address, **kwargs) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return OefSearchDialogue.Role.AGENT + + BaseOefSearchDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + ) + + +class TestNoValidDialogue: + """Test that the search request returns an empty search result.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.node = LocalNode() + cls.node.start() + + cls.address_1 = "address_1" + cls.public_key_1 = "public_key_1" + cls.connection = make_local_connection( + cls.address_1, + cls.public_key_1, + cls.node, + ) + cls.multiplexer = Multiplexer([cls.connection]) + + cls.multiplexer.connect() + cls.dialogues = OefSearchDialogues(cls.address_1) + + @pytest.mark.asyncio + async def test_wrong_dialogue(self): + """Test that at the beginning, the search request returns an empty search result.""" + query = Query( + constraints=[Constraint("foo", ConstraintType("==", 1))], model=None + ) + + # build and send the request + search_services_request = OefSearchMessage( + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + message_id=2, + target=1, + dialogue_reference=self.dialogues.new_self_initiated_dialogue_reference(), + query=query, + ) + search_services_request.to = OEF_LOCAL_NODE_SEARCH_ADDRESS + + # the incorrect message cannot be sent into a dialogue, so this is omitted. + + search_services_request.sender = self.address_1 + envelope = Envelope( + to=search_services_request.to, + sender=search_services_request.sender, + message=search_services_request, + ) + with unittest.mock.patch.object( + self.node, "_handle_oef_message", side_effect=self.node._handle_oef_message + ) as mock_handle: + with unittest.mock.patch.object(self.node.logger, "warning") as mock_logger: + self.multiplexer.put(envelope) + wait_for_condition(lambda: mock_handle.called, timeout=1.0) + mock_logger.assert_any_call( + AnyStringWith("Could not create dialogue for message=") + ) + + @classmethod + def teardown_class(cls): + """Teardown the test.""" + cls.multiplexer.disconnect() + cls.node.stop() + + +class TestEmptySearch: + """Test that the search request returns an empty search result.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.node = LocalNode() + cls.node.start() + + cls.address_1 = "address_1" + cls.public_key_1 = "public_key_1" + cls.multiplexer = Multiplexer( + [ + make_local_connection( + cls.address_1, + cls.public_key_1, + cls.node, + ) + ] + ) + + cls.multiplexer.connect() + cls.dialogues = OefSearchDialogues(cls.address_1) + + def test_empty_search_result(self): + """Test that at the beginning, the search request returns an empty search result.""" + search_services_request, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=Query(constraints=[], model=None), + ) + envelope = Envelope( + to=search_services_request.to, + sender=search_services_request.sender, + message=search_services_request, + ) + self.multiplexer.put(envelope) + + # check the result + response_envelope = self.multiplexer.get(block=True, timeout=2.0) + assert ( + response_envelope.protocol_specification_id + == OefSearchMessage.protocol_specification_id + ) + search_result = cast(OefSearchMessage, response_envelope.message) + response_dialogue = self.dialogues.update(search_result) + assert response_dialogue == sending_dialogue + assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT + assert search_result.agents == () + + @classmethod + def teardown_class(cls): + """Teardown the test.""" + cls.multiplexer.disconnect() + cls.node.stop() + + +class TestSimpleSearchResult: + """Test that a simple search result return the expected result.""" + + def setup(self): + """Set up the test.""" + self.node = LocalNode() + self.node.start() + + self.address_1 = "address" + self.public_key_1 = "public_key_1" + self.multiplexer = Multiplexer( + [ + make_local_connection( + self.address_1, + self.public_key_1, + self.node, + ) + ] + ) + + self.multiplexer.connect() + + # register a service. + self.dialogues = OefSearchDialogues(self.address_1) + self.data_model = DataModel( + "foobar", + attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], + ) + service_description = Description( + {"foo": 1, "bar": "baz"}, data_model=self.data_model + ) + register_service_request, self.sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=register_service_request.to, + sender=register_service_request.sender, + message=register_service_request, + ) + self.multiplexer.put(envelope) + + @pytest.mark.flaky( + reruns=MAX_FLAKY_RERUNS + ) # TODO: check reasons!. quite unstable test + def test_not_empty_search_result(self): + """Test that the search result contains one entry after a successful registration.""" + # build and send the request + search_services_request, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=Query(constraints=[], model=self.data_model), + ) + envelope = Envelope( + to=search_services_request.to, + sender=search_services_request.sender, + message=search_services_request, + ) + self.multiplexer.put(envelope) + + # check the result + response_envelope = self.multiplexer.get(block=True, timeout=2.0) + assert ( + response_envelope.protocol_specification_id + == OefSearchMessage.protocol_specification_id + ) + search_result = cast(OefSearchMessage, response_envelope.message) + response_dialogue = self.dialogues.update(search_result) + assert response_dialogue == sending_dialogue + assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT + assert search_result.agents == (self.address_1,) + + def teardown(self): + """Teardown the test.""" + self.multiplexer.disconnect() + self.node.stop() + + +class TestUnregister: + """Test that the unregister service results to Error Message.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.node = LocalNode() + cls.node.start() + + cls.address_1 = "address_1" + cls.public_key_1 = "public_key_1" + cls.multiplexer1 = Multiplexer( + [ + make_local_connection( + cls.address_1, + cls.public_key_1, + cls.node, + ) + ] + ) + cls.address_2 = "address_2" + cls.public_key_2 = "public_key_2" + cls.multiplexer2 = Multiplexer( + [ + make_local_connection( + cls.address_2, + cls.public_key_2, + cls.node, + ) + ] + ) + cls.multiplexer1.connect() + cls.multiplexer2.connect() + cls.dialogues = OefSearchDialogues(cls.address_1) + + def test_unregister_service_result(self): + """Test that at the beginning, the search request returns an empty search result.""" + data_model = DataModel( + "foobar", + attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], + ) + service_description = Description( + {"foo": 1, "bar": "baz"}, data_model=data_model + ) + msg, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + self.multiplexer1.put(envelope) + + # check the result + response_envelope = self.multiplexer1.get(block=True, timeout=5.0) + assert ( + response_envelope.protocol_specification_id + == OefSearchMessage.protocol_specification_id + ) + response = cast(OefSearchMessage, response_envelope.message) + response_dialogue = self.dialogues.update(response) + assert response_dialogue == sending_dialogue + assert response.performative == OefSearchMessage.Performative.OEF_ERROR + + msg, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + self.multiplexer1.put(envelope) + + # Search for the registered service + msg, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=Query([Constraint("foo", ConstraintType("==", 1))]), + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + self.multiplexer1.put(envelope) + # check the result + response_envelope = self.multiplexer1.get(block=True, timeout=5.0) + search_result = cast(OefSearchMessage, response_envelope.message) + response_dialogue = self.dialogues.update(search_result) + assert response_dialogue == sending_dialogue + assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT + assert len(search_result.agents) == 1 + + # unregister the service + msg, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + self.multiplexer1.put(envelope) + + # the same query returns empty + # Search for the register agent + msg, sending_dialogue = self.dialogues.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=Query([Constraint("foo", ConstraintType("==", 1))]), + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + self.multiplexer1.put(envelope) + # check the result + response_envelope = self.multiplexer1.get(block=True, timeout=5.0) + search_result = cast(OefSearchMessage, response_envelope.message) + response_dialogue = self.dialogues.update(search_result) + assert response_dialogue == sending_dialogue + assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT + assert search_result.agents == () + + @classmethod + def teardown_class(cls): + """Teardown the test.""" + cls.multiplexer1.disconnect() + cls.multiplexer2.disconnect() + cls.node.stop() + + +class TestAgentMessage: + """Test the the OEF will return Dialogue Error if it doesn't know the agent address.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.node = LocalNode() + cls.node.start() + + cls.address_1 = "address_1" + cls.public_key_1 = "public_key_1" + cls.multiplexer1 = Multiplexer( + [ + make_local_connection( + cls.address_1, + cls.public_key_1, + cls.node, + ) + ] + ) + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return FipaDialogue.Role.SELLER + + cls.dialogues = FipaDialogues(cls.address_1, role_from_first_message) + + @pytest.mark.asyncio + async def test_messages(self): + """Test that at the beginning, the search request returns an empty search result.""" + msg, sending_dialogue = self.dialogues.create( + counterparty="some_agent", + performative=FipaMessage.Performative.CFP, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + with pytest.raises(ConnectionError): + await make_local_connection( + self.address_1, + self.public_key_1, + self.node, + ).send(envelope) + + self.multiplexer1.connect() + msg, sending_dialogue = self.dialogues.create( + counterparty="this_address_does_not_exist", + performative=FipaMessage.Performative.CFP, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + ) + self.multiplexer1.put(envelope) + + # check the result + response_envelope = self.multiplexer1.get(block=True, timeout=5.0) + assert ( + response_envelope.protocol_specification_id + == DefaultMessage.protocol_specification_id + ) + assert response_envelope.sender == OEF_LOCAL_NODE_ADDRESS + result = response_envelope.message + assert result.performative == DefaultMessage.Performative.ERROR + + @classmethod + def teardown_class(cls): + """Teardown the test.""" + cls.multiplexer1.disconnect() + cls.node.stop() + + +class TestFilteredSearchResult: + """Test that the query system of the search gives the expected result.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.node = LocalNode() + cls.node.start() + + cls.address_1 = "multiplexer1" + cls.public_key_1 = "public_key_1" + cls.address_2 = "multiplexer2" + cls.public_key_2 = "public_key_2" + cls.multiplexer1 = Multiplexer( + [ + make_local_connection( + cls.address_1, + cls.public_key_1, + cls.node, + ) + ] + ) + cls.multiplexer2 = Multiplexer( + [ + make_local_connection( + cls.address_2, + cls.public_key_2, + cls.node, + ) + ] + ) + cls.multiplexer1.connect() + cls.multiplexer2.connect() + cls.dialogues1 = OefSearchDialogues(cls.address_1) + cls.dialogues2 = OefSearchDialogues(cls.address_2) + + # register 'multiplexer1' as a service 'foobar'. + cls.data_model_foobar = DataModel( + "foobar", + attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], + ) + service_description = Description( + {"foo": 1, "bar": "baz"}, data_model=cls.data_model_foobar + ) + register_service_request, sending_dialogue = cls.dialogues1.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=register_service_request.to, + sender=register_service_request.sender, + message=register_service_request, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + cls.multiplexer1.put(envelope) + wait_for_condition(lambda: len(cls.node.services) == 1, timeout=10) + + # register 'multiplexer2' as a service 'barfoo'. + cls.data_model_barfoo = DataModel( + "barfoo", + attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], + ) + service_description = Description( + {"foo": 1, "bar": "baz"}, data_model=cls.data_model_barfoo + ) + register_service_request, sending_dialogue = cls.dialogues2.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=register_service_request.to, + sender=register_service_request.sender, + message=register_service_request, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + + cls.multiplexer2.put(envelope) + wait_for_condition(lambda: len(cls.node.services) == 2, timeout=10) + + # unregister multiplexer1 + data_model = DataModel( + "foobar", + attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], + ) + service_description = Description( + {"foo": 1, "bar": "baz"}, data_model=data_model + ) + msg, sending_dialogue = cls.dialogues1.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, + service_description=service_description, + ) + envelope = Envelope( + to=msg.to, + sender=msg.sender, + message=msg, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + cls.multiplexer1.put(envelope) + # ensure one service stays registered + wait_for_condition(lambda: len(cls.node.services) == 1, timeout=10) + + def test_filtered_search_result(self): + """Test that the search result contains only the entries matching the query.""" + # build and send the request + search_services_request, sending_dialogue = self.dialogues1.create( + counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=Query(constraints=[], model=self.data_model_barfoo), + ) + envelope = Envelope( + to=search_services_request.to, + sender=search_services_request.sender, + message=search_services_request, + context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), + ) + self.multiplexer1.put(envelope) + + # check the result + response_envelope = InBox(self.multiplexer1).get(block=True, timeout=5.0) + search_result = cast(OefSearchMessage, response_envelope.message) + response_dialogue = self.dialogues1.update(search_result) + assert response_dialogue == sending_dialogue + assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT + assert search_result.agents == (self.address_2,), self.node.services + + @classmethod + def teardown_class(cls): + """Teardown the test.""" + cls.multiplexer1.disconnect() + cls.multiplexer2.disconnect() + cls.node.stop() diff --git a/packages/hashes.csv b/packages/hashes.csv index e0026911c8..59ca131724 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -5,7 +5,7 @@ fetchai/connections/gym,bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxw fetchai/connections/http_client,bafybeif27hbtpzqe54vkvbsfwsyem2fimq46cgca3rfuvbh2sdzfbgor5i fetchai/connections/http_server,bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je fetchai/connections/ledger,bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa -fetchai/connections/local,bafybeidu5cgji37wuczrecdfni6h6zarzqno2liycr4niozxqpxsrmnny4 +fetchai/connections/local,bafybeidr3wjv6h2wgysm26bbcs26zuzesmzq2dh5dhrqtoiilnfrubaure fetchai/connections/stub,bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 From e636f060eb29acf49e7464e60aab2e43ea42077a Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:39:43 +0000 Subject: [PATCH 38/93] feat: port stub connections test to packages --- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- .../fetchai/connections/stub/connection.yaml | 7 +- .../connections/stub/tests/__init__.py | 20 + .../connections/stub/tests/test_stub.py | 423 ++++++++++++++++++ packages/hashes.csv | 8 +- .../agents/my_first_aea/aea-config.yaml | 2 +- 7 files changed, 456 insertions(+), 8 deletions(-) create mode 100644 packages/fetchai/connections/stub/tests/__init__.py create mode 100644 packages/fetchai/connections/stub/tests/test_stub.py diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index a1078f30ad..2c498bab1e 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu +- fetchai/stub:0.21.0:bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 8c2c31cc7e..13395d6d03 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu +- fetchai/stub:0.21.0:bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index df8aba016a..dd63d98509 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -10,9 +10,14 @@ fingerprint: README.md: bafybeiht3qtxpf2meyrveoghidjtdsz433wguz4wlxhzsiixpafkrjv7yy __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 + input_file: bafybeiftu27piztiu5bfxbvhqsbppgtseykyfot6wtlrrzeuzya6zrgpky + tests/__init__.py: bafybeihodqbifehez7r4zalztsn5ildne4rxc6rvdhykl7vscghxi4v45i + tests/test_stub.py: bafybeickhyxxbaygqa234xk4afjqklj46455rgghyhfcnbfb76e6lm3hpe fingerprint_ignore_patterns: [] connections: [] -protocols: [] +protocols: +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/connections/stub/tests/__init__.py b/packages/fetchai/connections/stub/tests/__init__.py new file mode 100644 index 0000000000..556ec04c96 --- /dev/null +++ b/packages/fetchai/connections/stub/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2018-2020 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the stub connection implementation.""" diff --git a/packages/fetchai/connections/stub/tests/test_stub.py b/packages/fetchai/connections/stub/tests/test_stub.py new file mode 100644 index 0000000000..4e7a6ed582 --- /dev/null +++ b/packages/fetchai/connections/stub/tests/test_stub.py @@ -0,0 +1,423 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This test module contains the tests for the stub connection.""" +import asyncio +import base64 +import os +import shutil +import tempfile +import time +from pathlib import Path +from unittest import mock + +import pytest + +from aea.configurations.base import ConnectionConfig, PublicId +from aea.crypto.wallet import CryptoStore +from aea.helpers.file_io import write_with_lock +from aea.identity.base import Identity +from aea.mail.base import Envelope +from aea.multiplexer import Multiplexer + +from packages.fetchai.connections.stub.connection import ( + StubConnection, + envelope_from_bytes, + lock_file, + write_envelope, +) +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.protocols.oef_search.message import OefSearchMessage + + +SEPARATOR = "," +PACKAGE_DIR = Path(__file__).parent.parent +MAX_FLAKY_RERUNS = 3 + + +def _make_stub_connection(input_file_path: str, output_file_path: str): + configuration = ConnectionConfig( + input_file=input_file_path, + output_file=output_file_path, + connection_id=StubConnection.connection_id, + ) + connection = StubConnection(configuration=configuration, data_dir=mock.MagicMock()) + return connection + + +def make_test_envelope() -> Envelope: + """Create a test envelope.""" + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + msg.to = "any" + envelope = Envelope( + to="any", + sender="any", + message=msg, + ) + return envelope + + +class TestStubConnectionReception: + """Test that the stub connection is implemented correctly.""" + + def setup(self): + """Set the test up.""" + self.cwd = os.getcwd() + self.tmpdir = Path(tempfile.mkdtemp()) + d = self.tmpdir / "test_stub" + d.mkdir(parents=True) + self.input_file_path = d / "input_file.csv" + self.output_file_path = d / "output_file.csv" + self.connection = _make_stub_connection( + self.input_file_path, self.output_file_path + ) + + self.multiplexer = Multiplexer([self.connection]) + self.multiplexer.connect() + os.chdir(self.tmpdir) + + def test_reception_a(self): + """Test that the connection receives what has been enqueued in the input file.""" + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + expected_envelope = Envelope( + to="any", + sender="anys", + message=msg, + ) + + with open(self.input_file_path, "ab+") as f: + write_envelope(expected_envelope, f) + + actual_envelope = self.multiplexer.get(block=True, timeout=3.0) + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + msg = DefaultMessage.serializer.decode(actual_envelope.message) + msg.to = actual_envelope.to + msg.sender = actual_envelope.sender + assert expected_envelope.message == msg + + def test_reception_b(self): + """Test that the connection receives what has been enqueued in the input file.""" + # a message containing delimiters and newline characters + msg = b"\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468d\n,\nB8Ab795\n\n49B49C88DC991990E7910891,,dbd\n" + protocol_specification_id = PublicId.from_str("some_author/some_name:0.1.0") + encoded_envelope = "{}{}{}{}{}{}{}{}".format( + "any", + SEPARATOR, + "any", + SEPARATOR, + protocol_specification_id, + SEPARATOR, + msg.decode("utf-8"), + SEPARATOR, + ) + encoded_envelope = encoded_envelope.encode("utf-8") + + with open(self.input_file_path, "ab+") as f: + write_with_lock(f, encoded_envelope) + + actual_envelope = self.multiplexer.get(block=True, timeout=3.0) + assert "any" == actual_envelope.to + assert "any" == actual_envelope.sender + assert protocol_specification_id == actual_envelope.protocol_specification_id + assert msg == actual_envelope.message + + def test_reception_c(self): + """Test that the connection receives what has been enqueued in the input file.""" + encoded_envelope = b"0x5E22777dD831A459535AA4306AceC9cb22eC4cB5,default_oef,fetchai/oef_search:1.0.0,\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd," + expected_envelope = Envelope( + to="0x5E22777dD831A459535AA4306AceC9cb22eC4cB5", + sender="default_oef", + protocol_specification_id=OefSearchMessage.protocol_specification_id, + message=b"\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd", + ) + with open(self.input_file_path, "ab+") as f: + write_with_lock(f, encoded_envelope) + + actual_envelope = self.multiplexer.get(block=True, timeout=3.0) + assert expected_envelope == actual_envelope + + def teardown(self): + """Tear down the test.""" + os.chdir(self.cwd) + try: + shutil.rmtree(self.tmpdir) + except (OSError, IOError): + pass + self.multiplexer.disconnect() + + +class TestStubConnectionSending: + """Test that the stub connection is implemented correctly.""" + + @classmethod + def setup_class(cls): + """Set the test up.""" + cls.cwd = os.getcwd() + cls.tmpdir = Path(tempfile.mkdtemp()) + d = cls.tmpdir / "test_stub" + d.mkdir(parents=True) + cls.input_file_path = d / "input_file.csv" + cls.output_file_path = d / "output_file.csv" + cls.connection = _make_stub_connection( + cls.input_file_path, cls.output_file_path + ) + + cls.multiplexer = Multiplexer([cls.connection]) + cls.multiplexer.connect() + os.chdir(cls.tmpdir) + + def test_connection_is_established(self): + """Test the stub connection is established and then bad formatted messages.""" + assert self.connection.is_connected + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + encoded_envelope = "{}{}{}{}{}{}{}{}".format( + "any", + SEPARATOR, + "any", + SEPARATOR, + DefaultMessage.protocol_specification_id, + SEPARATOR, + DefaultMessage.serializer.encode(msg).decode("utf-8"), + SEPARATOR, + ) + encoded_envelope = base64.b64encode(encoded_envelope.encode("utf-8")) + envelope = envelope_from_bytes(encoded_envelope) + if envelope is not None: + self.connection._put_envelopes([envelope]) + + assert ( + self.connection.in_queue.empty() + ), "The inbox must be empty due to bad encoded message" + + def test_send_message(self): + """Test that the messages in the outbox are posted on the output file.""" + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + expected_envelope = Envelope( + to="any", + sender="anys", + message=msg, + ) + + self.multiplexer.put(expected_envelope) + time.sleep(0.1) + + with open(self.output_file_path, "rb+") as f: + lines = f.readlines() + + assert len(lines) == 2 + line = lines[0] + lines[1] + to, sender, protocol_specification_id, message, end = line.strip().split( + "{}".format(SEPARATOR).encode("utf-8"), maxsplit=4 + ) + to = to.decode("utf-8") + sender = sender.decode("utf-8") + protocol_specification_id = PublicId.from_str( + protocol_specification_id.decode("utf-8") + ) + assert end in [b"", b"\n"] + + actual_envelope = Envelope( + to=to, + sender=sender, + protocol_specification_id=protocol_specification_id, + message=message, + ) + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + msg = DefaultMessage.serializer.decode(actual_envelope.message) + msg.to = actual_envelope.to + msg.sender = actual_envelope.sender + assert expected_envelope.message == msg + + @classmethod + def teardown_class(cls): + """Tear down the test.""" + os.chdir(cls.cwd) + try: + shutil.rmtree(cls.tmpdir) + except (OSError, IOError): + pass + cls.multiplexer.disconnect() + + +@pytest.mark.asyncio +async def test_disconnection_when_already_disconnected(): + """Test the case when disconnecting a connection already disconnected.""" + tmpdir = Path(tempfile.mkdtemp()) + d = tmpdir / "test_stub" + d.mkdir(parents=True) + input_file_path = d / "input_file.csv" + output_file_path = d / "output_file.csv" + connection = _make_stub_connection(input_file_path, output_file_path) + + assert not connection.is_connected + await connection.disconnect() + assert not connection.is_connected + + +@pytest.mark.asyncio +async def test_connection_when_already_connected(): + """Test the case when connecting a connection already connected.""" + tmpdir = Path(tempfile.mkdtemp()) + d = tmpdir / "test_stub" + d.mkdir(parents=True) + input_file_path = d / "input_file.csv" + output_file_path = d / "output_file.csv" + connection = _make_stub_connection(input_file_path, output_file_path) + + assert not connection.is_connected + await connection.connect() + assert connection.is_connected + await connection.connect() + assert connection.is_connected + + await connection.disconnect() + + +@pytest.mark.asyncio +async def test_receiving_returns_none_when_error_occurs(): + """Test that when we try to receive an envelope and an error occurs we return None.""" + tmpdir = Path(tempfile.mkdtemp()) + d = tmpdir / "test_stub" + d.mkdir(parents=True) + input_file_path = d / "input_file.csv" + output_file_path = d / "output_file.csv" + connection = _make_stub_connection(input_file_path, output_file_path) + + await connection.connect() + with mock.patch.object(connection.in_queue, "get", side_effect=Exception): + ret = await connection.receive() + assert ret is None + + await connection.disconnect() + + +@pytest.mark.asyncio +async def test_multiple_envelopes(): + """Test many envelopes received.""" + tmpdir = Path(tempfile.mkdtemp()) + d = tmpdir / "test_stub" + d.mkdir(parents=True) + input_file_path = d / "input_file.csv" + output_file_path = d / "output_file.csv" + connection = _make_stub_connection(input_file_path, output_file_path) + + num_envelopes = 5 + await connection.connect() + assert connection.is_connected + + async def wait_num(num): + for _ in range(num): + assert await connection.receive() + + task = asyncio.get_event_loop().create_task(wait_num(num_envelopes)) + + with open(input_file_path, "ab+") as f: + for _ in range(num_envelopes): + write_envelope(make_test_envelope(), f) + await asyncio.sleep(0.01) # spin asyncio loop + + await asyncio.wait_for(task, timeout=3) + await connection.disconnect() + + +@pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) +@pytest.mark.asyncio +async def test_bad_envelope(): + """Test bad format envelop.""" + tmpdir = Path(tempfile.mkdtemp()) + d = tmpdir / "test_stub" + d.mkdir(parents=True) + input_file_path = d / "input_file.csv" + output_file_path = d / "output_file.csv" + connection = _make_stub_connection(input_file_path, output_file_path) + + await connection.connect() + + with open(input_file_path, "ab+") as f: + f.write(b"1,2,3,4,5,") + f.flush() + + with pytest.raises(asyncio.TimeoutError): + f = asyncio.ensure_future(connection.receive()) + await asyncio.wait_for(f, timeout=0.1) + + await connection.disconnect() + + +@pytest.mark.asyncio +async def test_load_from_dir(): + """Test stub connection can be loaded from dir.""" + StubConnection.from_dir( + str(PACKAGE_DIR), + Identity("name", "address", "public_key"), + CryptoStore(), + os.getcwd(), + ) + + +class TestFileLock: + """Test for filelocks.""" + + def test_lock_file_ok(self): + """Work ok ok for random file.""" + with tempfile.TemporaryFile() as fp: + with lock_file(fp): + pass + + def test_lock_file_error(self): + """Fail on closed file.""" + with tempfile.TemporaryFile() as fp: + fp.close() + with pytest.raises(ValueError): + with lock_file(fp): + pass diff --git a/packages/hashes.csv b/packages/hashes.csv index 59ca131724..47095deb62 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeigffudivhaqa6rkp4dszhekqc4uwibhvdt5nq2byzfirqoulg5jqe +fetchai/agents/error_test,bafybeicimsnkwbfmzbs3krdoia5e7z4g6ifc53xaeyh27vpojwytjdjkri fetchai/agents/gym_aea,bafybeih53zssq6np6d4m6rgalhcrk3gznd5mlgglqdgu52o5fiicbusqeq -fetchai/agents/my_first_aea,bafybeia3qwzpoqjxpgjkz6rmpocvqwyzaepj56yvkwzeylpdivzsxidclm +fetchai/agents/my_first_aea,bafybeiezjyszmzrbobne2kxpunqjvftt2q5nnhok2phhcqxiupwdqpzjom fetchai/connections/gym,bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 fetchai/connections/http_client,bafybeif27hbtpzqe54vkvbsfwsyem2fimq46cgca3rfuvbh2sdzfbgor5i fetchai/connections/http_server,bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je fetchai/connections/ledger,bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa fetchai/connections/local,bafybeidr3wjv6h2wgysm26bbcs26zuzesmzq2dh5dhrqtoiilnfrubaure -fetchai/connections/stub,bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu +fetchai/connections/stub,bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6 fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeibdnren5aarfqnd4hqoyemenv4kjdysrpsnm5wo52lrhhzhg5vr2m open_aea/agents/http_echo,bafybeick5guncuvf3zehoqfudca6r5q3a6qktsy7k5m5feilqpw37ltopu -open_aea/agents/my_first_aea,bafybeig5qbu7wcafjxstduc5vdn6a2rkt5rakie3edltev2p6dglqnskri +open_aea/agents/my_first_aea,bafybeibin4tlsz5r233cfycq4zgj6f6dwnqmpzqesykkfu7b67ydumh4ce open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 924671ca3c..a0571b0dd4 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu +- fetchai/stub:0.21.0:bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie contracts: [] protocols: - fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm From 3554cface38024725a1b66eadb57df807840891e Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Wed, 31 Aug 2022 15:58:51 +0000 Subject: [PATCH 39/93] feat: port erc1155_client test to package directory --- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/gym_aea/aea-config.yaml | 10 +- .../agents/my_first_aea/aea-config.yaml | 8 +- .../fetchai/connections/gym/connection.yaml | 2 +- .../connections/http_client/connection.yaml | 2 +- .../connections/http_server/connection.yaml | 2 +- .../connections/ledger/connection.yaml | 2 +- .../fetchai/connections/local/connection.yaml | 6 +- .../fetchai/connections/stub/connection.yaml | 4 +- packages/fetchai/skills/echo/skill.yaml | 2 +- .../fetchai/skills/erc1155_client/skill.yaml | 16 +- .../skills/erc1155_client/tests/__init__.py | 21 + .../tests/intermediate_class.py | 218 +++++ .../erc1155_client/tests/test_behaviours.py | 85 ++ .../erc1155_client/tests/test_dialogues.py | 187 ++++ .../erc1155_client/tests/test_handlers.py | 859 ++++++++++++++++++ .../erc1155_client/tests/test_strategy.py | 82 ++ .../fetchai/skills/erc1155_deploy/skill.yaml | 10 +- packages/fetchai/skills/error/skill.yaml | 2 +- .../skills/fipa_dummy_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 10 +- .../fetchai/skills/generic_seller/skill.yaml | 10 +- packages/fetchai/skills/gym/skill.yaml | 6 +- packages/fetchai/skills/http_echo/skill.yaml | 4 +- packages/hashes.csv | 58 +- .../open_aea/agents/gym_aea/aea-config.yaml | 10 +- .../open_aea/agents/http_echo/aea-config.yaml | 8 +- .../agents/my_first_aea/aea-config.yaml | 8 +- 28 files changed, 1547 insertions(+), 89 deletions(-) create mode 100644 packages/fetchai/skills/erc1155_client/tests/__init__.py create mode 100644 packages/fetchai/skills/erc1155_client/tests/intermediate_class.py create mode 100644 packages/fetchai/skills/erc1155_client/tests/test_behaviours.py create mode 100644 packages/fetchai/skills/erc1155_client/tests/test_dialogues.py create mode 100644 packages/fetchai/skills/erc1155_client/tests/test_handlers.py create mode 100644 packages/fetchai/skills/erc1155_client/tests/test_strategy.py diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 2c498bab1e..f266f446f1 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie +- fetchai/stub:0.21.0:bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 46cf57ecd5..130c68cc38 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 +- fetchai/gym:0.19.0:bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby +- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeibnh47c5rw2ijq2xz4n5oyxney4zrlddq6djvhwfniudy44oj243y +- fetchai/gym:0.20.0:bafybeiecsa564i5fya5lvgkzgv6z5ehm3clhx7derehaqjvud3bhokwahy default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 13395d6d03..95114fbc63 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie +- fetchai/stub:0.21.0:bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy +- fetchai/echo:0.19.0:bafybeigqa3nmawq4zn7nmcocjtdjvvcy5clq65cizro2usizd2fyaengka default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index ff08db8c42..41fc931197 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby class_name: GymConnection config: env: '' diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index e369ed2865..e5134f99bf 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -15,7 +15,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu class_name: HTTPClientConnection config: host: 127.0.0.1 diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index d46868784b..554d6a4fee 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -19,7 +19,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu class_name: HTTPServerConnection config: api_spec_path: null diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index 4a0ca716c7..3319fde20e 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq class_name: LedgerConnection config: ledger_apis: diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index d693220845..9e95c15aca 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -15,9 +15,9 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu class_name: OEFLocalConnection config: {} excluded_protocols: [] diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index dd63d98509..650dc6464a 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -16,8 +16,8 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 80022ae4d9..505a0a0820 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 skills: [] behaviours: echo: diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 6dbc3e7127..24f117e236 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -13,17 +13,23 @@ fingerprint: dialogues.py: bafybeif7tegamwzgfeviq5ehq547gp3fvufcq2wwpx2vliu7ivz373sthm handlers.py: bafybeifaqwn3tweuawo65yn3ek6mfun2zu54qtoa2sqyndyvmsk7rkdi7i strategy.py: bafybeifudijy3opr6srw5kik3x3rmv6f75dts2pcqtlhjwkkzcafpad4em + tests/__init__.py: bafybeiagjee55nf2csbyob2o5u3au6r76elv4b6o6qoxnrupinam2brfia + tests/intermediate_class.py: bafybeic6rlkj625jfphxumr4iorf4vngr5brtopesj5i2s6juut2zckyuu + tests/test_behaviours.py: bafybeifubppsuvjavl4a4rag7oacvinnwmbb2e2xyk2nzz2edmdlkiw32m + tests/test_dialogues.py: bafybeihs577t65wjqeas4whesp2ikgqmd7ezj4wa2pdifnjbuknp3nmknq + tests/test_handlers.py: bafybeia6cj2jrqbzafhirmqvgrh7pumhabmdvwkoobu6gft6dvlj2eesv4 + tests/test_strategy.py: bafybeic3zyvuaaqtfpdsgkfqlkyn2ftzlkmxs2cgfw5ub4qylnbguk7rbq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq +- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/erc1155_client/tests/__init__.py b/packages/fetchai/skills/erc1155_client/tests/__init__.py new file mode 100644 index 0000000000..1a721bf66b --- /dev/null +++ b/packages/fetchai/skills/erc1155_client/tests/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""The tests module contains the tests of the packages/skills/erc1155_client dir.""" diff --git a/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py b/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py new file mode 100644 index 0000000000..d9b34d0d45 --- /dev/null +++ b/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py @@ -0,0 +1,218 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module sets up test environment for erc1155_client skill.""" + +from pathlib import Path +from typing import cast + +from aea.helpers.search.models import ( + Attribute, + Constraint, + ConstraintType, + DataModel, + Description, + Query, +) +from aea.helpers.transaction.base import RawMessage, RawTransaction, Terms +from aea.protocols.dialogue.base import DialogueMessage +from aea.test_tools.test_skill import BaseSkillTestCase + +from packages.fetchai.protocols.contract_api.custom_types import Kwargs +from packages.fetchai.protocols.contract_api.message import ContractApiMessage +from packages.fetchai.protocols.fipa.message import FipaMessage +from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage +from packages.fetchai.protocols.oef_search.message import OefSearchMessage +from packages.fetchai.skills.erc1155_client.behaviours import SearchBehaviour +from packages.fetchai.skills.erc1155_client.dialogues import ( + ContractApiDialogues, + DefaultDialogues, + FipaDialogues, + LedgerApiDialogues, + OefSearchDialogues, + SigningDialogues, +) +from packages.fetchai.skills.erc1155_client.handlers import ( + ContractApiHandler, + FipaHandler, + LedgerApiHandler, + OefSearchHandler, + SigningHandler, +) +from packages.fetchai.skills.erc1155_client.strategy import Strategy +from packages.open_aea.protocols.signing.message import SigningMessage + + +PACKAGE_DIR = Path(__file__).parent.parent + + +class ERC1155ClientTestCase(BaseSkillTestCase): + """Sets the erc1155_client class up for testing.""" + + path_to_skill = PACKAGE_DIR + + @classmethod + def setup(cls): + """Setup the test class.""" + cls.location = {"longitude": 0.1270, "latitude": 51.5194} + cls.search_query = { + "search_key": "seller_service", + "search_value": "erc1155_contract", + "constraint_type": "==", + } + cls.search_radius = 5.0 + config_overrides = { + "models": { + "strategy": { + "args": { + "location": cls.location, + "search_query": cls.search_query, + "search_radius": cls.search_radius, + } + } + }, + } + + super().setup(config_overrides=config_overrides) + + # behaviours + cls.search_behaviour = cast( + SearchBehaviour, cls._skill.skill_context.behaviours.search + ) + + # dialogues + cls.contract_api_dialogues = cast( + ContractApiDialogues, cls._skill.skill_context.contract_api_dialogues + ) + cls.default_dialogues = cast( + DefaultDialogues, cls._skill.skill_context.default_dialogues + ) + cls.fipa_dialogues = cast( + FipaDialogues, cls._skill.skill_context.fipa_dialogues + ) + cls.ledger_api_dialogues = cast( + LedgerApiDialogues, cls._skill.skill_context.ledger_api_dialogues + ) + cls.oef_search_dialogues = cast( + OefSearchDialogues, cls._skill.skill_context.oef_search_dialogues + ) + cls.signing_dialogues = cast( + SigningDialogues, cls._skill.skill_context.signing_dialogues + ) + + # handlers + cls.fipa_handler = cast(FipaHandler, cls._skill.skill_context.handlers.fipa) + cls.oef_search_handler = cast( + OefSearchHandler, cls._skill.skill_context.handlers.oef_search + ) + cls.contract_api_handler = cast( + ContractApiHandler, cls._skill.skill_context.handlers.contract_api + ) + cls.signing_handler = cast( + SigningHandler, cls._skill.skill_context.handlers.signing + ) + cls.ledger_api_handler = cast( + LedgerApiHandler, cls._skill.skill_context.handlers.ledger_api + ) + + # models + cls.strategy = cast(Strategy, cls._skill.skill_context.strategy) + + cls.logger = cls._skill.skill_context.logger + + # mocked objects + cls.ledger_id = "some_ledger_id" + cls.contract_id = "some_contract_id" + cls.contract_address = "some_contract_address" + cls.callable = "some_callable" + cls.body = {"some_key": "some_value"} + cls.kwargs = Kwargs(cls.body) + cls.address = "some_address" + cls.mocked_terms = Terms( + cls.ledger_id, + cls._skill.skill_context.agent_address, + "counterprty", + {"currency_id": 50}, + {"good_id": -10}, + "some_nonce", + ) + cls.mocked_query = Query( + [Constraint("some_attribute_name", ConstraintType("==", "some_value"))], + DataModel( + "some_data_model_name", + [ + Attribute( + "some_attribute_name", + str, + False, + "Some attribute descriptions.", + ) + ], + ), + ) + cls.mocked_proposal = Description( + { + "contract_address": "some_contract_address", + "token_id": "123456", + "trade_nonce": "876438756348568", + "from_supply": "543", + "to_supply": "432", + "value": "67", + } + ) + cls.mocked_raw_tx = (RawTransaction(cls.ledger_id, {"some_key": "some_value"}),) + cls.mocked_raw_msg = RawMessage(cls.ledger_id, b"some_body") + + # list of messages + cls.list_of_fipa_messages = ( + DialogueMessage(FipaMessage.Performative.CFP, {"query": cls.mocked_query}), + DialogueMessage( + FipaMessage.Performative.PROPOSE, {"proposal": cls.mocked_proposal} + ), + ) + cls.list_of_oef_search_messages = ( + DialogueMessage( + OefSearchMessage.Performative.SEARCH_SERVICES, + {"query": cls.mocked_query}, + ), + ) + cls.list_of_contract_api_messages = ( + DialogueMessage( + ContractApiMessage.Performative.GET_RAW_MESSAGE, + { + "ledger_id": cls.ledger_id, + "contract_id": cls.contract_id, + "contract_address": cls.contract_address, + "callable": cls.callable, + "kwargs": cls.kwargs, + }, + ), + ) + cls.list_of_signing_messages = ( + DialogueMessage( + SigningMessage.Performative.SIGN_MESSAGE, + {"terms": cls.mocked_terms, "raw_message": cls.mocked_raw_msg}, + ), + ) + cls.list_of_ledger_api_messages = ( + DialogueMessage( + LedgerApiMessage.Performative.GET_BALANCE, + {"ledger_id": cls.ledger_id, "address": "some_address"}, + ), + ) diff --git a/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py b/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py new file mode 100644 index 0000000000..290a73d03d --- /dev/null +++ b/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the behaviour classes of the erc1155_client skill.""" + +from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage +from packages.fetchai.protocols.oef_search.message import OefSearchMessage +from packages.fetchai.skills.erc1155_client.behaviours import LEDGER_API_ADDRESS +from packages.fetchai.skills.erc1155_client.tests.intermediate_class import ( + ERC1155ClientTestCase, +) + + +class TestSearchBehaviour(ERC1155ClientTestCase): + """Test search behaviour of erc1155_client.""" + + def test_setup(self): + """Test the setup method of the search behaviour.""" + # operation + self.search_behaviour.setup() + + # after + self.assert_quantity_in_outbox(1) + has_attributes, error_str = self.message_has_attributes( + actual_message=self.get_message_from_outbox(), + message_type=LedgerApiMessage, + performative=LedgerApiMessage.Performative.GET_BALANCE, + to=LEDGER_API_ADDRESS, + sender=str(self.skill.public_id), + ledger_id=self.strategy.ledger_id, + address=self.skill.skill_context.agent_address, + ) + assert has_attributes, error_str + + def test_act_is_searching(self): + """Test the act method of the search behaviour where is_searching is True.""" + # setup + self.strategy._is_searching = True + + # operation + self.search_behaviour.act() + + # after + self.assert_quantity_in_outbox(1) + has_attributes, error_str = self.message_has_attributes( + actual_message=self.get_message_from_outbox(), + message_type=OefSearchMessage, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + to=self.skill.skill_context.search_service_address, + sender=str(self.skill.public_id), + query=self.skill.skill_context.strategy.get_location_and_service_query(), + ) + assert has_attributes, error_str + + def test_act_not_is_searching(self): + """Test the act method of the search behaviour where is_searching is False.""" + # setup + self.strategy.is_searching = False + + # operation + self.search_behaviour.act() + + # after + self.assert_quantity_in_outbox(0) + + def test_teardown(self): + """Test the teardown method of the search behaviour.""" + assert self.search_behaviour.teardown() is None + self.assert_quantity_in_outbox(0) diff --git a/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py b/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py new file mode 100644 index 0000000000..d0e5ab3249 --- /dev/null +++ b/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py @@ -0,0 +1,187 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the dialogue classes of the erc1155_client skill.""" + +import pytest + +from aea.exceptions import AEAEnforceError +from aea.protocols.dialogue.base import DialogueLabel +from aea.test_tools.test_skill import COUNTERPARTY_AGENT_ADDRESS + +from packages.fetchai.protocols.contract_api.message import ContractApiMessage +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.protocols.fipa.message import FipaMessage +from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage +from packages.fetchai.protocols.oef_search.message import OefSearchMessage +from packages.fetchai.skills.erc1155_client.dialogues import ( + ContractApiDialogue, + DefaultDialogue, + FipaDialogue, + LedgerApiDialogue, + OefSearchDialogue, + SigningDialogue, +) +from packages.fetchai.skills.erc1155_client.tests.intermediate_class import ( + ERC1155ClientTestCase, +) +from packages.open_aea.protocols.signing.message import SigningMessage + + +class TestDialogues(ERC1155ClientTestCase): + """Test dialogue classes of erc1155_client.""" + + def test_contract_api_dialogue(self): + """Test the ContractApiDialogue class.""" + contract_api_dialogue = ContractApiDialogue( + DialogueLabel( + ("", ""), + COUNTERPARTY_AGENT_ADDRESS, + self.skill.skill_context.agent_address, + ), + self.skill.skill_context.agent_address, + role=ContractApiDialogue.Role.AGENT, + ) + + # associated_fipa_dialogue + with pytest.raises(ValueError, match="Associated fipa dialogue not set!"): + assert contract_api_dialogue.associated_fipa_dialogue + fipa_dialogue = FipaDialogue( + DialogueLabel( + ("", ""), + COUNTERPARTY_AGENT_ADDRESS, + self.skill.skill_context.agent_address, + ), + self.skill.skill_context.agent_address, + role=FipaDialogue.Role.BUYER, + ) + contract_api_dialogue.associated_fipa_dialogue = fipa_dialogue + with pytest.raises( + AEAEnforceError, match="Associated fipa dialogue already set!" + ): + contract_api_dialogue.associated_fipa_dialogue = fipa_dialogue + assert contract_api_dialogue.associated_fipa_dialogue == fipa_dialogue + + # terms + with pytest.raises(ValueError, match="Terms not set!"): + assert contract_api_dialogue.terms + contract_api_dialogue.terms = self.mocked_terms + with pytest.raises(AEAEnforceError, match="Terms already set!"): + contract_api_dialogue.terms = self.mocked_terms + assert contract_api_dialogue.terms == self.mocked_terms + + def test_contract_api_dialogues(self): + """Test the ContractApiDialogues class.""" + _, dialogue = self.contract_api_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION, + ledger_id=self.ledger_id, + contract_id=self.contract_id, + callable=self.callable, + kwargs=self.kwargs, + ) + assert dialogue.role == ContractApiDialogue.Role.AGENT + assert dialogue.self_address == str(self.skill.skill_context.skill_id) + + def test_default_dialogues(self): + """Test the DefaultDialogues class.""" + _, dialogue = self.default_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=DefaultMessage.Performative.BYTES, + content=b"some_content", + ) + assert dialogue.role == DefaultDialogue.Role.AGENT + assert dialogue.self_address == self.skill.skill_context.agent_address + + def test_fipa_dialogues(self): + """Test the FipaDialogues class.""" + _, dialogue = self.fipa_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=FipaMessage.Performative.CFP, + query=self.mocked_query, + ) + assert dialogue.role == FipaDialogue.Role.SELLER + assert dialogue.self_address == self.skill.skill_context.agent_address + + def test_ledger_api_dialogues(self): + """Test the LedgerApiDialogues class.""" + _, dialogue = self.ledger_api_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=LedgerApiMessage.Performative.GET_BALANCE, + ledger_id=self.ledger_id, + address=self.address, + ) + assert dialogue.role == LedgerApiDialogue.Role.AGENT + assert dialogue.self_address == str(self.skill.skill_context.skill_id) + + def test_oef_search_dialogues(self): + """Test the OefSearchDialogues class.""" + _, dialogue = self.oef_search_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=self.mocked_query, + ) + assert dialogue.role == OefSearchDialogue.Role.AGENT + assert dialogue.self_address == str(self.skill.skill_context.skill_id) + + def test_signing_dialogue(self): + """Test the SigningDialogue class.""" + signing_dialogue = SigningDialogue( + DialogueLabel( + ("", ""), + COUNTERPARTY_AGENT_ADDRESS, + self.skill.skill_context.agent_address, + ), + self.skill.skill_context.agent_address, + role=ContractApiDialogue.Role.AGENT, + ) + + # associated_contract_api_dialogue + with pytest.raises( + ValueError, match="Associated contract api dialogue not set!" + ): + assert signing_dialogue.associated_contract_api_dialogue + contract_api_dialogue = ContractApiDialogue( + DialogueLabel( + ("", ""), + COUNTERPARTY_AGENT_ADDRESS, + self.skill.skill_context.agent_address, + ), + self.skill.skill_context.agent_address, + role=ContractApiDialogue.Role.AGENT, + ) + signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue + with pytest.raises( + AEAEnforceError, match="Associated contract api dialogue already set!" + ): + signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue + assert ( + signing_dialogue.associated_contract_api_dialogue == contract_api_dialogue + ) + + def test_signing_dialogues(self): + """Test the SigningDialogues class.""" + _, dialogue = self.signing_dialogues.create( + counterparty=COUNTERPARTY_AGENT_ADDRESS, + performative=SigningMessage.Performative.SIGN_TRANSACTION, + terms=self.mocked_terms, + raw_transaction=self.mocked_raw_tx, + ) + assert dialogue.role == SigningDialogue.Role.SKILL + assert dialogue.self_address == str(self.skill.skill_context.skill_id) diff --git a/packages/fetchai/skills/erc1155_client/tests/test_handlers.py b/packages/fetchai/skills/erc1155_client/tests/test_handlers.py new file mode 100644 index 0000000000..b65b9ddfdb --- /dev/null +++ b/packages/fetchai/skills/erc1155_client/tests/test_handlers.py @@ -0,0 +1,859 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2022 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the handler classes of the erc1155_client skill.""" + +import logging +from typing import cast +from unittest.mock import patch + +from aea.helpers.search.models import Description +from aea.helpers.transaction.base import RawMessage, State, Terms +from aea.test_tools.test_skill import COUNTERPARTY_AGENT_ADDRESS + +from packages.fetchai.protocols.contract_api.message import ContractApiMessage +from packages.fetchai.protocols.default.message import DefaultMessage +from packages.fetchai.protocols.fipa.message import FipaMessage +from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage +from packages.fetchai.protocols.oef_search.message import OefSearchMessage +from packages.fetchai.skills.erc1155_client.dialogues import ( + ContractApiDialogue, + FipaDialogue, + LedgerApiDialogue, + OefSearchDialogue, + SigningDialogue, +) +from packages.fetchai.skills.erc1155_client.handlers import LEDGER_API_ADDRESS +from packages.fetchai.skills.erc1155_client.tests.intermediate_class import ( + ERC1155ClientTestCase, +) +from packages.open_aea.protocols.signing.message import SigningMessage + + +class TestFipaHandler(ERC1155ClientTestCase): + """Test fipa handler of erc1155_client.""" + + def test_setup(self): + """Test the setup method of the fipa handler.""" + assert self.fipa_handler.setup() is None + self.assert_quantity_in_outbox(0) + + def test_handle_unidentified_dialogue(self): + """Test the _handle_unidentified_dialogue method of the fipa handler.""" + # setup + incorrect_dialogue_reference = ("", "") + incoming_message = cast( + FipaMessage, + self.build_incoming_message( + message_type=FipaMessage, + dialogue_reference=incorrect_dialogue_reference, + performative=FipaMessage.Performative.ACCEPT, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.fipa_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"unidentified dialogue for message={incoming_message}.", + ) + + self.assert_quantity_in_outbox(1) + has_attributes, error_str = self.message_has_attributes( + actual_message=self.get_message_from_outbox(), + message_type=DefaultMessage, + performative=DefaultMessage.Performative.ERROR, + to=incoming_message.sender, + sender=self.skill.skill_context.agent_address, + error_code=DefaultMessage.ErrorCode.INVALID_DIALOGUE, + error_msg="Invalid dialogue.", + error_data={"fipa_message": incoming_message.encode()}, + ) + assert has_attributes, error_str + + def test_handle_propose_i(self): + """Test the _handle_propose method of the fipa handler where all expected keys exist in the proposal.""" + # setup + fipa_dialogue = cast( + FipaDialogue, + self.prepare_skill_dialogue( + dialogues=self.fipa_dialogues, + messages=self.list_of_fipa_messages[:1], + ), + ) + incoming_message = cast( + FipaMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=fipa_dialogue, + performative=FipaMessage.Performative.PROPOSE, + proposal=self.mocked_proposal, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.fipa_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received valid PROPOSE from sender={COUNTERPARTY_AGENT_ADDRESS[-5:]}: proposal={incoming_message.proposal.values}", + ) + + self.assert_quantity_in_outbox(1) + message = self.get_message_from_outbox() + has_attributes, error_str = self.message_has_attributes( + actual_message=message, + message_type=ContractApiMessage, + performative=ContractApiMessage.Performative.GET_RAW_MESSAGE, + to=LEDGER_API_ADDRESS, + sender=str(self.skill.skill_context.skill_id), + ledger_id=self.strategy.ledger_id, + contract_id=self.strategy.contract_id, + contract_address=incoming_message.proposal.values["contract_address"], + callable="get_hash_single", + kwargs=ContractApiMessage.Kwargs( + { + "from_address": incoming_message.sender, + "to_address": self.skill.skill_context.agent_address, + "token_id": int(incoming_message.proposal.values["token_id"]), + "from_supply": int(incoming_message.proposal.values["from_supply"]), + "to_supply": int(incoming_message.proposal.values["to_supply"]), + "value": int(incoming_message.proposal.values["value"]), + "trade_nonce": int(incoming_message.proposal.values["trade_nonce"]), + } + ), + ) + assert has_attributes, error_str + + contract_api_dialogue = cast( + ContractApiDialogue, self.contract_api_dialogues.get_dialogue(message) + ) + + expected_terms = Terms( + ledger_id=self.strategy.ledger_id, + sender_address=self.skill.skill_context.agent_address, + counterparty_address=incoming_message.sender, + amount_by_currency_id={}, + quantities_by_good_id={ + str(incoming_message.proposal.values["token_id"]): int( + incoming_message.proposal.values["from_supply"] + ) + - int(incoming_message.proposal.values["to_supply"]) + }, + is_sender_payable_tx_fee=False, + nonce=str(incoming_message.proposal.values["trade_nonce"]), + ) + assert contract_api_dialogue.terms == expected_terms + assert contract_api_dialogue.associated_fipa_dialogue == fipa_dialogue + + mock_logger.assert_any_call( + logging.INFO, + "requesting single hash message from contract api...", + ) + + def test_handle_propose_ii(self): + """Test the _handle_propose method of the fipa handler where some expected keys do NOT exist in the proposal.""" + # setup + invalid_proposal = Description({"some_key": "v1", "some_key_2": "12"}) + + fipa_dialogue = cast( + FipaDialogue, + self.prepare_skill_dialogue( + dialogues=self.fipa_dialogues, + messages=self.list_of_fipa_messages[:1], + ), + ) + incoming_message = cast( + FipaMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=fipa_dialogue, + performative=FipaMessage.Performative.PROPOSE, + proposal=invalid_proposal, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.fipa_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid PROPOSE from sender={COUNTERPARTY_AGENT_ADDRESS[-5:]}: proposal={incoming_message.proposal.values}", + ) + + def test_handle_invalid(self): + """Test the _handle_invalid method of the fipa handler.""" + # setup + fipa_dialogue = cast( + FipaDialogue, + self.prepare_skill_dialogue( + dialogues=self.fipa_dialogues, + messages=self.list_of_fipa_messages[:2], + ), + ) + incoming_message = cast( + FipaMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=fipa_dialogue, + performative=FipaMessage.Performative.ACCEPT, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.fipa_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.WARNING, + f"cannot handle fipa message of performative={incoming_message.performative} in dialogue={fipa_dialogue}.", + ) + + def test_teardown(self): + """Test the teardown method of the fipa handler.""" + assert self.fipa_handler.teardown() is None + self.assert_quantity_in_outbox(0) + + +class TestOefSearchHandler(ERC1155ClientTestCase): + """Test oef_search handler of erc1155_client.""" + + is_agent_to_agent_messages = False + + def test_setup(self): + """Test the setup method of the oef_search handler.""" + assert self.oef_search_handler.setup() is None + self.assert_quantity_in_outbox(0) + + def test_handle_unidentified_dialogue(self): + """Test the _handle_unidentified_dialogue method of the oef_search handler.""" + # setup + incorrect_dialogue_reference = ("", "") + incoming_message = cast( + OefSearchMessage, + self.build_incoming_message( + message_type=OefSearchMessage, + dialogue_reference=incorrect_dialogue_reference, + performative=OefSearchMessage.Performative.OEF_ERROR, + oef_error_operation=OefSearchMessage.OefErrorOperation.REGISTER_SERVICE, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.oef_search_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid oef_search message={incoming_message}, unidentified dialogue.", + ) + + def test_handle_error(self): + """Test the _handle_error method of the oef_search handler.""" + # setup + oef_search_dialogue = cast( + OefSearchDialogue, + self.prepare_skill_dialogue( + dialogues=self.oef_search_dialogues, + messages=self.list_of_oef_search_messages[:1], + ), + ) + incoming_message = cast( + OefSearchMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=oef_search_dialogue, + performative=OefSearchMessage.Performative.OEF_ERROR, + oef_error_operation=OefSearchMessage.OefErrorOperation.REGISTER_SERVICE, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.oef_search_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received oef_search error message={incoming_message} in dialogue={oef_search_dialogue}.", + ) + + def test_handle_search_i(self): + """Test the _handle_search method of the oef_search handler where the number of agents found is NOT 0.""" + # setup + agents = ("agent_1", "agent_2") + oef_search_dialogue = cast( + OefSearchDialogue, + self.prepare_skill_dialogue( + dialogues=self.oef_search_dialogues, + messages=self.list_of_oef_search_messages[:1], + ), + ) + incoming_message = cast( + OefSearchMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=oef_search_dialogue, + performative=OefSearchMessage.Performative.SEARCH_RESULT, + agents=agents, + agents_info=OefSearchMessage.AgentsInfo( + { + "agent_1": {"key_1": "value_1", "key_2": "value_2"}, + "agent_2": {"key_3": "value_3", "key_4": "value_4"}, + } + ), + ), + ) + + # before + assert self.strategy.is_searching is True + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.oef_search_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"found agents={list(map(lambda x: x[-5:], incoming_message.agents))}, stopping search.", + ) + + assert self.strategy.is_searching is False + + self.assert_quantity_in_outbox(len(agents)) + for agent in agents: + has_attributes, error_str = self.message_has_attributes( + actual_message=self.get_message_from_outbox(), + message_type=FipaMessage, + performative=FipaMessage.Performative.CFP, + to=agent, + sender=self.skill.skill_context.agent_address, + query=self.strategy.get_service_query(), + ) + assert has_attributes, error_str + mock_logger.assert_any_call( + logging.INFO, f"sending CFP to agent={agent[-5:]}" + ) + + def test_handle_search_ii(self): + """Test the _handle_search method of the oef_search handler where the number of agents found is 0.""" + # setup + agents = tuple() + oef_search_dialogue = cast( + OefSearchDialogue, + self.prepare_skill_dialogue( + dialogues=self.oef_search_dialogues, + messages=self.list_of_oef_search_messages[:1], + ), + ) + incoming_message = cast( + OefSearchMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=oef_search_dialogue, + performative=OefSearchMessage.Performative.SEARCH_RESULT, + agents=agents, + agents_info=OefSearchMessage.AgentsInfo({}), + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.oef_search_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"found no agents in dialogue={oef_search_dialogue}, continue searching.", + ) + + def test_handle_invalid(self): + """Test the _handle_invalid method of the oef_search handler.""" + # setup + incoming_message = cast( + OefSearchMessage, + self.build_incoming_message( + message_type=OefSearchMessage, + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=self.mocked_proposal, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.oef_search_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.WARNING, + f"cannot handle oef_search message of performative={incoming_message.performative} in dialogue={self.oef_search_dialogues.get_dialogue(incoming_message)}.", + ) + + def test_teardown(self): + """Test the teardown method of the oef_search handler.""" + assert self.oef_search_handler.teardown() is None + self.assert_quantity_in_outbox(0) + + +class TestContractApiHandler(ERC1155ClientTestCase): + """Test contract_api handler of erc1155_client.""" + + is_agent_to_agent_messages = False + + def test_setup(self): + """Test the setup method of the contract_api handler.""" + assert self.contract_api_handler.setup() is None + self.assert_quantity_in_outbox(0) + + def test_handle_unidentified_dialogue(self): + """Test the _handle_unidentified_dialogue method of the signing handler.""" + # setup + incorrect_dialogue_reference = ("", "") + incoming_message = cast( + ContractApiMessage, + self.build_incoming_message( + message_type=ContractApiMessage, + dialogue_reference=incorrect_dialogue_reference, + performative=ContractApiMessage.Performative.STATE, + state=State(self.ledger_id, self.body), + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.contract_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid contract_api message={incoming_message}, unidentified dialogue.", + ) + + def test_handle_raw_message(self): + """Test the _handle_raw_message method of the signing handler.""" + # setup + contract_api_dialogue = cast( + ContractApiDialogue, + self.prepare_skill_dialogue( + dialogues=self.contract_api_dialogues, + messages=self.list_of_contract_api_messages[:1], + ), + ) + contract_api_dialogue.terms = self.mocked_terms + incoming_message = cast( + ContractApiMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=contract_api_dialogue, + performative=ContractApiMessage.Performative.RAW_MESSAGE, + raw_message=self.mocked_raw_msg, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.contract_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, f"received raw message={incoming_message}" + ) + + self.assert_quantity_in_decision_making_queue(1) + message = self.get_message_from_decision_maker_inbox() + has_attributes, error_str = self.message_has_attributes( + actual_message=message, + message_type=SigningMessage, + performative=SigningMessage.Performative.SIGN_MESSAGE, + to=self.skill.skill_context.decision_maker_address, + sender=str(self.skill.skill_context.skill_id), + raw_message=RawMessage( + incoming_message.raw_message.ledger_id, + incoming_message.raw_message.body, + is_deprecated_mode=True, + ), + terms=contract_api_dialogue.terms, + ) + assert has_attributes, error_str + + assert ( + cast( + SigningDialogue, self.signing_dialogues.get_dialogue(message) + ).associated_contract_api_dialogue + == contract_api_dialogue + ) + + mock_logger.assert_any_call( + logging.INFO, + "proposing the transaction to the decision maker. Waiting for confirmation ...", + ) + + def test_handle_error(self): + """Test the _handle_error method of the signing handler.""" + # setup + contract_api_dialogue = cast( + ContractApiDialogue, + self.prepare_skill_dialogue( + dialogues=self.contract_api_dialogues, + messages=self.list_of_contract_api_messages[:1], + ), + ) + incoming_message = cast( + ContractApiMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=contract_api_dialogue, + performative=ContractApiMessage.Performative.ERROR, + data=b"some_data", + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.contract_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received contract_api error message={incoming_message} in dialogue={contract_api_dialogue}.", + ) + + def test_handle_invalid(self): + """Test the _handle_invalid method of the signing handler.""" + # setup + invalid_performative = ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION + incoming_message = cast( + ContractApiMessage, + self.build_incoming_message( + message_type=ContractApiMessage, + dialogue_reference=("1", ""), + performative=invalid_performative, + ledger_id=self.ledger_id, + contract_id=self.contract_id, + callable=self.callable, + kwargs=self.kwargs, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.contract_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.WARNING, + f"cannot handle contract_api message of performative={invalid_performative} in dialogue={self.contract_api_dialogues.get_dialogue(incoming_message)}.", + ) + + def test_teardown(self): + """Test the teardown method of the contract_api handler.""" + assert self.contract_api_handler.teardown() is None + self.assert_quantity_in_outbox(0) + + +class TestSigningHandler(ERC1155ClientTestCase): + """Test signing handler of erc1155_client.""" + + is_agent_to_agent_messages = False + + def test_setup(self): + """Test the setup method of the signing handler.""" + assert self.signing_handler.setup() is None + self.assert_quantity_in_outbox(0) + + def test_handle_unidentified_dialogue(self): + """Test the _handle_unidentified_dialogue method of the signing handler.""" + # setup + incorrect_dialogue_reference = ("", "") + incoming_message = cast( + SigningMessage, + self.build_incoming_message( + message_type=SigningMessage, + dialogue_reference=incorrect_dialogue_reference, + performative=SigningMessage.Performative.ERROR, + error_code=SigningMessage.ErrorCode.UNSUCCESSFUL_MESSAGE_SIGNING, + to=str(self.skill.skill_context.skill_id), + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.signing_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid signing message={incoming_message}, unidentified dialogue.", + ) + + def test_handle_signed_message( + self, + ): + """Test the _handle_signed_message method of the signing handler.""" + # setup + signing_counterparty = self.skill.skill_context.decision_maker_address + + fipa_dialogue = cast( + FipaDialogue, + self.prepare_skill_dialogue( + dialogues=self.fipa_dialogues, + messages=self.list_of_fipa_messages[:2], + counterparty=COUNTERPARTY_AGENT_ADDRESS, + ), + ) + signing_dialogue = cast( + SigningDialogue, + self.prepare_skill_dialogue( + dialogues=self.signing_dialogues, + messages=self.list_of_signing_messages[:1], + counterparty=signing_counterparty, + ), + ) + contract_api_dialogue = cast( + ContractApiDialogue, + self.prepare_skill_dialogue( + dialogues=self.contract_api_dialogues, + messages=self.list_of_contract_api_messages[:4], + ), + ) + + signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue + contract_api_dialogue.associated_fipa_dialogue = fipa_dialogue + + incoming_message = cast( + SigningMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=signing_dialogue, + performative=SigningMessage.Performative.SIGNED_MESSAGE, + signed_message=SigningMessage.SignedMessage( + self.ledger_id, + "some_body", + ), + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.signing_handler.handle(incoming_message) + + # after + fipa_dialogue_opponent = fipa_dialogue.dialogue_label.dialogue_opponent_addr + mock_logger.assert_any_call( + logging.INFO, + f"sending ACCEPT_W_INFORM to agent={fipa_dialogue_opponent[-5:]}: tx_signature={incoming_message.signed_message}", + ) + + self.assert_quantity_in_outbox(1) + message = self.get_message_from_outbox() + has_attributes, error_str = self.message_has_attributes( + actual_message=message, + message_type=FipaMessage, + performative=FipaMessage.Performative.ACCEPT_W_INFORM, + to=fipa_dialogue_opponent, + sender=self.skill.skill_context.agent_address, + info={"tx_signature": incoming_message.signed_message.body}, + ) + assert has_attributes, error_str + + def test_handle_error(self): + """Test the _handle_error method of the signing handler.""" + # setup + signing_counterparty = self.skill.skill_context.decision_maker_address + signing_dialogue = self.prepare_skill_dialogue( + dialogues=self.signing_dialogues, + messages=self.list_of_signing_messages[:1], + counterparty=signing_counterparty, + ) + incoming_message = cast( + SigningMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=signing_dialogue, + performative=SigningMessage.Performative.ERROR, + error_code=SigningMessage.ErrorCode.UNSUCCESSFUL_TRANSACTION_SIGNING, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.signing_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"transaction signing was not successful. Error_code={incoming_message.error_code} in dialogue={signing_dialogue}", + ) + + def test_handle_invalid(self): + """Test the _handle_invalid method of the signing handler.""" + # setup + invalid_performative = SigningMessage.Performative.SIGN_TRANSACTION + incoming_message = self.build_incoming_message( + message_type=SigningMessage, + dialogue_reference=("1", ""), + performative=invalid_performative, + terms=self.mocked_terms, + raw_transaction=SigningMessage.RawTransaction( + self.ledger_id, {"some_key": "some_value"} + ), + to=str(self.skill.skill_context.skill_id), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.signing_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.WARNING, + f"cannot handle signing message of performative={invalid_performative} in dialogue={self.signing_dialogues.get_dialogue(incoming_message)}.", + ) + + def test_teardown(self): + """Test the teardown method of the signing handler.""" + assert self.signing_handler.teardown() is None + self.assert_quantity_in_outbox(0) + + +class TestLedgerApiHandler(ERC1155ClientTestCase): + """Test ledger_api handler of erc1155_client.""" + + is_agent_to_agent_messages = False + + def test_setup(self): + """Test the setup method of the ledger_api handler.""" + assert self.ledger_api_handler.setup() is None + self.assert_quantity_in_outbox(0) + + def test_handle_unidentified_dialogue(self): + """Test the _handle_unidentified_dialogue method of the ledger_api handler.""" + # setup + incorrect_dialogue_reference = ("", "") + incoming_message = cast( + LedgerApiMessage, + self.build_incoming_message( + message_type=LedgerApiMessage, + dialogue_reference=incorrect_dialogue_reference, + performative=LedgerApiMessage.Performative.BALANCE, + ledger_id=self.ledger_id, + balance=10, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.ledger_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received invalid ledger_api message={incoming_message}, unidentified dialogue.", + ) + + def test_handle_balance(self): + """Test the _handle_balance method of the ledger_api handler.""" + # setup + balance = 10 + ledger_api_dialogue = cast( + LedgerApiDialogue, + self.prepare_skill_dialogue( + dialogues=self.ledger_api_dialogues, + messages=self.list_of_ledger_api_messages[:1], + counterparty=LEDGER_API_ADDRESS, + ), + ) + incoming_message = cast( + LedgerApiMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=ledger_api_dialogue, + performative=LedgerApiMessage.Performative.BALANCE, + ledger_id=self.ledger_id, + balance=balance, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.ledger_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"starting balance on {self.ledger_id} ledger={incoming_message.balance}.", + ) + + def test_handle_error(self): + """Test the _handle_error method of the ledger_api handler.""" + # setup + ledger_api_dialogue = cast( + LedgerApiDialogue, + self.prepare_skill_dialogue( + dialogues=self.ledger_api_dialogues, + messages=self.list_of_ledger_api_messages[:1], + ), + ) + incoming_message = cast( + LedgerApiMessage, + self.build_incoming_message_for_skill_dialogue( + dialogue=ledger_api_dialogue, + performative=LedgerApiMessage.Performative.ERROR, + code=1, + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.ledger_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.INFO, + f"received ledger_api error message={incoming_message} in dialogue={ledger_api_dialogue}.", + ) + + def test_handle_invalid(self): + """Test the _handle_invalid method of the ledger_api handler.""" + # setup + invalid_performative = LedgerApiMessage.Performative.GET_BALANCE + incoming_message = cast( + LedgerApiMessage, + self.build_incoming_message( + message_type=LedgerApiMessage, + dialogue_reference=("1", ""), + performative=invalid_performative, + ledger_id=self.ledger_id, + address=self.address, + to=str(self.skill.skill_context.skill_id), + ), + ) + + # operation + with patch.object(self.logger, "log") as mock_logger: + self.ledger_api_handler.handle(incoming_message) + + # after + mock_logger.assert_any_call( + logging.WARNING, + f"cannot handle ledger_api message of performative={invalid_performative} in dialogue={self.ledger_api_dialogues.get_dialogue(incoming_message)}.", + ) + + def test_teardown(self): + """Test the teardown method of the ledger_api handler.""" + assert self.ledger_api_handler.teardown() is None + self.assert_quantity_in_outbox(0) diff --git a/packages/fetchai/skills/erc1155_client/tests/test_strategy.py b/packages/fetchai/skills/erc1155_client/tests/test_strategy.py new file mode 100644 index 0000000000..55454569ad --- /dev/null +++ b/packages/fetchai/skills/erc1155_client/tests/test_strategy.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""This module contains the tests of the strategy class of the erc1155_client skill.""" + +from aea.helpers.search.models import Constraint, ConstraintType, Query + +from packages.fetchai.skills.erc1155_client.strategy import ( + CONTRACT_ID, + SIMPLE_SERVICE_MODEL, +) +from packages.fetchai.skills.erc1155_client.tests.intermediate_class import ( + ERC1155ClientTestCase, +) + + +class TestStrategy(ERC1155ClientTestCase): + """Test Strategy of erc1155_client.""" + + def test_properties(self): + """Test the properties of Strategy class.""" + assert self.strategy.ledger_id == self.skill.skill_context.default_ledger_id + assert self.strategy.contract_id == str(CONTRACT_ID) + + def test_get_location_and_service_query(self): + """Test the get_location_and_service_query method of the Strategy class.""" + query = self.strategy.get_location_and_service_query() + + assert type(query) == Query + assert len(query.constraints) == 2 + assert query.model is None + + location_constraint = Constraint( + "location", + ConstraintType( + "distance", (self.strategy._agent_location, self.search_radius) + ), + ) + assert query.constraints[0] == location_constraint + + service_key_constraint = Constraint( + self.search_query["search_key"], + ConstraintType( + self.search_query["constraint_type"], + self.search_query["search_value"], + ), + ) + assert query.constraints[1] == service_key_constraint + + def test_get_service_query(self): + """Test the get_service_query method of the Strategy class.""" + query = self.strategy.get_service_query() + + assert type(query) == Query + assert len(query.constraints) == 1 + + assert query.model == SIMPLE_SERVICE_MODEL + + service_key_constraint = Constraint( + self.search_query["search_key"], + ConstraintType( + self.search_query["constraint_type"], + self.search_query["search_value"], + ), + ) + assert query.constraints[0] == service_key_constraint diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 53687ceb4a..abc3dee310 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -15,15 +15,15 @@ fingerprint: strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq +- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/error/skill.yaml b/packages/fetchai/skills/error/skill.yaml index 710510382c..e51d2e5868 100644 --- a/packages/fetchai/skills/error/skill.yaml +++ b/packages/fetchai/skills/error/skill.yaml @@ -13,7 +13,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml index 1ba26d83ec..fa6e171b7e 100644 --- a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml +++ b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml @@ -15,7 +15,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy skills: [] behaviours: initializer: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index a57acbdfed..49670f1fc0 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -14,13 +14,13 @@ fingerprint: strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq +- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 7aee54beeb..e7c5f827c0 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -15,13 +15,13 @@ fingerprint: strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq +- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index d15a7f6189..dedb125dc3 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,11 +15,11 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 +- fetchai/gym:0.19.0:bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 9237eb0ef2..372179b42a 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -15,8 +15,8 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu skills: [] behaviours: {} handlers: diff --git a/packages/hashes.csv b/packages/hashes.csv index 47095deb62..c5dfffa3be 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,36 +1,36 @@ -fetchai/agents/error_test,bafybeicimsnkwbfmzbs3krdoia5e7z4g6ifc53xaeyh27vpojwytjdjkri -fetchai/agents/gym_aea,bafybeih53zssq6np6d4m6rgalhcrk3gznd5mlgglqdgu52o5fiicbusqeq -fetchai/agents/my_first_aea,bafybeiezjyszmzrbobne2kxpunqjvftt2q5nnhok2phhcqxiupwdqpzjom -fetchai/connections/gym,bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 -fetchai/connections/http_client,bafybeif27hbtpzqe54vkvbsfwsyem2fimq46cgca3rfuvbh2sdzfbgor5i -fetchai/connections/http_server,bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je -fetchai/connections/ledger,bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa -fetchai/connections/local,bafybeidr3wjv6h2wgysm26bbcs26zuzesmzq2dh5dhrqtoiilnfrubaure -fetchai/connections/stub,bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie +fetchai/agents/error_test,bafybeife3locwgzl5rzehxiddoqp6t5t76lvlxctz47yx6irec33kxuv4q +fetchai/agents/gym_aea,bafybeifvbem567wrctln4jgxyiopdwqg7tasuqugql5qbycgvlcv4ftc7q +fetchai/agents/my_first_aea,bafybeiem2masnbtkd4nttxtkbvgj55phvasyjzulur3cmdllf2zs4lmxom +fetchai/connections/gym,bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru +fetchai/connections/http_client,bafybeifwbyeoaiohsmzyzhgp5ozx76c4xymzglze2guydpd3y2vmafswg4 +fetchai/connections/http_server,bafybeid6axvraazgpqhqsaklfe7gtknmmpgeroh5b7pxxudrcqh3jzvh6y +fetchai/connections/ledger,bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m +fetchai/connections/local,bafybeihrhb5l2st5g62z3ln7yfhagci6q2jqmfdaly6n5afdsm25lwitmu +fetchai/connections/stub,bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -fetchai/protocols/gym,bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe -fetchai/protocols/http,bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq -fetchai/protocols/ledger_api,bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii -fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe -fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm -fetchai/skills/echo,bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy -fetchai/skills/erc1155_client,bafybeifvdtsvsojqrlbi5we5i34chobugt3g6st5ochdeujzrrl4et6spy -fetchai/skills/erc1155_deploy,bafybeihyde4lpbpm4eydveowp2kdrw25murprahrtobb4ydr6wbujf5px4 -fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney +fetchai/protocols/default,bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +fetchai/protocols/fipa,bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +fetchai/protocols/gym,bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby +fetchai/protocols/http,bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu +fetchai/protocols/ledger_api,bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq +fetchai/protocols/oef_search,bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +fetchai/protocols/state_update,bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 +fetchai/protocols/tac,bafybeibxnd7wqcl3xlq7wo2mztix5pgvsfffrgrrfszdng5pkcf6bydkfa +fetchai/skills/echo,bafybeigqa3nmawq4zn7nmcocjtdjvvcy5clq65cizro2usizd2fyaengka +fetchai/skills/erc1155_client,bafybeifr3zmumx2kb6ohvjp7s3w65dg4vbxntpy2akdmxojdtdsnzfucci +fetchai/skills/erc1155_deploy,bafybeibwja5imcfq7cwxt5frakpq4lwj4bpuwrdm42km7h7bb5rjupycyy +fetchai/skills/error,bafybeibmu5hfbzsz6t4764qxc3npkj3bgazbbzryeu33rydy76ckbkp5bq fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu -fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a -fetchai/skills/generic_buyer,bafybeieekzr3dpo3avi72l3gcxtfdjgbrfufkr542w2tclho6qe6nkv3km -fetchai/skills/generic_seller,bafybeig4kvs5pyhk4dt6xjcuvnxcajkb6t6jz74srbsxyaa33aohdtjqha -fetchai/skills/gym,bafybeibnh47c5rw2ijq2xz4n5oyxney4zrlddq6djvhwfniudy44oj243y -fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm +fetchai/skills/fipa_dummy_buyer,bafybeih5dbptdeh3xydpuxt3ig5wrz5bnqjqnngmnhlw6kipile6insrgu +fetchai/skills/generic_buyer,bafybeihhm73vfy7sb6tet6vkboy2mfjji3akdulvczn3rafkudfnzoujli +fetchai/skills/generic_seller,bafybeicdkqigrpsnumu47r5rdepuufzw3uaiizqu2ovlwuq4njebzxmw2a +fetchai/skills/gym,bafybeiecsa564i5fya5lvgkzgv6z5ehm3clhx7derehaqjvud3bhokwahy +fetchai/skills/http_echo,bafybeid4mx4oeokuigwbyo5iuuez5ubqiaeelmqkf2eazvigztge4ftzlq fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeibdnren5aarfqnd4hqoyemenv4kjdysrpsnm5wo52lrhhzhg5vr2m -open_aea/agents/http_echo,bafybeick5guncuvf3zehoqfudca6r5q3a6qktsy7k5m5feilqpw37ltopu -open_aea/agents/my_first_aea,bafybeibin4tlsz5r233cfycq4zgj6f6dwnqmpzqesykkfu7b67ydumh4ce +open_aea/agents/gym_aea,bafybeidti4bnn3i4eyeuonfuvv7z6peydrhphemqpmdd4cmdcfkvzf6ag4 +open_aea/agents/http_echo,bafybeigdtzj56ms7kxy3bcm3jmxii5dxdkl54v6e6jwwtntahvlfqln4u4 +open_aea/agents/my_first_aea,bafybeifymrtzbqlu3wzpi3mj73maggz2z4hgeony2v7rzaafcdumnqkdya open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index f2de617ec4..c4b8b61f52 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeihlc2txeuljlxcbqo5er2tkonecq34l27j3j3b5ixes5gixlxwyi4 +- fetchai/gym:0.19.0:bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby +- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeibnh47c5rw2ijq2xz4n5oyxney4zrlddq6djvhwfniudy44oj243y +- fetchai/gym:0.20.0:bafybeiecsa564i5fya5lvgkzgv6z5ehm3clhx7derehaqjvud3bhokwahy default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index e8110ce74b..72a0913af7 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je +- fetchai/http_server:0.22.0:bafybeid6axvraazgpqhqsaklfe7gtknmmpgeroh5b7pxxudrcqh3jzvh6y contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/http_echo:0.20.0:bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm +- fetchai/http_echo:0.20.0:bafybeid4mx4oeokuigwbyo5iuuez5ubqiaeelmqkf2eazvigztge4ftzlq default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index a0571b0dd4..af85f1700e 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeicqf3sdlgkxqzmzfvhhau5da5xnbo43gq7omnruo3z4qolaermfie +- fetchai/stub:0.21.0:bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy +- fetchai/echo:0.19.0:bafybeigqa3nmawq4zn7nmcocjtdjvvcy5clq65cizro2usizd2fyaengka default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From faf2c41d4a6e9afdff80a3112de31220d3b4541f Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Wed, 31 Aug 2022 23:47:14 +0200 Subject: [PATCH 40/93] fix: plugin data --- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/gym_aea/aea-config.yaml | 10 ++-- .../agents/my_first_aea/aea-config.yaml | 8 +-- .../fetchai/connections/gym/connection.yaml | 2 +- .../connections/http_client/connection.yaml | 2 +- .../connections/http_server/connection.yaml | 2 +- .../connections/ledger/connection.yaml | 2 +- .../fetchai/connections/local/connection.yaml | 6 +- .../fetchai/connections/stub/connection.yaml | 5 +- packages/fetchai/skills/echo/skill.yaml | 2 +- .../fetchai/skills/erc1155_client/skill.yaml | 10 ++-- .../fetchai/skills/erc1155_deploy/skill.yaml | 10 ++-- packages/fetchai/skills/error/skill.yaml | 2 +- .../skills/fipa_dummy_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 10 ++-- .../fetchai/skills/generic_seller/skill.yaml | 10 ++-- packages/fetchai/skills/gym/skill.yaml | 6 +- packages/fetchai/skills/http_echo/skill.yaml | 4 +- packages/hashes.csv | 58 +++++++++---------- .../open_aea/agents/gym_aea/aea-config.yaml | 10 ++-- .../open_aea/agents/http_echo/aea-config.yaml | 8 +-- .../agents/my_first_aea/aea-config.yaml | 8 +-- plugins/aea-ledger-cosmos/setup.py | 5 ++ plugins/aea-ledger-ethereum/setup.py | 6 ++ plugins/aea-ledger-fetchai/setup.py | 6 ++ 25 files changed, 106 insertions(+), 90 deletions(-) diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index f266f446f1..5840b0e194 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq +- fetchai/stub:0.21.0:bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 130c68cc38..4da51758c2 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru +- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby -- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeiecsa564i5fya5lvgkzgv6z5ehm3clhx7derehaqjvud3bhokwahy +- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 95114fbc63..7e005205d6 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq +- fetchai/stub:0.21.0:bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeigqa3nmawq4zn7nmcocjtdjvvcy5clq65cizro2usizd2fyaengka +- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 41fc931197..ff08db8c42 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby +- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe class_name: GymConnection config: env: '' diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index e5134f99bf..e369ed2865 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -15,7 +15,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu +- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq class_name: HTTPClientConnection config: host: 127.0.0.1 diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index 554d6a4fee..d46868784b 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -19,7 +19,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu +- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq class_name: HTTPServerConnection config: api_spec_path: null diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index 3319fde20e..4a0ca716c7 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq +- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae class_name: LedgerConnection config: ledger_apis: diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index 9e95c15aca..d693220845 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -15,9 +15,9 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy -- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii class_name: OEFLocalConnection config: {} excluded_protocols: [] diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index 650dc6464a..01b4bec2b9 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -10,14 +10,13 @@ fingerprint: README.md: bafybeiht3qtxpf2meyrveoghidjtdsz433wguz4wlxhzsiixpafkrjv7yy __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 - input_file: bafybeiftu27piztiu5bfxbvhqsbppgtseykyfot6wtlrrzeuzya6zrgpky tests/__init__.py: bafybeihodqbifehez7r4zalztsn5ildne4rxc6rvdhykl7vscghxi4v45i tests/test_stub.py: bafybeickhyxxbaygqa234xk4afjqklj46455rgghyhfcnbfb76e6lm3hpe fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 505a0a0820..80022ae4d9 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm skills: [] behaviours: echo: diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 24f117e236..cb81750616 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -21,15 +21,15 @@ fingerprint: tests/test_strategy.py: bafybeic3zyvuaaqtfpdsgkfqlkyn2ftzlkmxs2cgfw5ub4qylnbguk7rbq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy -- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq -- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index abc3dee310..53687ceb4a 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -15,15 +15,15 @@ fingerprint: strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy -- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq -- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/error/skill.yaml b/packages/fetchai/skills/error/skill.yaml index e51d2e5868..710510382c 100644 --- a/packages/fetchai/skills/error/skill.yaml +++ b/packages/fetchai/skills/error/skill.yaml @@ -13,7 +13,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml index fa6e171b7e..1ba26d83ec 100644 --- a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml +++ b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml @@ -15,7 +15,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose skills: [] behaviours: initializer: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 49670f1fc0..a57acbdfed 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -14,13 +14,13 @@ fingerprint: strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy -- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq -- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index e7c5f827c0..7aee54beeb 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -15,13 +15,13 @@ fingerprint: strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m +- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/fipa:1.0.0:bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy -- fetchai/ledger_api:1.0.0:bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq -- fetchai/oef_search:1.0.0:bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index dedb125dc3..6aea634435 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,11 +15,11 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru +- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 372179b42a..9237eb0ef2 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -15,8 +15,8 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq skills: [] behaviours: {} handlers: diff --git a/packages/hashes.csv b/packages/hashes.csv index c5dfffa3be..f3b2f0bac9 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,36 +1,36 @@ -fetchai/agents/error_test,bafybeife3locwgzl5rzehxiddoqp6t5t76lvlxctz47yx6irec33kxuv4q -fetchai/agents/gym_aea,bafybeifvbem567wrctln4jgxyiopdwqg7tasuqugql5qbycgvlcv4ftc7q -fetchai/agents/my_first_aea,bafybeiem2masnbtkd4nttxtkbvgj55phvasyjzulur3cmdllf2zs4lmxom -fetchai/connections/gym,bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru -fetchai/connections/http_client,bafybeifwbyeoaiohsmzyzhgp5ozx76c4xymzglze2guydpd3y2vmafswg4 -fetchai/connections/http_server,bafybeid6axvraazgpqhqsaklfe7gtknmmpgeroh5b7pxxudrcqh3jzvh6y -fetchai/connections/ledger,bafybeidi62wezch2go3x74zhpmiwlf2lc75pxh7ulepskpzarfjxs6et7m -fetchai/connections/local,bafybeihrhb5l2st5g62z3ln7yfhagci6q2jqmfdaly6n5afdsm25lwitmu -fetchai/connections/stub,bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq +fetchai/agents/error_test,bafybeig57ii3i6h63sdkkrkwrvy5mdsmvgrkfw2h4usofpt2jcpgj36gnq +fetchai/agents/gym_aea,bafybeigrzuxo5amvwn56ikypgmriuw4ixc4znyab3sdssqzosm7c4l4og4 +fetchai/agents/my_first_aea,bafybeiajiiumw4sgih2orzlp4w7hkmzjppbzifle34obcbitk3jbnwswg4 +fetchai/connections/gym,bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +fetchai/connections/http_client,bafybeif27hbtpzqe54vkvbsfwsyem2fimq46cgca3rfuvbh2sdzfbgor5i +fetchai/connections/http_server,bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je +fetchai/connections/ledger,bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +fetchai/connections/local,bafybeidr3wjv6h2wgysm26bbcs26zuzesmzq2dh5dhrqtoiilnfrubaure +fetchai/connections/stub,bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -fetchai/protocols/default,bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -fetchai/protocols/fipa,bafybeihwxpaswhxnpwn7zjy7qltwx76hyute3dfsiiaddfi2frjgj54xiy -fetchai/protocols/gym,bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby -fetchai/protocols/http,bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu -fetchai/protocols/ledger_api,bafybeidpeyhqzzuquxmgmbvifsckvp3hweh3tpp46i4mkct4hmta3jrbrq -fetchai/protocols/oef_search,bafybeib4334t2cumwz2wje3w2rdivpirz6qioyy357xo66qkhjuklj4nnu -fetchai/protocols/state_update,bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 -fetchai/protocols/tac,bafybeibxnd7wqcl3xlq7wo2mztix5pgvsfffrgrrfszdng5pkcf6bydkfa -fetchai/skills/echo,bafybeigqa3nmawq4zn7nmcocjtdjvvcy5clq65cizro2usizd2fyaengka -fetchai/skills/erc1155_client,bafybeifr3zmumx2kb6ohvjp7s3w65dg4vbxntpy2akdmxojdtdsnzfucci -fetchai/skills/erc1155_deploy,bafybeibwja5imcfq7cwxt5frakpq4lwj4bpuwrdm42km7h7bb5rjupycyy -fetchai/skills/error,bafybeibmu5hfbzsz6t4764qxc3npkj3bgazbbzryeu33rydy76ckbkp5bq +fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +fetchai/protocols/gym,bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +fetchai/protocols/http,bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +fetchai/protocols/ledger_api,bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm +fetchai/skills/echo,bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy +fetchai/skills/erc1155_client,bafybeihbzxcmwkaxnxvsrfkmlfa5y6fvbqmjcqqeztmg7jtyo26asobf3y +fetchai/skills/erc1155_deploy,bafybeihyde4lpbpm4eydveowp2kdrw25murprahrtobb4ydr6wbujf5px4 +fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu -fetchai/skills/fipa_dummy_buyer,bafybeih5dbptdeh3xydpuxt3ig5wrz5bnqjqnngmnhlw6kipile6insrgu -fetchai/skills/generic_buyer,bafybeihhm73vfy7sb6tet6vkboy2mfjji3akdulvczn3rafkudfnzoujli -fetchai/skills/generic_seller,bafybeicdkqigrpsnumu47r5rdepuufzw3uaiizqu2ovlwuq4njebzxmw2a -fetchai/skills/gym,bafybeiecsa564i5fya5lvgkzgv6z5ehm3clhx7derehaqjvud3bhokwahy -fetchai/skills/http_echo,bafybeid4mx4oeokuigwbyo5iuuez5ubqiaeelmqkf2eazvigztge4ftzlq +fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a +fetchai/skills/generic_buyer,bafybeieekzr3dpo3avi72l3gcxtfdjgbrfufkr542w2tclho6qe6nkv3km +fetchai/skills/generic_seller,bafybeig4kvs5pyhk4dt6xjcuvnxcajkb6t6jz74srbsxyaa33aohdtjqha +fetchai/skills/gym,bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu +fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeidti4bnn3i4eyeuonfuvv7z6peydrhphemqpmdd4cmdcfkvzf6ag4 -open_aea/agents/http_echo,bafybeigdtzj56ms7kxy3bcm3jmxii5dxdkl54v6e6jwwtntahvlfqln4u4 -open_aea/agents/my_first_aea,bafybeifymrtzbqlu3wzpi3mj73maggz2z4hgeony2v7rzaafcdumnqkdya +open_aea/agents/gym_aea,bafybeic4xvz5hwabultbdczapr34gttobhqw5r3k5c25tsprozx2gwyjku +open_aea/agents/http_echo,bafybeick5guncuvf3zehoqfudca6r5q3a6qktsy7k5m5feilqpw37ltopu +open_aea/agents/my_first_aea,bafybeia5retw3um6guuqya44fxco3dkzoefr7r6ytgaouny3eu5mw3o754 open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index c4b8b61f52..9f2f182d72 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeiardoniipbbht6trvgwwoyusjwz3luyfmu2v3zmiplhywstt2s5ru +- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/gym:1.0.0:bafybeictgqzq3vntvz5wmnybl33nfmwoey7ckq5tveans4cipdmtwm2bby -- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeiecsa564i5fya5lvgkzgv6z5ehm3clhx7derehaqjvud3bhokwahy +- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index 72a0913af7..e8110ce74b 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeid6axvraazgpqhqsaklfe7gtknmmpgeroh5b7pxxudrcqh3jzvh6y +- fetchai/http_server:0.22.0:bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/http:1.0.0:bafybeihj2lalni5d3ug5epe7u7mpnqkw7lrt6teekzy4xlyndbygmrv3cu +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/http_echo:0.20.0:bafybeid4mx4oeokuigwbyo5iuuez5ubqiaeelmqkf2eazvigztge4ftzlq +- fetchai/http_echo:0.20.0:bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index af85f1700e..c3f8152741 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeibiyn7ofdsb7fdohpoounhcmq4fqh2veuuccpb3safxl7hx6r4ieq +- fetchai/stub:0.21.0:bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeidpkg2yj6jlyzomefz3hqe7nnqdxwmr7l66hxnr2a3ybtvw4k7bi4 -- fetchai/state_update:1.0.0:bafybeiboyy34msyrbw7gf3uzdyztx5rdi6je3p6npfafxpvvj3kl7o72l4 +- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeigqa3nmawq4zn7nmcocjtdjvvcy5clq65cizro2usizd2fyaengka +- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: diff --git a/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py index ab291b93e5..01de7da5d5 100644 --- a/plugins/aea-ledger-cosmos/setup.py +++ b/plugins/aea-ledger-cosmos/setup.py @@ -31,6 +31,11 @@ license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.", packages=find_packages(include=["aea_ledger_cosmos*"]), + package_data={ + "aea_ledger_cosmos": [ + "py.typed", + ] + }, install_requires=[ "open-aea>=1.0.0, <2.0.0", "ecdsa>=0.15,<0.17.0", diff --git a/plugins/aea-ledger-ethereum/setup.py b/plugins/aea-ledger-ethereum/setup.py index d703d8241c..9389cf32de 100644 --- a/plugins/aea-ledger-ethereum/setup.py +++ b/plugins/aea-ledger-ethereum/setup.py @@ -31,6 +31,12 @@ license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Ethereum.", packages=find_packages(include=["aea_ledger_ethereum*"]), + package_data={ + "aea_ledger_ethereum": [ + "py.typed", + "test_tools/data/*", + ] + }, install_requires=[ "open-aea>=1.0.0, <2.0.0", "web3==5.25.0", diff --git a/plugins/aea-ledger-fetchai/setup.py b/plugins/aea-ledger-fetchai/setup.py index 9e1619b9f2..2c5f28b8b1 100644 --- a/plugins/aea-ledger-fetchai/setup.py +++ b/plugins/aea-ledger-fetchai/setup.py @@ -36,6 +36,12 @@ license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger API of Fetch.AI.", packages=find_packages(include=["aea_ledger_fetchai*"]), + package_data={ + "aea_ledger_fetchai": [ + "py.typed", + "test_tools/data/*", + ] + }, install_requires=[ "open-aea>=1.0.0, <2.0.0", "ecdsa>=0.15,<0.17.0", From 7a26f7988f17d970f6925f43187b75ba3c6955b1 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Wed, 31 Aug 2022 23:58:39 +0200 Subject: [PATCH 41/93] chore: remove duplicate tests --- .../test_connections/test_gym/__init__.py | 20 - .../test_connections/test_gym/test_gym.py | 279 --- .../test_http_client/__init__.py | 20 - .../test_http_client/test_http_client.py | 357 ---- .../test_http_server/test_http_server.py | 595 ------ .../test_ledger/test_ledger_api.py | 473 ----- .../test_connections/test_local/__init__.py | 20 - .../test_connections/test_local/test_misc.py | 249 --- .../test_local/test_search_services.py | 650 ------- .../test_connections/test_stub/__init__.py | 20 - .../test_connections/test_stub/test_stub.py | 413 ----- .../test_packages/test_contracts/__init__.py | 20 - .../test_contracts/test_erc1155/__init__.py | 20 - .../test_erc1155/test_contract.py | 1631 ----------------- .../test_protocols/test_contract_api.py | 579 ------ .../test_skills/test_echo/__init__.py | 21 - .../test_skills/test_echo/test_behaviours.py | 84 - .../test_skills/test_echo/test_dialogues.py | 54 - .../test_skills/test_echo/test_handlers.py | 196 -- .../test_erc1155_client/__init__.py | 21 - .../test_erc1155_client/intermediate_class.py | 217 --- .../test_erc1155_client/test_behaviours.py | 86 - .../test_erc1155_client/test_dialogues.py | 188 -- .../test_erc1155_client/test_handlers.py | 860 --------- .../test_erc1155_client/test_strategy.py | 83 - 25 files changed, 7156 deletions(-) delete mode 100644 tests/test_packages/test_connections/test_gym/__init__.py delete mode 100644 tests/test_packages/test_connections/test_gym/test_gym.py delete mode 100644 tests/test_packages/test_connections/test_http_client/__init__.py delete mode 100644 tests/test_packages/test_connections/test_http_client/test_http_client.py delete mode 100644 tests/test_packages/test_connections/test_http_server/test_http_server.py delete mode 100644 tests/test_packages/test_connections/test_ledger/test_ledger_api.py delete mode 100644 tests/test_packages/test_connections/test_local/__init__.py delete mode 100644 tests/test_packages/test_connections/test_local/test_misc.py delete mode 100644 tests/test_packages/test_connections/test_local/test_search_services.py delete mode 100644 tests/test_packages/test_connections/test_stub/__init__.py delete mode 100644 tests/test_packages/test_connections/test_stub/test_stub.py delete mode 100644 tests/test_packages/test_contracts/__init__.py delete mode 100644 tests/test_packages/test_contracts/test_erc1155/__init__.py delete mode 100644 tests/test_packages/test_contracts/test_erc1155/test_contract.py delete mode 100644 tests/test_packages/test_protocols/test_contract_api.py delete mode 100644 tests/test_packages/test_skills/test_echo/__init__.py delete mode 100644 tests/test_packages/test_skills/test_echo/test_behaviours.py delete mode 100644 tests/test_packages/test_skills/test_echo/test_dialogues.py delete mode 100644 tests/test_packages/test_skills/test_echo/test_handlers.py delete mode 100644 tests/test_packages/test_skills/test_erc1155_client/__init__.py delete mode 100644 tests/test_packages/test_skills/test_erc1155_client/intermediate_class.py delete mode 100644 tests/test_packages/test_skills/test_erc1155_client/test_behaviours.py delete mode 100644 tests/test_packages/test_skills/test_erc1155_client/test_dialogues.py delete mode 100644 tests/test_packages/test_skills/test_erc1155_client/test_handlers.py delete mode 100644 tests/test_packages/test_skills/test_erc1155_client/test_strategy.py diff --git a/tests/test_packages/test_connections/test_gym/__init__.py b/tests/test_packages/test_connections/test_gym/__init__.py deleted file mode 100644 index 9d1f2264f7..0000000000 --- a/tests/test_packages/test_connections/test_gym/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the gym connection implementation.""" diff --git a/tests/test_packages/test_connections/test_gym/test_gym.py b/tests/test_packages/test_connections/test_gym/test_gym.py deleted file mode 100644 index ca303a6b07..0000000000 --- a/tests/test_packages/test_connections/test_gym/test_gym.py +++ /dev/null @@ -1,279 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the gym connection module.""" -import asyncio -import logging -import os -from typing import cast -from unittest.mock import MagicMock, patch - -import gym -import pytest - -from aea.common import Address -from aea.configurations.base import ConnectionConfig -from aea.identity.base import Identity -from aea.mail.base import Envelope, Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue - -from packages.fetchai.connections.gym.connection import GymConnection -from packages.fetchai.protocols.gym.dialogues import GymDialogue -from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues -from packages.fetchai.protocols.gym.message import GymMessage - -from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID - - -logger = logging.getLogger(__name__) - - -class GymDialogues(BaseGymDialogues): - """The dialogues class keeps track of all gym dialogues.""" - - def __init__(self, self_address: Address, **kwargs) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return GymDialogue.Role.AGENT - - BaseGymDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - ) - - -class TestGymConnection: - """Test the packages/connection/gym/connection.py.""" - - def setup(self): - """Initialise the class.""" - self.env = gym.GoalEnv() - configuration = ConnectionConfig(connection_id=GymConnection.connection_id) - self.agent_address = "my_address" - self.agent_public_key = "my_public_key" - identity = Identity( - "name", address=self.agent_address, public_key=self.agent_public_key - ) - self.gym_con = GymConnection( - gym_env=self.env, - identity=identity, - configuration=configuration, - data_dir=MagicMock(), - ) - self.loop = asyncio.get_event_loop() - self.gym_address = str(GymConnection.connection_id) - self.skill_id = "some/skill:0.1.0" - self.dialogues = GymDialogues(self.skill_id) - - def teardown(self): - """Clean up after tests.""" - self.loop.run_until_complete(self.gym_con.disconnect()) - - @pytest.mark.asyncio - async def test_gym_connection_connect(self): - """Test the connection None return value after connect().""" - assert self.gym_con.channel._queue is None - await self.gym_con.channel.connect() - assert self.gym_con.channel._queue is not None - - @pytest.mark.asyncio - async def test_decode_envelope_error(self): - """Test the decoding error for the envelopes.""" - await self.gym_con.connect() - envelope = Envelope( - to=self.gym_address, - sender=self.skill_id, - protocol_specification_id=UNKNOWN_PROTOCOL_PUBLIC_ID, - message=b"hello", - ) - - with pytest.raises(ValueError): - await self.gym_con.send(envelope) - - @pytest.mark.asyncio - async def test_send_connection_error(self): - """Test send connection error.""" - msg, sending_dialogue = self.dialogues.create( - counterparty=self.gym_address, - performative=GymMessage.Performative.RESET, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - ) - - with pytest.raises(ConnectionError): - await self.gym_con.send(envelope) - - @pytest.mark.asyncio - async def test_send_act(self): - """Test send act message.""" - sending_dialogue = await self.send_reset() - assert sending_dialogue.last_message is not None - msg = sending_dialogue.reply( - performative=GymMessage.Performative.ACT, - action=GymMessage.AnyObject("any_action"), - step_id=1, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - ) - await self.gym_con.connect() - - observation = 1 - reward = 1.0 - done = True - info = "some info" - with patch.object( - self.env, "step", return_value=(observation, reward, done, info) - ) as mock: - await self.gym_con.send(envelope) - mock.assert_called() - - response = await asyncio.wait_for(self.gym_con.receive(), timeout=3) - response_msg = cast(GymMessage, response.message) - response_dialogue = self.dialogues.update(response_msg) - - assert response_msg.performative == GymMessage.Performative.PERCEPT - assert response_msg.step_id == msg.step_id - assert response_msg.observation.any == observation - assert response_msg.reward == reward - assert response_msg.done == done - assert response_msg.info.any == info - assert sending_dialogue == response_dialogue - - @pytest.mark.asyncio - async def test_send_reset(self): - """Test send reset message.""" - _ = await self.send_reset() - - @pytest.mark.asyncio - async def test_send_close(self): - """Test send close message.""" - sending_dialogue = await self.send_reset() - assert sending_dialogue.last_message is not None - msg = sending_dialogue.reply( - performative=GymMessage.Performative.CLOSE, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - ) - await self.gym_con.connect() - - with patch.object(self.env, "close") as mock: - await self.gym_con.send(envelope) - mock.assert_called() - - @pytest.mark.asyncio - async def test_send_close_negative(self): - """Test send close message with invalid reference and message id and target.""" - incorrect_msg = GymMessage( - performative=GymMessage.Performative.CLOSE, - dialogue_reference=self.dialogues.new_self_initiated_dialogue_reference(), - ) - incorrect_msg.to = self.gym_address - incorrect_msg.sender = self.skill_id - - # the incorrect message cannot be sent into a dialogue, so this is omitted. - - envelope = Envelope( - to=incorrect_msg.to, - sender=incorrect_msg.sender, - protocol_specification_id=incorrect_msg.protocol_specification_id, - message=incorrect_msg, - ) - await self.gym_con.connect() - - with patch.object(self.gym_con.channel.logger, "warning") as mock_logger: - await self.gym_con.send(envelope) - mock_logger.assert_any_call( - f"Could not create dialogue from message={incorrect_msg}" - ) - - async def send_reset(self) -> GymDialogue: - """Send a reset.""" - msg, sending_dialogue = self.dialogues.create( - counterparty=self.gym_address, - performative=GymMessage.Performative.RESET, - ) - assert sending_dialogue is not None - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - ) - await self.gym_con.connect() - - with patch.object(self.env, "reset") as mock: - await self.gym_con.send(envelope) - mock.assert_called() - - response = await asyncio.wait_for(self.gym_con.receive(), timeout=3) - response_msg = cast(GymMessage, response.message) - response_dialogue = self.dialogues.update(response_msg) - - assert response_msg.performative == GymMessage.Performative.STATUS - assert response_msg.content == {"reset": "success"} - assert sending_dialogue == response_dialogue - return sending_dialogue - - @pytest.mark.asyncio - async def test_receive_connection_error(self): - """Test receive connection error and Cancel Error.""" - with pytest.raises(ConnectionError): - await self.gym_con.receive() - - def test_gym_env_load(self): - """Load gym env from file.""" - curdir = os.getcwd() - os.chdir(os.path.join(ROOT_DIR, "examples", "gym_ex")) - gym_env_path = "gyms.env.BanditNArmedRandom" - configuration = ConnectionConfig( - connection_id=GymConnection.connection_id, env=gym_env_path - ) - identity = Identity( - "name", address=self.agent_address, public_key=self.agent_public_key - ) - gym_con = GymConnection( - gym_env=None, - identity=identity, - configuration=configuration, - data_dir=MagicMock(), - ) - assert gym_con.channel.gym_env is not None - os.chdir(curdir) diff --git a/tests/test_packages/test_connections/test_http_client/__init__.py b/tests/test_packages/test_connections/test_http_client/__init__.py deleted file mode 100644 index c7f4dc6bcc..0000000000 --- a/tests/test_packages/test_connections/test_http_client/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the HTTP client connection implementation.""" diff --git a/tests/test_packages/test_connections/test_http_client/test_http_client.py b/tests/test_packages/test_connections/test_http_client/test_http_client.py deleted file mode 100644 index 91dfed008e..0000000000 --- a/tests/test_packages/test_connections/test_http_client/test_http_client.py +++ /dev/null @@ -1,357 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""Tests for the HTTP Client connection and channel.""" -import asyncio -import logging -from asyncio import CancelledError -from typing import cast -from unittest.mock import MagicMock, Mock, patch - -import aiohttp -import pytest - -from aea.common import Address -from aea.configurations.base import ConnectionConfig -from aea.identity.base import Identity -from aea.mail.base import Envelope, Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue - -from packages.fetchai.connections.http_client.connection import HTTPClientConnection -from packages.fetchai.protocols.http.dialogues import HttpDialogue -from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues -from packages.fetchai.protocols.http.message import HttpMessage - -from tests.common.mocks import AnyStringWith -from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID, get_host, get_unused_tcp_port - - -logger = logging.getLogger(__name__) - - -class _MockRequest: - """Fake request for aiohttp client session.""" - - def __init__(self, response: Mock) -> None: - """Init with mock response.""" - self.response = response - - async def __aenter__(self) -> Mock: - """Enter async context.""" - return self.response - - async def __aexit__(self, *args, **kwargs) -> None: - """Exit async context.""" - return None - - -class HttpDialogues(BaseHttpDialogues): - """The dialogues class keeps track of all http dialogues.""" - - def __init__(self, self_address: Address, **kwargs) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return HttpDialogue.Role.CLIENT - - BaseHttpDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - ) - - -@pytest.mark.asyncio -class TestHTTPClientConnect: - """Tests the http client connection's 'connect' functionality.""" - - def setup(self): - """Initialise the class.""" - self.address = get_host() - self.port = get_unused_tcp_port() - self.agent_identity = Identity( - "name", address="some string", public_key="some public_key" - ) - self.client_skill_id = "some/skill:0.1.0" - configuration = ConnectionConfig( - host=self.address, - port=self.port, - connection_id=HTTPClientConnection.connection_id, - ) - self.http_client_connection = HTTPClientConnection( - configuration=configuration, - data_dir=MagicMock(), - identity=self.agent_identity, - ) - self.connection_address = str(HTTPClientConnection.connection_id) - self.http_dialogs = HttpDialogues(self.client_skill_id) - - @pytest.mark.asyncio - async def test_initialization(self): - """Test the initialisation of the class.""" - assert self.http_client_connection.address == self.agent_identity.address - - @pytest.mark.asyncio - async def test_connection(self): - """Test the connect functionality of the http client connection.""" - await self.http_client_connection.connect() - assert self.http_client_connection.is_connected is True - - @pytest.mark.asyncio - async def test_disconnect(self): - """Test the disconnect functionality of the http client connection.""" - await self.http_client_connection.connect() - assert self.http_client_connection.is_connected is True - - await self.http_client_connection.disconnect() - assert self.http_client_connection.is_connected is False - - @pytest.mark.asyncio - async def test_http_send_error(self): - """Test request fails and send back result with code 600.""" - await self.http_client_connection.connect() - request_http_message, _ = self.http_dialogs.create( - counterparty=self.connection_address, - performative=HttpMessage.Performative.REQUEST, - method="get", - url="bad url", - headers="", - version="", - body=b"", - ) - request_envelope = Envelope( - to=self.connection_address, - sender=self.client_skill_id, - protocol_specification_id=UNKNOWN_PROTOCOL_PUBLIC_ID, - message=request_http_message, - ) - - connection_response_mock = Mock() - connection_response_mock.status_code = 200 - - await self.http_client_connection.send(envelope=request_envelope) - # TODO: Consider returning the response from the server in order to be able to assert that the message send! - envelope = await asyncio.wait_for( - self.http_client_connection.receive(), timeout=10 - ) - assert envelope - assert envelope.message.status_code == 600 - - await self.http_client_connection.disconnect() - - @pytest.mark.asyncio - async def test_http_client_send_not_connected_error(self): - """Test connection.send error if not conencted.""" - with pytest.raises(ConnectionError): - await self.http_client_connection.send(Mock()) - - @pytest.mark.asyncio - async def test_http_channel_send_not_connected_error(self): - """Test channel.send error if not conencted.""" - with pytest.raises(ValueError): - self.http_client_connection.channel.send(Mock()) - - @pytest.mark.asyncio - async def test_send_empty_envelope_skip(self): - """Test skip on empty envelope request sent.""" - await self.http_client_connection.connect() - with patch.object( - self.http_client_connection.channel, "_http_request_task" - ) as mock: - await self.http_client_connection.send(None) - mock.assert_not_called() - - @pytest.mark.asyncio - async def test_channel_get_message_not_connected(self): - """Test errro on message get if not connected.""" - with pytest.raises(ValueError): - await self.http_client_connection.channel.get_message() - - @pytest.mark.asyncio - async def test_channel_cancel_tasks_on_disconnect(self): - """Test requests tasks cancelled on disconnect.""" - await self.http_client_connection.connect() - request_http_message, _ = self.http_dialogs.create( - counterparty=self.connection_address, - performative=HttpMessage.Performative.REQUEST, - method="get", - url="https://not-a-google.com", - headers="", - version="", - body=b"", - ) - request_envelope = Envelope( - to=self.connection_address, - sender=self.client_skill_id, - protocol_specification_id=UNKNOWN_PROTOCOL_PUBLIC_ID, - message=request_http_message, - ) - - connection_response_mock = Mock() - connection_response_mock.status_code = 200 - - response_mock = Mock() - response_mock.status = 200 - response_mock.headers = {"headers": "some header"} - response_mock.reason = "OK" - response_mock._body = b"Some content" - response_mock.read.return_value = asyncio.Future() - - with patch.object( - aiohttp.ClientSession, - "request", - return_value=_MockRequest(response_mock), - ): - await self.http_client_connection.send(envelope=request_envelope) - - assert self.http_client_connection.channel._tasks - task = list(self.http_client_connection.channel._tasks)[0] - assert not task.done() - await self.http_client_connection.disconnect() - - assert not self.http_client_connection.channel._tasks - assert task.done() - with pytest.raises(CancelledError): - await task - - @pytest.mark.asyncio - async def test_http_send_ok(self): - """Test request is ok cause mocked.""" - await self.http_client_connection.connect() - request_http_message, sending_dialogue = self.http_dialogs.create( - counterparty=self.connection_address, - performative=HttpMessage.Performative.REQUEST, - method="get", - url="https://not-a-google.com", - headers="", - version="", - body=b"", - ) - request_envelope = Envelope( - to=self.connection_address, - sender=self.client_skill_id, - message=request_http_message, - ) - - connection_response_mock = Mock() - connection_response_mock.status_code = 200 - - response_mock = Mock() - response_mock.status = 200 - response_mock.headers = {"headers": "some header"} - response_mock.reason = "OK" - response_mock._body = b"Some content" - response_mock.read.return_value = asyncio.Future() - response_mock.read.return_value.set_result("") - - with patch.object( - aiohttp.ClientSession, - "request", - return_value=_MockRequest(response_mock), - ): - await self.http_client_connection.send(envelope=request_envelope) - # TODO: Consider returning the response from the server in order to be able to assert that the message send! - envelope = await asyncio.wait_for( - self.http_client_connection.receive(), timeout=10 - ) - - assert envelope is not None and envelope.message is not None - message = envelope.message - response_dialogue = self.http_dialogs.update(message) - assert message.status_code == response_mock.status, message.body.decode("utf-8") - assert sending_dialogue == response_dialogue - await self.http_client_connection.disconnect() - - @pytest.mark.asyncio - async def test_http_dialogue_construct_fail(self): - """Test dialogue not properly constructed.""" - await self.http_client_connection.connect() - - incorrect_http_message = HttpMessage( - dialogue_reference=self.http_dialogs.new_self_initiated_dialogue_reference(), - performative=HttpMessage.Performative.RESPONSE, - status_code=500, - headers="", - status_text="", - body=b"", - version="", - ) - incorrect_http_message.to = self.connection_address - incorrect_http_message.sender = self.client_skill_id - - # the incorrect message cannot be sent into a dialogue, so this is omitted. - - envelope = Envelope( - to=incorrect_http_message.to, - sender=incorrect_http_message.sender, - message=incorrect_http_message, - ) - with patch.object( - self.http_client_connection.channel.logger, "warning" - ) as mock_logger: - await self.http_client_connection.channel._http_request_task(envelope) - mock_logger.assert_any_call( - AnyStringWith("Could not create dialogue for message=") - ) - - @pytest.mark.asyncio - async def test_http_send_exception(self): - """Test request is ok cause mocked.""" - await self.http_client_connection.connect() - request_http_message, sending_dialogue = self.http_dialogs.create( - counterparty=self.connection_address, - performative=HttpMessage.Performative.REQUEST, - method="get", - url="https://not-a-google.com", - headers="", - version="", - body=b"", - ) - request_envelope = Envelope( - to=self.connection_address, - sender=self.client_skill_id, - message=request_http_message, - ) - - with patch.object( - aiohttp.ClientSession, - "request", - side_effect=asyncio.TimeoutError("expected exception"), - ): - await self.http_client_connection.send(envelope=request_envelope) - envelope = await asyncio.wait_for( - self.http_client_connection.receive(), timeout=10 - ) - - assert envelope - message = cast(HttpMessage, envelope.message) - assert message.performative == HttpMessage.Performative.RESPONSE - assert b"expected exception" in message.body diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py deleted file mode 100644 index 9d782e359e..0000000000 --- a/tests/test_packages/test_connections/test_http_server/test_http_server.py +++ /dev/null @@ -1,595 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the HTTP Server connection module.""" -import asyncio -import logging -import os -import ssl -from traceback import print_exc -from typing import Tuple, cast -from unittest.mock import MagicMock, Mock, patch - -import aiohttp -import pytest -from aiohttp.client_reqrep import ClientResponse - -from aea.common import Address -from aea.configurations.base import ConnectionConfig -from aea.identity.base import Identity -from aea.mail.base import Envelope, Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue - -from packages.fetchai.connections.http_server.connection import ( - APISpec, - HTTPServerConnection, - Response, -) -from packages.fetchai.protocols.http.dialogues import HttpDialogue -from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues -from packages.fetchai.protocols.http.message import HttpMessage - -from tests.common.mocks import RegexComparator -from tests.conftest import ROOT_DIR, get_host, get_unused_tcp_port - - -logger = logging.getLogger(__name__) - - -class HttpDialogues(BaseHttpDialogues): - """The dialogues class keeps track of all http dialogues.""" - - def __init__(self, self_address: Address, **kwargs) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return HttpDialogue.Role.SERVER - - BaseHttpDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - ) - - -@pytest.mark.asyncio -class TestHTTPServer: - """Tests for HTTPServer connection.""" - - async def request(self, method: str, path: str, **kwargs) -> ClientResponse: - """ - Make a http request. - - :param method: HTTP method: GET, POST etc - :param path: path to request on server. full url constructed automatically - - :return: http response - """ - try: - url = f"http://{self.host}:{self.port}{path}" - async with aiohttp.ClientSession() as session: - async with session.request(method, url, **kwargs) as resp: - await resp.read() - return resp - except Exception: - print_exc() - raise - - def setup(self): - """Initialise the test case.""" - self.identity = Identity("name", address="my_key", public_key="my_public_key") - self.agent_address = self.identity.address - self.host = get_host() - self.port = get_unused_tcp_port() - self.api_spec_path = os.path.join( - ROOT_DIR, "tests", "data", "petstore_sim.yaml" - ) - self.connection_id = HTTPServerConnection.connection_id - self.protocol_id = HttpMessage.protocol_id - self.target_skill_id = "some_author/some_skill:0.1.0" - - self.configuration = ConnectionConfig( - host=self.host, - port=self.port, - target_skill_id=self.target_skill_id, - api_spec_path=self.api_spec_path, - connection_id=HTTPServerConnection.connection_id, - restricted_to_protocols={HttpMessage.protocol_id}, - ) - self.http_connection = HTTPServerConnection( - configuration=self.configuration, - data_dir=MagicMock(), - identity=self.identity, - ) - self.loop = asyncio.get_event_loop() - self.loop.run_until_complete(self.http_connection.connect()) - self.connection_address = str(HTTPServerConnection.connection_id) - self._dialogues = HttpDialogues(self.target_skill_id) - self.original_timeout = self.http_connection.channel.timeout_window - - @pytest.mark.asyncio - async def test_http_connection_disconnect_channel(self): - """Test the disconnect.""" - await self.http_connection.channel.disconnect() - assert self.http_connection.channel.is_stopped - - def _get_message_and_dialogue( - self, envelope: Envelope - ) -> Tuple[HttpMessage, HttpDialogue]: - message = cast(HttpMessage, envelope.message) - dialogue = cast(HttpDialogue, self._dialogues.update(message)) - assert dialogue is not None - return message, dialogue - - @pytest.mark.asyncio - async def test_get_200(self): - """Test send get request w/ 200 response.""" - request_task = self.loop.create_task(self.request("get", "/pets")) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - message = dialogue.reply( - target_message=incoming_message, - performative=HttpMessage.Performative.RESPONSE, - version=incoming_message.version, - status_code=200, - status_text="Success", - body=b"Response body", - ) - response_envelope = Envelope( - to=envelope.sender, - sender=envelope.to, - context=envelope.context, - message=message, - ) - await self.http_connection.send(response_envelope) - - response = await asyncio.wait_for( - request_task, - timeout=20, - ) - - assert ( - response.status == 200 - and response.reason == "Success" - and await response.text() == "Response body" - ) - - @pytest.mark.asyncio - async def test_header_content_type(self): - """Test send get request w/ 200 response.""" - content_type = "something/unique" - request_task = self.loop.create_task(self.request("get", "/pets")) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - message = dialogue.reply( - target_message=incoming_message, - performative=HttpMessage.Performative.RESPONSE, - version=incoming_message.version, - headers=f"Content-Type: {content_type}", - status_code=200, - status_text="Success", - body=b"Response body", - ) - response_envelope = Envelope( - to=envelope.sender, - sender=envelope.to, - context=envelope.context, - message=message, - ) - await self.http_connection.send(response_envelope) - - response = await asyncio.wait_for( - request_task, - timeout=20, - ) - assert ( - response.status == 200 - and response.reason == "Success" - and await response.text() == "Response body" - ) - assert response.headers["Content-Type"] == content_type - - @pytest.mark.asyncio - async def test_bad_performative_get_timeout_error(self): - """Test send get request w/ 200 response.""" - self.http_connection.channel.timeout_window = 3 - request_task = self.loop.create_task(self.request("get", "/pets")) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=10) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - incorrect_message = HttpMessage( - performative=HttpMessage.Performative.REQUEST, - dialogue_reference=dialogue.dialogue_label.dialogue_reference, - target=incoming_message.message_id, - message_id=incoming_message.message_id + 1, - method="post", - url="/pets", - version=incoming_message.version, - headers=incoming_message.headers, - body=b"Request body", - ) - incorrect_message.to = incoming_message.sender - - # the incorrect message cannot be sent into a dialogue, so this is omitted. - - response_envelope = Envelope( - to=incorrect_message.to, - sender=envelope.to, - context=envelope.context, - message=incorrect_message, - ) - with patch.object(self.http_connection.logger, "warning") as mock_logger: - await self.http_connection.send(response_envelope) - mock_logger.assert_any_call( - f"Could not create dialogue for message={incorrect_message}" - ) - - response = await asyncio.wait_for(request_task, timeout=10) - - assert ( - response.status == 408 - and response.reason == "Request Timeout" - and await response.text() == "" - ) - - @pytest.mark.asyncio - async def test_late_message_get_timeout_error(self): - """Test send get request w/ 200 response.""" - self.http_connection.channel.timeout_window = 1 - request_task = self.loop.create_task(self.request("get", "/pets")) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=10) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - message = dialogue.reply( - target_message=incoming_message, - performative=HttpMessage.Performative.RESPONSE, - version=incoming_message.version, - headers=incoming_message.headers, - status_code=200, - status_text="Success", - body=b"Response body", - ) - response_envelope = Envelope( - to=message.to, - sender=envelope.to, - context=envelope.context, - message=message, - ) - await asyncio.sleep(1.5) - with patch.object(self.http_connection.logger, "warning") as mock_logger: - await self.http_connection.send(response_envelope) - mock_logger.assert_any_call( - RegexComparator( - "Dropping message=.* for incomplete_dialogue_label=.* which has timed out." - ) - ) - - response = await asyncio.wait_for(request_task, timeout=10) - - assert ( - response.status == 408 - and response.reason == "Request Timeout" - and await response.text() == "" - ) - - @pytest.mark.asyncio - async def test_post_201(self): - """Test send get request w/ 200 response.""" - request_task = self.loop.create_task( - self.request( - "post", - "/pets", - ) - ) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - message = dialogue.reply( - target_message=incoming_message, - performative=HttpMessage.Performative.RESPONSE, - version=incoming_message.version, - status_code=201, - status_text="Created", - body=b"Response body", - ) - response_envelope = Envelope( - to=message.to, - sender=envelope.to, - context=envelope.context, - message=message, - ) - - await self.http_connection.send(response_envelope) - - response = await asyncio.wait_for( - request_task, - timeout=20, - ) - assert ( - response.status == 201 - and response.reason == "Created" - and await response.text() == "Response body" - ) - - @pytest.mark.asyncio - async def test_get_404(self): - """Test send post request w/ 404 response.""" - response = await self.request("get", "/url-non-exists") - - assert ( - response.status == 404 - and response.reason == "Request Not Found" - and await response.text() == "" - ) - - @pytest.mark.asyncio - async def test_post_404(self): - """Test send post request w/ 404 response.""" - response = await self.request("get", "/url-non-exists", data="some data") - - assert ( - response.status == 404 - and response.reason == "Request Not Found" - and await response.text() == "" - ) - - @pytest.mark.asyncio - async def test_get_408(self): - """Test send post request w/ 404 response.""" - await self.http_connection.connect() - self.http_connection.channel.timeout_window = 0.1 - with patch.object( - self.http_connection.channel.logger, "warning" - ) as mock_logger: - response = await self.request("get", "/pets") - mock_logger.assert_any_call( - RegexComparator("Request timed out! Request=.*") - ) - - assert ( - response.status == 408 - and response.reason == "Request Timeout" - and await response.text() == "" - ) - - @pytest.mark.asyncio - async def test_post_408(self): - """Test send post request w/ 404 response.""" - self.http_connection.channel.timeout_window = 0.1 - response = await self.request("post", "/pets", data="somedata") - - assert ( - response.status == 408 - and response.reason == "Request Timeout" - and await response.text() == "" - ) - - @pytest.mark.asyncio - async def test_send_connection_drop(self): - """Test unexpected response.""" - message = HttpMessage( - performative=HttpMessage.Performative.RESPONSE, - dialogue_reference=("", ""), - target=1, - message_id=2, - headers="", - version="", - status_code=200, - status_text="Success", - body=b"", - ) - message.to = str(HTTPServerConnection.connection_id) - message.sender = self.target_skill_id - envelope = Envelope( - to=message.to, - sender=message.sender, - message=message, - ) - await self.http_connection.send(envelope) - - @pytest.mark.asyncio - async def test_get_message_channel_not_connected(self): - """Test error on channel get message if not connected.""" - await self.http_connection.disconnect() - with pytest.raises(ValueError): - await self.http_connection.channel.get_message() - - @pytest.mark.asyncio - async def test_fail_connect(self): - """Test error on server connection.""" - await self.http_connection.disconnect() - - with patch.object( - self.http_connection.channel, - "_start_http_server", - side_effect=Exception("expected"), - ): - await self.http_connection.connect() - assert not self.http_connection.is_connected - - @pytest.mark.asyncio - async def test_server_error_on_send_response(self): - """Test exception raised on response sending to the client.""" - request_task = self.loop.create_task( - self.request( - "post", - "/pets", - ) - ) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - message = dialogue.reply( - target_message=incoming_message, - performative=HttpMessage.Performative.RESPONSE, - version=incoming_message.version, - headers=incoming_message.headers, - status_code=201, - status_text="Created", - body=b"Response body", - ) - response_envelope = Envelope( - to=message.to, - sender=envelope.to, - context=envelope.context, - message=message, - ) - - with patch.object(Response, "from_message", side_effect=Exception("expected")): - await self.http_connection.send(response_envelope) - response = await asyncio.wait_for( - request_task, - timeout=20, - ) - - assert response and response.status == 500 and response.reason == "Server Error" - - def teardown(self): - """Teardown the test case.""" - self.loop.run_until_complete(self.http_connection.disconnect()) - self.http_connection.channel.timeout_window = self.original_timeout - - -def test_bad_api_spec(): - """Test error on apispec file is invalid.""" - with pytest.raises(FileNotFoundError): - APISpec("not_exist_file") - - -def test_apispec_verify_if_no_validator_set(): - """Test api spec ok if no spec file provided.""" - assert APISpec().verify(Mock()) - - -@pytest.mark.asyncio -class TestHTTPSServer: - """Tests for HTTPServer connection.""" - - async def request(self, method: str, path: str, **kwargs) -> ClientResponse: - """ - Make a http request. - - :param method: HTTP method: GET, POST etc - :param path: path to request on server. full url constructed automatically - - :return: http response - """ - try: - url = f"https://{self.host}:{self.port}{path}" - sslcontext = ssl.create_default_context(cafile=self.ssl_cert) - async with aiohttp.ClientSession() as session: - async with session.request( - method, url, **kwargs, ssl=sslcontext - ) as resp: - await resp.read() - return resp - except Exception: - print_exc() - raise - - def setup(self): - """Initialise the test case.""" - self.identity = Identity("name", address="my_key", public_key="my_public_key") - self.agent_address = self.identity.address - self.host = "localhost" - self.port = get_unused_tcp_port() - self.api_spec_path = os.path.join( - ROOT_DIR, "tests", "data", "petstore_sim.yaml" - ) - self.connection_id = HTTPServerConnection.connection_id - self.protocol_id = HttpMessage.protocol_id - self.target_skill_id = "some_author/some_skill:0.1.0" - self.ssl_cert = os.path.join(ROOT_DIR, "tests", "data", "certs", "server.crt") - self.ssl_key = os.path.join(ROOT_DIR, "tests", "data", "certs", "server.key") - self.configuration = ConnectionConfig( - host=self.host, - port=self.port, - target_skill_id=self.target_skill_id, - api_spec_path=self.api_spec_path, - connection_id=HTTPServerConnection.connection_id, - restricted_to_protocols={HttpMessage.protocol_id}, - ssl_cert=self.ssl_cert, - ssl_key=self.ssl_key, - ) - self.http_connection = HTTPServerConnection( - configuration=self.configuration, - data_dir=MagicMock(), - identity=self.identity, - ) - self.loop = asyncio.get_event_loop() - self.loop.run_until_complete(self.http_connection.connect()) - self.connection_address = str(HTTPServerConnection.connection_id) - self._dialogues = HttpDialogues(self.target_skill_id) - self.original_timeout = self.http_connection.channel.timeout_window - - @pytest.mark.asyncio - async def test_get_200(self): - """Test send get request w/ 200 response.""" - request_task = self.loop.create_task(self.request("get", "/pets")) - envelope = await asyncio.wait_for(self.http_connection.receive(), timeout=20) - assert envelope - incoming_message, dialogue = self._get_message_and_dialogue(envelope) - message = dialogue.reply( - target_message=incoming_message, - performative=HttpMessage.Performative.RESPONSE, - version=incoming_message.version, - status_code=200, - status_text="Success", - body=b"Response body", - ) - response_envelope = Envelope( - to=envelope.sender, - sender=envelope.to, - context=envelope.context, - message=message, - ) - await self.http_connection.send(response_envelope) - - response = await asyncio.wait_for( - request_task, - timeout=20, - ) - - assert ( - response.status == 200 - and response.reason == "Success" - and await response.text() == "Response body" - ) - - def _get_message_and_dialogue( - self, envelope: Envelope - ) -> Tuple[HttpMessage, HttpDialogue]: - message = cast(HttpMessage, envelope.message) - dialogue = cast(HttpDialogue, self._dialogues.update(message)) - assert dialogue is not None - return message, dialogue diff --git a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py deleted file mode 100644 index 7fca4dc584..0000000000 --- a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py +++ /dev/null @@ -1,473 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2022 Valory AG -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - -"""This module contains the tests of the ledger API connection module.""" -import asyncio -import logging -from typing import cast -from unittest.mock import Mock, patch - -import pytest -from aea_ledger_ethereum import ( - DEFAULT_EIP1559_STRATEGY, - DEFAULT_GAS_STATION_STRATEGY, - EthereumCrypto, -) -from aea_ledger_fetchai import FetchAICrypto - -from aea.common import Address -from aea.configurations.base import PublicId -from aea.connections.base import Connection, ConnectionStates -from aea.crypto.ledger_apis import LedgerApis -from aea.crypto.registries import make_crypto, make_ledger_api -from aea.helpers.async_utils import AsyncState -from aea.helpers.transaction.base import ( - RawTransaction, - SignedTransaction, - Terms, - TransactionDigest, - TransactionReceipt, -) -from aea.mail.base import Envelope, Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue - -from packages.fetchai.connections.ledger.connection import LedgerConnection -from packages.fetchai.connections.ledger.ledger_dispatcher import ( - LedgerApiRequestDispatcher, -) -from packages.fetchai.protocols.ledger_api.custom_types import Kwargs -from packages.fetchai.protocols.ledger_api.dialogues import LedgerApiDialogue -from packages.fetchai.protocols.ledger_api.dialogues import ( - LedgerApiDialogues as BaseLedgerApiDialogues, -) -from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage - -from tests.conftest import ( - DEFAULT_GANACHE_CHAIN_ID, - DEFAULT_MAX_FEE_PER_GAS, - DEFAULT_MAX_PRIORITY_FEE_PER_GAS, - ETHEREUM_PRIVATE_KEY_PATH, - FETCHAI_ADDRESS_ONE, - FETCHAI_TESTNET_CONFIG, -) - - -logger = logging.getLogger(__name__) - -GAS_PRICE_STRATEGIES = { - "gas_station": DEFAULT_GAS_STATION_STRATEGY, - "eip1559": DEFAULT_EIP1559_STRATEGY, -} - -ledger_ids = pytest.mark.parametrize( - "ledger_id,address", - [ - (FetchAICrypto.identifier, FETCHAI_ADDRESS_ONE), - (EthereumCrypto.identifier, EthereumCrypto(ETHEREUM_PRIVATE_KEY_PATH).address), - ], -) -gas_strategies = pytest.mark.parametrize( - "gas_strategies", - [ - {"gas_price_strategy": None}, - {"gas_price_strategy": "gas_station"}, - {"gas_price_strategy": "eip1559"}, - { - "max_fee_per_gas": DEFAULT_MAX_FEE_PER_GAS, - "max_priority_fee_per_gas": DEFAULT_MAX_PRIORITY_FEE_PER_GAS, - }, - ], -) - -SOME_SKILL_ID = "some/skill:0.1.0" - - -class LedgerApiDialogues(BaseLedgerApiDialogues): - """The dialogues class keeps track of all ledger_api dialogues.""" - - def __init__(self, self_address: Address, **kwargs) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return LedgerApiDialogue.Role.AGENT - - BaseLedgerApiDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - ) - - -@pytest.mark.integration -@pytest.mark.ledger -@pytest.mark.asyncio -@ledger_ids -async def test_get_balance( - ledger_id, - address, - ledger_apis_connection: Connection, - update_default_ethereum_ledger_api, - ethereum_testnet_config, - ganache, -): - """Test get balance.""" - import aea # noqa # to load registries - - if ledger_id == FetchAICrypto.identifier: - config = FETCHAI_TESTNET_CONFIG - else: - config = ethereum_testnet_config - - ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID) - request, ledger_api_dialogue = ledger_api_dialogues.create( - counterparty=str(ledger_apis_connection.connection_id), - performative=LedgerApiMessage.Performative.GET_BALANCE, - ledger_id=ledger_id, - address=address, - ) - envelope = Envelope( - to=request.to, - sender=request.sender, - message=request, - ) - - await ledger_apis_connection.send(envelope) - await asyncio.sleep(0.01) - response = await ledger_apis_connection.receive() - - assert response is not None - assert type(response.message) == LedgerApiMessage - response_msg = cast(LedgerApiMessage, response.message) - response_dialogue = ledger_api_dialogues.update(response_msg) - assert response_dialogue == ledger_api_dialogue - assert response_msg.performative == LedgerApiMessage.Performative.BALANCE - actual_balance_amount = response_msg.balance - expected_balance_amount = make_ledger_api(ledger_id, **config).get_balance(address) - assert actual_balance_amount == expected_balance_amount - - -@pytest.mark.integration -@pytest.mark.ledger -@pytest.mark.flaky(reruns=2, reruns_delay=5) -@pytest.mark.asyncio -@ledger_ids -async def test_get_state( - ledger_id, - address, - ledger_apis_connection: Connection, - update_default_ethereum_ledger_api, - ethereum_testnet_config, - ganache, -): - """Test get state.""" - import aea # noqa # to load registries - - if ledger_id == FetchAICrypto.identifier: - config = FETCHAI_TESTNET_CONFIG - else: - config = ethereum_testnet_config - - if "ethereum" in ledger_id: - callable_name = "get_block" - else: - callable_name = "blocks" - args = ("latest",) - kwargs = Kwargs({}) - - ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID) - request, ledger_api_dialogue = ledger_api_dialogues.create( - counterparty=str(ledger_apis_connection.connection_id), - performative=LedgerApiMessage.Performative.GET_STATE, - ledger_id=ledger_id, - callable=callable_name, - args=args, - kwargs=kwargs, - ) - envelope = Envelope( - to=request.to, - sender=request.sender, - message=request, - ) - - await ledger_apis_connection.send(envelope) - await asyncio.sleep(0.01) - response = await ledger_apis_connection.receive() - - assert response is not None - assert type(response.message) == LedgerApiMessage - response_msg = cast(LedgerApiMessage, response.message) - response_dialogue = ledger_api_dialogues.update(response_msg) - assert response_dialogue == ledger_api_dialogue - - assert ( - response_msg.performative == LedgerApiMessage.Performative.STATE - ), response_msg - actual_block = response_msg.state.body - expected_block = make_ledger_api(ledger_id, **config).get_state( - callable_name, *args - ) - assert actual_block == expected_block - - -@pytest.mark.integration -@pytest.mark.ledger -@pytest.mark.asyncio -@gas_strategies -async def test_send_signed_transaction_ethereum( - gas_strategies, - ledger_apis_connection: Connection, - update_default_ethereum_ledger_api, - ganache, -): - """Test send signed transaction with Ethereum APIs.""" - import aea # noqa # to load registries - - crypto1 = make_crypto( - EthereumCrypto.identifier, private_key_path=ETHEREUM_PRIVATE_KEY_PATH - ) - crypto2 = make_crypto(EthereumCrypto.identifier) - ledger_api_dialogues = LedgerApiDialogues(SOME_SKILL_ID) - - amount = 40000 - fee = 30000 - - request, ledger_api_dialogue = ledger_api_dialogues.create( - counterparty=str(ledger_apis_connection.connection_id), - performative=LedgerApiMessage.Performative.GET_RAW_TRANSACTION, - terms=Terms( - ledger_id=EthereumCrypto.identifier, - sender_address=crypto1.address, - counterparty_address=crypto2.address, - amount_by_currency_id={"ETH": -amount}, - quantities_by_good_id={"some_service_id": 1}, - is_sender_payable_tx_fee=True, - nonce="", - fee_by_currency_id={"ETH": fee}, - chain_id=DEFAULT_GANACHE_CHAIN_ID, - **gas_strategies, - ), - ) - request = cast(LedgerApiMessage, request) - envelope = Envelope( - to=request.to, - sender=request.sender, - message=request, - ) - await ledger_apis_connection.send(envelope) - await asyncio.sleep(0.01) - response = await ledger_apis_connection.receive() - - assert response is not None - assert type(response.message) == LedgerApiMessage - response_message = cast(LedgerApiMessage, response.message) - assert ( - response_message.performative == LedgerApiMessage.Performative.RAW_TRANSACTION - ) - response_dialogue = ledger_api_dialogues.update(response_message) - assert response_dialogue == ledger_api_dialogue - assert type(response_message.raw_transaction) == RawTransaction - assert response_message.raw_transaction.ledger_id == request.terms.ledger_id - - signed_transaction = crypto1.sign_transaction(response_message.raw_transaction.body) - request = cast( - LedgerApiMessage, - ledger_api_dialogue.reply( - performative=LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION, - target_message=response_message, - signed_transaction=SignedTransaction( - EthereumCrypto.identifier, signed_transaction - ), - ), - ) - envelope = Envelope( - to=request.to, - sender=request.sender, - message=request, - ) - await ledger_apis_connection.send(envelope) - await asyncio.sleep(0.01) - response = await ledger_apis_connection.receive() - - assert response is not None - assert type(response.message) == LedgerApiMessage - response_message = cast(LedgerApiMessage, response.message) - assert ( - response_message.performative != LedgerApiMessage.Performative.ERROR - ), f"Received error: {response_message.message}" - assert ( - response_message.performative - == LedgerApiMessage.Performative.TRANSACTION_DIGEST - ) - response_dialogue = ledger_api_dialogues.update(response_message) - assert response_dialogue == ledger_api_dialogue - assert type(response_message.transaction_digest) == TransactionDigest - assert type(response_message.transaction_digest.body) == str - assert ( - response_message.transaction_digest.ledger_id - == request.signed_transaction.ledger_id - ) - assert type(response_message.transaction_digest.body.startswith("0x")) - - request = cast( - LedgerApiMessage, - ledger_api_dialogue.reply( - performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT, - target_message=response_message, - transaction_digest=response_message.transaction_digest, - ), - ) - envelope = Envelope( - to=request.to, - sender=request.sender, - message=request, - ) - await ledger_apis_connection.send(envelope) - await asyncio.sleep(0.01) - response = await ledger_apis_connection.receive() - - assert response is not None - assert type(response.message) == LedgerApiMessage - response_message = cast(LedgerApiMessage, response.message) - assert ( - response_message.performative - == LedgerApiMessage.Performative.TRANSACTION_RECEIPT - ) - response_dialogue = ledger_api_dialogues.update(response_message) - assert response_dialogue == ledger_api_dialogue - assert type(response_message.transaction_receipt) == TransactionReceipt - assert response_message.transaction_receipt.receipt is not None - assert response_message.transaction_receipt.transaction is not None - assert ( - response_message.transaction_receipt.ledger_id - == request.transaction_digest.ledger_id - ) - assert LedgerApis.is_transaction_settled( - response_message.transaction_receipt.ledger_id, - response_message.transaction_receipt.receipt, - ), "Transaction not settled." - - -@pytest.mark.asyncio -async def test_unsupported_protocol(ledger_apis_connection: LedgerConnection): - """Test fail on protocol not supported.""" - envelope = Envelope( - to=str(ledger_apis_connection.connection_id), - sender="test/skill:0.1.0", - protocol_specification_id=PublicId.from_str("author/package_name:0.1.0"), - message=b"message", - ) - with pytest.raises(ValueError): - ledger_apis_connection._schedule_request(envelope) - - -@pytest.mark.asyncio -async def test_new_message_wait_flag(ledger_apis_connection: LedgerConnection): - """Test wait for new message.""" - task = asyncio.ensure_future(ledger_apis_connection.receive()) - await asyncio.sleep(0.1) - assert not task.done() - task.cancel() - - -@pytest.mark.asyncio -async def test_no_balance(): - """Test no balance.""" - dispatcher = LedgerApiRequestDispatcher(AsyncState()) - mock_api = Mock() - message = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_BALANCE, - dialogue_reference=dispatcher.dialogues.new_self_initiated_dialogue_reference(), - ledger_id=EthereumCrypto.identifier, - address="test", - ) - message.to = dispatcher.dialogues.self_address - message.sender = "test" - dialogue = dispatcher.dialogues.update(message) - assert dialogue is not None - mock_api.get_balance.return_value = None - msg = dispatcher.get_balance(mock_api, message, dialogue) - - assert msg.performative == LedgerApiMessage.Performative.ERROR - - -@pytest.mark.asyncio -async def test_no_raw_tx(): - """Test no raw tx returned.""" - dispatcher = LedgerApiRequestDispatcher(AsyncState()) - mock_api = Mock() - message = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_RAW_TRANSACTION, - dialogue_reference=dispatcher.dialogues.new_self_initiated_dialogue_reference(), - terms=Terms( - ledger_id=EthereumCrypto.identifier, - sender_address="1111", - counterparty_address="22222", - amount_by_currency_id={"ETH": -1}, - quantities_by_good_id={"some_service_id": 1}, - is_sender_payable_tx_fee=True, - nonce="", - fee_by_currency_id={"ETH": 10}, - chain_id=3, - ), - ) - message.to = dispatcher.dialogues.self_address - message.sender = "test" - dialogue = dispatcher.dialogues.update(message) - assert dialogue is not None - mock_api.get_transfer_transaction.return_value = None - msg = dispatcher.get_raw_transaction(mock_api, message, dialogue) - - assert msg.performative == LedgerApiMessage.Performative.ERROR - - -@pytest.mark.asyncio -async def test_attempts_get_transaction_receipt(): - """Test retry and sleep.""" - dispatcher = LedgerApiRequestDispatcher(AsyncState(ConnectionStates.connected)) - mock_api = Mock() - message = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT, - dialogue_reference=dispatcher.dialogues.new_self_initiated_dialogue_reference(), - transaction_digest=TransactionDigest("asdad", "sdfdsf"), - ) - message.to = dispatcher.dialogues.self_address - message.sender = "test" - dialogue = dispatcher.dialogues.update(message) - assert dialogue is not None - mock_api.get_transaction.return_value = None - mock_api.is_transaction_settled.return_value = True - with patch.object(dispatcher, "MAX_ATTEMPTS", 2): - with patch.object(dispatcher, "TIMEOUT", 0.001): - msg = dispatcher.get_transaction_receipt(mock_api, message, dialogue) - - assert msg.performative == LedgerApiMessage.Performative.ERROR diff --git a/tests/test_packages/test_connections/test_local/__init__.py b/tests/test_packages/test_connections/test_local/__init__.py deleted file mode 100644 index af4a4fc07b..0000000000 --- a/tests/test_packages/test_connections/test_local/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the local OEF node implementation.""" diff --git a/tests/test_packages/test_connections/test_local/test_misc.py b/tests/test_packages/test_connections/test_local/test_misc.py deleted file mode 100644 index 14ffd9d97e..0000000000 --- a/tests/test_packages/test_connections/test_local/test_misc.py +++ /dev/null @@ -1,249 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the local OEF node implementation.""" -import asyncio -import unittest.mock - -import pytest - -from aea.helpers.search.models import Constraint, ConstraintType, Description, Query -from aea.mail.base import Envelope -from aea.multiplexer import Multiplexer - -from packages.fetchai.connections.local.connection import LocalNode -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.protocols.fipa.message import FipaMessage - -from tests.conftest import _make_local_connection - - -def test_connection(): - """Test that two OEF local connection can connect to a local node.""" - with LocalNode() as node: - - multiplexer1 = Multiplexer( - [_make_local_connection("multiplexer1", "my_public_key_1", node)] - ) - multiplexer2 = Multiplexer( - [_make_local_connection("multiplexer2", "my_public_key_2", node)] - ) - - multiplexer1.connect() - multiplexer2.connect() - - multiplexer1.disconnect() - multiplexer2.disconnect() - - -@pytest.mark.asyncio -async def test_connection_twice_return_none(): - """Test that connecting twice works.""" - with LocalNode() as node: - address = "address" - public_key = "public_key" - connection = _make_local_connection(address, public_key, node) - await connection.connect() - await node.connect(address, connection._reader) - message = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - expected_envelope = Envelope( - to=address, - sender=address, - message=message, - ) - await connection.send(expected_envelope) - actual_envelope = await connection.receive() - - assert expected_envelope == actual_envelope - - await connection.disconnect() - - -@pytest.mark.asyncio -async def test_receiving_when_not_connected_raise_exception(): - """Test that when we try to receive an envelope from a not connected connection we raise exception.""" - with LocalNode() as node: - with pytest.raises(ConnectionError): - address = "address" - public_key = "public_key" - connection = _make_local_connection(address, public_key, node) - await connection.receive() - - -@pytest.mark.asyncio -async def test_receiving_returns_none_when_error_occurs(): - """Test that when we try to receive an envelope and an error occurs we return None.""" - with LocalNode() as node: - address = "address" - public_key = "public_key" - connection = _make_local_connection(address, public_key, node) - await connection.connect() - - with unittest.mock.patch.object( - connection._reader, "get", side_effect=Exception - ): - result = await connection.receive() - assert result is None - - await connection.disconnect() - - -def test_communication(): - """Test that two multiplexer can communicate through the node.""" - with LocalNode() as node: - - multiplexer1 = Multiplexer( - [_make_local_connection("multiplexer1", "multiplexer1_public_key", node)] - ) - multiplexer2 = Multiplexer( - [_make_local_connection("multiplexer2", "multiplexer1_public_key", node)] - ) - - multiplexer1.connect() - multiplexer2.connect() - - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - envelope = Envelope( - to="multiplexer2", - sender="multiplexer1", - message=msg, - ) - multiplexer1.put(envelope) - - msg = FipaMessage( - performative=FipaMessage.Performative.CFP, - dialogue_reference=(str(0), ""), - message_id=1, - target=0, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - envelope = Envelope( - to="multiplexer2", - sender="multiplexer1", - message=msg, - ) - multiplexer1.put(envelope) - - msg = FipaMessage( - performative=FipaMessage.Performative.PROPOSE, - dialogue_reference=(str(0), ""), - message_id=2, - target=1, - proposal=Description({}), - ) - - envelope = Envelope( - to="multiplexer2", - sender="multiplexer1", - message=msg, - ) - multiplexer1.put(envelope) - - msg = FipaMessage( - performative=FipaMessage.Performative.ACCEPT, - dialogue_reference=(str(0), ""), - message_id=1, - target=0, - ) - envelope = Envelope( - to="multiplexer2", - sender="multiplexer1", - message=msg, - ) - multiplexer1.put(envelope) - - msg = FipaMessage( - performative=FipaMessage.Performative.DECLINE, - dialogue_reference=(str(0), ""), - message_id=1, - target=0, - ) - envelope = Envelope( - to="multiplexer2", - sender="multiplexer1", - message=msg, - ) - multiplexer1.put(envelope) - - envelope = multiplexer2.get(block=True, timeout=1.0) - msg = envelope.message - assert ( - envelope.protocol_specification_id - == DefaultMessage.protocol_specification_id - ) - assert msg.content == b"hello" - envelope = multiplexer2.get(block=True, timeout=1.0) - msg = envelope.message - assert ( - envelope.protocol_specification_id == FipaMessage.protocol_specification_id - ) - assert msg.performative == FipaMessage.Performative.CFP - envelope = multiplexer2.get(block=True, timeout=1.0) - msg = envelope.message - assert ( - envelope.protocol_specification_id == FipaMessage.protocol_specification_id - ) - assert msg.performative == FipaMessage.Performative.PROPOSE - envelope = multiplexer2.get(block=True, timeout=1.0) - msg = envelope.message - assert ( - envelope.protocol_specification_id == FipaMessage.protocol_specification_id - ) - assert msg.performative == FipaMessage.Performative.ACCEPT - envelope = multiplexer2.get(block=True, timeout=1.0) - msg = envelope.message - assert ( - envelope.protocol_specification_id == FipaMessage.protocol_specification_id - ) - assert msg.performative == FipaMessage.Performative.DECLINE - multiplexer1.disconnect() - multiplexer2.disconnect() - - -@pytest.mark.asyncio -async def test_connecting_to_node_with_same_key(): - """Test that connecting twice with the same key works correctly.""" - with LocalNode() as node: - address = "my_address" - my_queue = asyncio.Queue() - - ret = await node.connect(address, my_queue) - assert ret is not None and isinstance(ret, asyncio.Queue) - ret = await node.connect(address, my_queue) - assert ret is None - - -def test_stop_before_start(): - """Test stop called before start.""" - node = LocalNode() - with pytest.raises(ValueError, match="Connection not started!"): - node.stop() diff --git a/tests/test_packages/test_connections/test_local/test_search_services.py b/tests/test_packages/test_connections/test_local/test_search_services.py deleted file mode 100644 index b3beda85f9..0000000000 --- a/tests/test_packages/test_connections/test_local/test_search_services.py +++ /dev/null @@ -1,650 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests for the search feature of the local OEF node.""" -import unittest.mock -from typing import cast - -import pytest - -from aea.common import Address -from aea.helpers.search.models import ( - Attribute, - Constraint, - ConstraintType, - DataModel, - Description, - Query, -) -from aea.mail.base import Envelope, EnvelopeContext, Message -from aea.multiplexer import InBox, Multiplexer -from aea.protocols.dialogue.base import Dialogue as BaseDialogue - -from packages.fetchai.connections.local.connection import ( - LocalNode, - OEFLocalConnection, - OEF_LOCAL_NODE_ADDRESS, - OEF_LOCAL_NODE_SEARCH_ADDRESS, -) -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues -from packages.fetchai.protocols.fipa.message import FipaMessage -from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue -from packages.fetchai.protocols.oef_search.dialogues import ( - OefSearchDialogues as BaseOefSearchDialogues, -) -from packages.fetchai.protocols.oef_search.message import OefSearchMessage - -from tests.common.mocks import AnyStringWith -from tests.common.utils import wait_for_condition -from tests.conftest import MAX_FLAKY_RERUNS, _make_local_connection - - -class OefSearchDialogues(BaseOefSearchDialogues): - """The dialogues class keeps track of all http dialogues.""" - - def __init__(self, self_address: Address, **kwargs) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return OefSearchDialogue.Role.AGENT - - BaseOefSearchDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - ) - - -class TestNoValidDialogue: - """Test that the search request returns an empty search result.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.node = LocalNode() - cls.node.start() - - cls.address_1 = "address_1" - cls.public_key_1 = "public_key_1" - cls.connection = _make_local_connection( - cls.address_1, - cls.public_key_1, - cls.node, - ) - cls.multiplexer = Multiplexer([cls.connection]) - - cls.multiplexer.connect() - cls.dialogues = OefSearchDialogues(cls.address_1) - - @pytest.mark.asyncio - async def test_wrong_dialogue(self): - """Test that at the beginning, the search request returns an empty search result.""" - query = Query( - constraints=[Constraint("foo", ConstraintType("==", 1))], model=None - ) - - # build and send the request - search_services_request = OefSearchMessage( - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - message_id=2, - target=1, - dialogue_reference=self.dialogues.new_self_initiated_dialogue_reference(), - query=query, - ) - search_services_request.to = OEF_LOCAL_NODE_SEARCH_ADDRESS - - # the incorrect message cannot be sent into a dialogue, so this is omitted. - - search_services_request.sender = self.address_1 - envelope = Envelope( - to=search_services_request.to, - sender=search_services_request.sender, - message=search_services_request, - ) - with unittest.mock.patch.object( - self.node, "_handle_oef_message", side_effect=self.node._handle_oef_message - ) as mock_handle: - with unittest.mock.patch.object(self.node.logger, "warning") as mock_logger: - self.multiplexer.put(envelope) - wait_for_condition(lambda: mock_handle.called, timeout=1.0) - mock_logger.assert_any_call( - AnyStringWith("Could not create dialogue for message=") - ) - - @classmethod - def teardown_class(cls): - """Teardown the test.""" - cls.multiplexer.disconnect() - cls.node.stop() - - -class TestEmptySearch: - """Test that the search request returns an empty search result.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.node = LocalNode() - cls.node.start() - - cls.address_1 = "address_1" - cls.public_key_1 = "public_key_1" - cls.multiplexer = Multiplexer( - [ - _make_local_connection( - cls.address_1, - cls.public_key_1, - cls.node, - ) - ] - ) - - cls.multiplexer.connect() - cls.dialogues = OefSearchDialogues(cls.address_1) - - def test_empty_search_result(self): - """Test that at the beginning, the search request returns an empty search result.""" - search_services_request, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=Query(constraints=[], model=None), - ) - envelope = Envelope( - to=search_services_request.to, - sender=search_services_request.sender, - message=search_services_request, - ) - self.multiplexer.put(envelope) - - # check the result - response_envelope = self.multiplexer.get(block=True, timeout=2.0) - assert ( - response_envelope.protocol_specification_id - == OefSearchMessage.protocol_specification_id - ) - search_result = cast(OefSearchMessage, response_envelope.message) - response_dialogue = self.dialogues.update(search_result) - assert response_dialogue == sending_dialogue - assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT - assert search_result.agents == () - - @classmethod - def teardown_class(cls): - """Teardown the test.""" - cls.multiplexer.disconnect() - cls.node.stop() - - -class TestSimpleSearchResult: - """Test that a simple search result return the expected result.""" - - def setup(self): - """Set up the test.""" - self.node = LocalNode() - self.node.start() - - self.address_1 = "address" - self.public_key_1 = "public_key_1" - self.multiplexer = Multiplexer( - [ - _make_local_connection( - self.address_1, - self.public_key_1, - self.node, - ) - ] - ) - - self.multiplexer.connect() - - # register a service. - self.dialogues = OefSearchDialogues(self.address_1) - self.data_model = DataModel( - "foobar", - attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], - ) - service_description = Description( - {"foo": 1, "bar": "baz"}, data_model=self.data_model - ) - register_service_request, self.sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=register_service_request.to, - sender=register_service_request.sender, - message=register_service_request, - ) - self.multiplexer.put(envelope) - - @pytest.mark.flaky( - reruns=MAX_FLAKY_RERUNS - ) # TODO: check reasons!. quite unstable test - def test_not_empty_search_result(self): - """Test that the search result contains one entry after a successful registration.""" - # build and send the request - search_services_request, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=Query(constraints=[], model=self.data_model), - ) - envelope = Envelope( - to=search_services_request.to, - sender=search_services_request.sender, - message=search_services_request, - ) - self.multiplexer.put(envelope) - - # check the result - response_envelope = self.multiplexer.get(block=True, timeout=2.0) - assert ( - response_envelope.protocol_specification_id - == OefSearchMessage.protocol_specification_id - ) - search_result = cast(OefSearchMessage, response_envelope.message) - response_dialogue = self.dialogues.update(search_result) - assert response_dialogue == sending_dialogue - assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT - assert search_result.agents == (self.address_1,) - - def teardown(self): - """Teardown the test.""" - self.multiplexer.disconnect() - self.node.stop() - - -class TestUnregister: - """Test that the unregister service results to Error Message.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.node = LocalNode() - cls.node.start() - - cls.address_1 = "address_1" - cls.public_key_1 = "public_key_1" - cls.multiplexer1 = Multiplexer( - [ - _make_local_connection( - cls.address_1, - cls.public_key_1, - cls.node, - ) - ] - ) - cls.address_2 = "address_2" - cls.public_key_2 = "public_key_2" - cls.multiplexer2 = Multiplexer( - [ - _make_local_connection( - cls.address_2, - cls.public_key_2, - cls.node, - ) - ] - ) - cls.multiplexer1.connect() - cls.multiplexer2.connect() - cls.dialogues = OefSearchDialogues(cls.address_1) - - def test_unregister_service_result(self): - """Test that at the beginning, the search request returns an empty search result.""" - data_model = DataModel( - "foobar", - attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], - ) - service_description = Description( - {"foo": 1, "bar": "baz"}, data_model=data_model - ) - msg, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - self.multiplexer1.put(envelope) - - # check the result - response_envelope = self.multiplexer1.get(block=True, timeout=5.0) - assert ( - response_envelope.protocol_specification_id - == OefSearchMessage.protocol_specification_id - ) - response = cast(OefSearchMessage, response_envelope.message) - response_dialogue = self.dialogues.update(response) - assert response_dialogue == sending_dialogue - assert response.performative == OefSearchMessage.Performative.OEF_ERROR - - msg, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - self.multiplexer1.put(envelope) - - # Search for the registered service - msg, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=Query([Constraint("foo", ConstraintType("==", 1))]), - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - self.multiplexer1.put(envelope) - # check the result - response_envelope = self.multiplexer1.get(block=True, timeout=5.0) - search_result = cast(OefSearchMessage, response_envelope.message) - response_dialogue = self.dialogues.update(search_result) - assert response_dialogue == sending_dialogue - assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT - assert len(search_result.agents) == 1 - - # unregister the service - msg, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - self.multiplexer1.put(envelope) - - # the same query returns empty - # Search for the register agent - msg, sending_dialogue = self.dialogues.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=Query([Constraint("foo", ConstraintType("==", 1))]), - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - self.multiplexer1.put(envelope) - # check the result - response_envelope = self.multiplexer1.get(block=True, timeout=5.0) - search_result = cast(OefSearchMessage, response_envelope.message) - response_dialogue = self.dialogues.update(search_result) - assert response_dialogue == sending_dialogue - assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT - assert search_result.agents == () - - @classmethod - def teardown_class(cls): - """Teardown the test.""" - cls.multiplexer1.disconnect() - cls.multiplexer2.disconnect() - cls.node.stop() - - -class TestAgentMessage: - """Test the the OEF will return Dialogue Error if it doesn't know the agent address.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.node = LocalNode() - cls.node.start() - - cls.address_1 = "address_1" - cls.public_key_1 = "public_key_1" - cls.multiplexer1 = Multiplexer( - [ - _make_local_connection( - cls.address_1, - cls.public_key_1, - cls.node, - ) - ] - ) - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return FipaDialogue.Role.SELLER - - cls.dialogues = FipaDialogues(cls.address_1, role_from_first_message) - - @pytest.mark.asyncio - async def test_messages(self): - """Test that at the beginning, the search request returns an empty search result.""" - msg, sending_dialogue = self.dialogues.create( - counterparty="some_agent", - performative=FipaMessage.Performative.CFP, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - with pytest.raises(ConnectionError): - await _make_local_connection( - self.address_1, - self.public_key_1, - self.node, - ).send(envelope) - - self.multiplexer1.connect() - msg, sending_dialogue = self.dialogues.create( - counterparty="this_address_does_not_exist", - performative=FipaMessage.Performative.CFP, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - ) - self.multiplexer1.put(envelope) - - # check the result - response_envelope = self.multiplexer1.get(block=True, timeout=5.0) - assert ( - response_envelope.protocol_specification_id - == DefaultMessage.protocol_specification_id - ) - assert response_envelope.sender == OEF_LOCAL_NODE_ADDRESS - result = response_envelope.message - assert result.performative == DefaultMessage.Performative.ERROR - - @classmethod - def teardown_class(cls): - """Teardown the test.""" - cls.multiplexer1.disconnect() - cls.node.stop() - - -class TestFilteredSearchResult: - """Test that the query system of the search gives the expected result.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.node = LocalNode() - cls.node.start() - - cls.address_1 = "multiplexer1" - cls.public_key_1 = "public_key_1" - cls.address_2 = "multiplexer2" - cls.public_key_2 = "public_key_2" - cls.multiplexer1 = Multiplexer( - [ - _make_local_connection( - cls.address_1, - cls.public_key_1, - cls.node, - ) - ] - ) - cls.multiplexer2 = Multiplexer( - [ - _make_local_connection( - cls.address_2, - cls.public_key_2, - cls.node, - ) - ] - ) - cls.multiplexer1.connect() - cls.multiplexer2.connect() - cls.dialogues1 = OefSearchDialogues(cls.address_1) - cls.dialogues2 = OefSearchDialogues(cls.address_2) - - # register 'multiplexer1' as a service 'foobar'. - cls.data_model_foobar = DataModel( - "foobar", - attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], - ) - service_description = Description( - {"foo": 1, "bar": "baz"}, data_model=cls.data_model_foobar - ) - register_service_request, sending_dialogue = cls.dialogues1.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=register_service_request.to, - sender=register_service_request.sender, - message=register_service_request, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - cls.multiplexer1.put(envelope) - wait_for_condition(lambda: len(cls.node.services) == 1, timeout=10) - - # register 'multiplexer2' as a service 'barfoo'. - cls.data_model_barfoo = DataModel( - "barfoo", - attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], - ) - service_description = Description( - {"foo": 1, "bar": "baz"}, data_model=cls.data_model_barfoo - ) - register_service_request, sending_dialogue = cls.dialogues2.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=register_service_request.to, - sender=register_service_request.sender, - message=register_service_request, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - - cls.multiplexer2.put(envelope) - wait_for_condition(lambda: len(cls.node.services) == 2, timeout=10) - - # unregister multiplexer1 - data_model = DataModel( - "foobar", - attributes=[Attribute("foo", int, True), Attribute("bar", str, True)], - ) - service_description = Description( - {"foo": 1, "bar": "baz"}, data_model=data_model - ) - msg, sending_dialogue = cls.dialogues1.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, - service_description=service_description, - ) - envelope = Envelope( - to=msg.to, - sender=msg.sender, - message=msg, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - cls.multiplexer1.put(envelope) - # ensure one service stays registered - wait_for_condition(lambda: len(cls.node.services) == 1, timeout=10) - - def test_filtered_search_result(self): - """Test that the search result contains only the entries matching the query.""" - # build and send the request - search_services_request, sending_dialogue = self.dialogues1.create( - counterparty=OEF_LOCAL_NODE_SEARCH_ADDRESS, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=Query(constraints=[], model=self.data_model_barfoo), - ) - envelope = Envelope( - to=search_services_request.to, - sender=search_services_request.sender, - message=search_services_request, - context=EnvelopeContext(connection_id=OEFLocalConnection.connection_id), - ) - self.multiplexer1.put(envelope) - - # check the result - response_envelope = InBox(self.multiplexer1).get(block=True, timeout=5.0) - search_result = cast(OefSearchMessage, response_envelope.message) - response_dialogue = self.dialogues1.update(search_result) - assert response_dialogue == sending_dialogue - assert search_result.performative == OefSearchMessage.Performative.SEARCH_RESULT - assert search_result.agents == (self.address_2,), self.node.services - - @classmethod - def teardown_class(cls): - """Teardown the test.""" - cls.multiplexer1.disconnect() - cls.multiplexer2.disconnect() - cls.node.stop() diff --git a/tests/test_packages/test_connections/test_stub/__init__.py b/tests/test_packages/test_connections/test_stub/__init__.py deleted file mode 100644 index 556ec04c96..0000000000 --- a/tests/test_packages/test_connections/test_stub/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the stub connection implementation.""" diff --git a/tests/test_packages/test_connections/test_stub/test_stub.py b/tests/test_packages/test_connections/test_stub/test_stub.py deleted file mode 100644 index 9b548d1ace..0000000000 --- a/tests/test_packages/test_connections/test_stub/test_stub.py +++ /dev/null @@ -1,413 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This test module contains the tests for the stub connection.""" -import asyncio -import base64 -import os -import shutil -import tempfile -import time -from pathlib import Path -from unittest import mock - -import pytest - -from aea.configurations.base import PublicId -from aea.crypto.wallet import CryptoStore -from aea.helpers.file_io import write_with_lock -from aea.identity.base import Identity -from aea.mail.base import Envelope -from aea.multiplexer import Multiplexer - -from packages.fetchai.connections.stub.connection import ( - StubConnection, - envelope_from_bytes, - lock_file, - write_envelope, -) -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.protocols.oef_search.message import OefSearchMessage - -from tests.conftest import MAX_FLAKY_RERUNS, ROOT_DIR, _make_stub_connection - - -SEPARATOR = "," - - -def make_test_envelope() -> Envelope: - """Create a test envelope.""" - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - msg.to = "any" - envelope = Envelope( - to="any", - sender="any", - message=msg, - ) - return envelope - - -class TestStubConnectionReception: - """Test that the stub connection is implemented correctly.""" - - def setup(self): - """Set the test up.""" - self.cwd = os.getcwd() - self.tmpdir = Path(tempfile.mkdtemp()) - d = self.tmpdir / "test_stub" - d.mkdir(parents=True) - self.input_file_path = d / "input_file.csv" - self.output_file_path = d / "output_file.csv" - self.connection = _make_stub_connection( - self.input_file_path, self.output_file_path - ) - - self.multiplexer = Multiplexer([self.connection]) - self.multiplexer.connect() - os.chdir(self.tmpdir) - - def test_reception_a(self): - """Test that the connection receives what has been enqueued in the input file.""" - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - expected_envelope = Envelope( - to="any", - sender="anys", - message=msg, - ) - - with open(self.input_file_path, "ab+") as f: - write_envelope(expected_envelope, f) - - actual_envelope = self.multiplexer.get(block=True, timeout=3.0) - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - msg = DefaultMessage.serializer.decode(actual_envelope.message) - msg.to = actual_envelope.to - msg.sender = actual_envelope.sender - assert expected_envelope.message == msg - - def test_reception_b(self): - """Test that the connection receives what has been enqueued in the input file.""" - # a message containing delimiters and newline characters - msg = b"\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468d\n,\nB8Ab795\n\n49B49C88DC991990E7910891,,dbd\n" - protocol_specification_id = PublicId.from_str("some_author/some_name:0.1.0") - encoded_envelope = "{}{}{}{}{}{}{}{}".format( - "any", - SEPARATOR, - "any", - SEPARATOR, - protocol_specification_id, - SEPARATOR, - msg.decode("utf-8"), - SEPARATOR, - ) - encoded_envelope = encoded_envelope.encode("utf-8") - - with open(self.input_file_path, "ab+") as f: - write_with_lock(f, encoded_envelope) - - actual_envelope = self.multiplexer.get(block=True, timeout=3.0) - assert "any" == actual_envelope.to - assert "any" == actual_envelope.sender - assert protocol_specification_id == actual_envelope.protocol_specification_id - assert msg == actual_envelope.message - - def test_reception_c(self): - """Test that the connection receives what has been enqueued in the input file.""" - encoded_envelope = b"0x5E22777dD831A459535AA4306AceC9cb22eC4cB5,default_oef,fetchai/oef_search:1.0.0,\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd," - expected_envelope = Envelope( - to="0x5E22777dD831A459535AA4306AceC9cb22eC4cB5", - sender="default_oef", - protocol_specification_id=OefSearchMessage.protocol_specification_id, - message=b"\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd", - ) - with open(self.input_file_path, "ab+") as f: - write_with_lock(f, encoded_envelope) - - actual_envelope = self.multiplexer.get(block=True, timeout=3.0) - assert expected_envelope == actual_envelope - - def teardown(self): - """Tear down the test.""" - os.chdir(self.cwd) - try: - shutil.rmtree(self.tmpdir) - except (OSError, IOError): - pass - self.multiplexer.disconnect() - - -class TestStubConnectionSending: - """Test that the stub connection is implemented correctly.""" - - @classmethod - def setup_class(cls): - """Set the test up.""" - cls.cwd = os.getcwd() - cls.tmpdir = Path(tempfile.mkdtemp()) - d = cls.tmpdir / "test_stub" - d.mkdir(parents=True) - cls.input_file_path = d / "input_file.csv" - cls.output_file_path = d / "output_file.csv" - cls.connection = _make_stub_connection( - cls.input_file_path, cls.output_file_path - ) - - cls.multiplexer = Multiplexer([cls.connection]) - cls.multiplexer.connect() - os.chdir(cls.tmpdir) - - def test_connection_is_established(self): - """Test the stub connection is established and then bad formatted messages.""" - assert self.connection.is_connected - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - encoded_envelope = "{}{}{}{}{}{}{}{}".format( - "any", - SEPARATOR, - "any", - SEPARATOR, - DefaultMessage.protocol_specification_id, - SEPARATOR, - DefaultMessage.serializer.encode(msg).decode("utf-8"), - SEPARATOR, - ) - encoded_envelope = base64.b64encode(encoded_envelope.encode("utf-8")) - envelope = envelope_from_bytes(encoded_envelope) - if envelope is not None: - self.connection._put_envelopes([envelope]) - - assert ( - self.connection.in_queue.empty() - ), "The inbox must be empty due to bad encoded message" - - def test_send_message(self): - """Test that the messages in the outbox are posted on the output file.""" - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - expected_envelope = Envelope( - to="any", - sender="anys", - message=msg, - ) - - self.multiplexer.put(expected_envelope) - time.sleep(0.1) - - with open(self.output_file_path, "rb+") as f: - lines = f.readlines() - - assert len(lines) == 2 - line = lines[0] + lines[1] - to, sender, protocol_specification_id, message, end = line.strip().split( - "{}".format(SEPARATOR).encode("utf-8"), maxsplit=4 - ) - to = to.decode("utf-8") - sender = sender.decode("utf-8") - protocol_specification_id = PublicId.from_str( - protocol_specification_id.decode("utf-8") - ) - assert end in [b"", b"\n"] - - actual_envelope = Envelope( - to=to, - sender=sender, - protocol_specification_id=protocol_specification_id, - message=message, - ) - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - msg = DefaultMessage.serializer.decode(actual_envelope.message) - msg.to = actual_envelope.to - msg.sender = actual_envelope.sender - assert expected_envelope.message == msg - - @classmethod - def teardown_class(cls): - """Tear down the test.""" - os.chdir(cls.cwd) - try: - shutil.rmtree(cls.tmpdir) - except (OSError, IOError): - pass - cls.multiplexer.disconnect() - - -@pytest.mark.asyncio -async def test_disconnection_when_already_disconnected(): - """Test the case when disconnecting a connection already disconnected.""" - tmpdir = Path(tempfile.mkdtemp()) - d = tmpdir / "test_stub" - d.mkdir(parents=True) - input_file_path = d / "input_file.csv" - output_file_path = d / "output_file.csv" - connection = _make_stub_connection(input_file_path, output_file_path) - - assert not connection.is_connected - await connection.disconnect() - assert not connection.is_connected - - -@pytest.mark.asyncio -async def test_connection_when_already_connected(): - """Test the case when connecting a connection already connected.""" - tmpdir = Path(tempfile.mkdtemp()) - d = tmpdir / "test_stub" - d.mkdir(parents=True) - input_file_path = d / "input_file.csv" - output_file_path = d / "output_file.csv" - connection = _make_stub_connection(input_file_path, output_file_path) - - assert not connection.is_connected - await connection.connect() - assert connection.is_connected - await connection.connect() - assert connection.is_connected - - await connection.disconnect() - - -@pytest.mark.asyncio -async def test_receiving_returns_none_when_error_occurs(): - """Test that when we try to receive an envelope and an error occurs we return None.""" - tmpdir = Path(tempfile.mkdtemp()) - d = tmpdir / "test_stub" - d.mkdir(parents=True) - input_file_path = d / "input_file.csv" - output_file_path = d / "output_file.csv" - connection = _make_stub_connection(input_file_path, output_file_path) - - await connection.connect() - with mock.patch.object(connection.in_queue, "get", side_effect=Exception): - ret = await connection.receive() - assert ret is None - - await connection.disconnect() - - -@pytest.mark.asyncio -async def test_multiple_envelopes(): - """Test many envelopes received.""" - tmpdir = Path(tempfile.mkdtemp()) - d = tmpdir / "test_stub" - d.mkdir(parents=True) - input_file_path = d / "input_file.csv" - output_file_path = d / "output_file.csv" - connection = _make_stub_connection(input_file_path, output_file_path) - - num_envelopes = 5 - await connection.connect() - assert connection.is_connected - - async def wait_num(num): - for _ in range(num): - assert await connection.receive() - - task = asyncio.get_event_loop().create_task(wait_num(num_envelopes)) - - with open(input_file_path, "ab+") as f: - for _ in range(num_envelopes): - write_envelope(make_test_envelope(), f) - await asyncio.sleep(0.01) # spin asyncio loop - - await asyncio.wait_for(task, timeout=3) - await connection.disconnect() - - -@pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) -@pytest.mark.asyncio -async def test_bad_envelope(): - """Test bad format envelop.""" - tmpdir = Path(tempfile.mkdtemp()) - d = tmpdir / "test_stub" - d.mkdir(parents=True) - input_file_path = d / "input_file.csv" - output_file_path = d / "output_file.csv" - connection = _make_stub_connection(input_file_path, output_file_path) - - await connection.connect() - - with open(input_file_path, "ab+") as f: - f.write(b"1,2,3,4,5,") - f.flush() - - with pytest.raises(asyncio.TimeoutError): - f = asyncio.ensure_future(connection.receive()) - await asyncio.wait_for(f, timeout=0.1) - - await connection.disconnect() - - -@pytest.mark.asyncio -async def test_load_from_dir(): - """Test stub connection can be loaded from dir.""" - StubConnection.from_dir( - ROOT_DIR + "/packages/fetchai/connections/stub", - Identity("name", "address", "public_key"), - CryptoStore(), - os.getcwd(), - ) - - -class TestFileLock: - """Test for filelocks.""" - - def test_lock_file_ok(self): - """Work ok ok for random file.""" - with tempfile.TemporaryFile() as fp: - with lock_file(fp): - pass - - def test_lock_file_error(self): - """Fail on closed file.""" - with tempfile.TemporaryFile() as fp: - fp.close() - with pytest.raises(ValueError): - with lock_file(fp): - pass diff --git a/tests/test_packages/test_contracts/__init__.py b/tests/test_packages/test_contracts/__init__.py deleted file mode 100644 index cf998a20cd..0000000000 --- a/tests/test_packages/test_contracts/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""The tests module contains the tests of the packages/contracts dir.""" diff --git a/tests/test_packages/test_contracts/test_erc1155/__init__.py b/tests/test_packages/test_contracts/test_erc1155/__init__.py deleted file mode 100644 index d110676a8b..0000000000 --- a/tests/test_packages/test_contracts/test_erc1155/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""The tests module contains the tests of the packages/contracts/erc1155 dir.""" diff --git a/tests/test_packages/test_contracts/test_erc1155/test_contract.py b/tests/test_packages/test_contracts/test_erc1155/test_contract.py deleted file mode 100644 index 458ee66773..0000000000 --- a/tests/test_packages/test_contracts/test_erc1155/test_contract.py +++ /dev/null @@ -1,1631 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2022 Valory AG -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""The tests module contains the tests of the packages/contracts/erc1155 dir.""" - -import re -import time -from pathlib import Path -from typing import cast -from unittest import mock - -import pytest -from aea_ledger_ethereum import EthereumCrypto -from aea_ledger_fetchai import FetchAIApi, FetchAICrypto - -from aea.configurations.loader import ( - ComponentType, - ContractConfig, - load_component_configuration, -) -from aea.contracts.base import Contract, contract_registry -from aea.test_tools.test_contract import BaseContractTestCase - -from tests.conftest import ( - ETHEREUM_ADDRESS_ONE, - ETHEREUM_ADDRESS_TWO, - ETHEREUM_PRIVATE_KEY_PATH, - ETHEREUM_PRIVATE_KEY_TWO_PATH, - ETHEREUM_TESTNET_CONFIG, - FETCHAI_TESTNET_CONFIG, - MAX_FLAKY_RERUNS, - ROOT_DIR, - UseGanache, -) - - -@pytest.mark.ledger -class TestERC1155ContractEthereum(BaseContractTestCase, UseGanache): - """Test the ERC1155 contract on Ethereum.""" - - ledger_identifier = EthereumCrypto.identifier - path_to_contract = Path(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155") - - @classmethod - def setup(cls): - """Setup.""" - super().setup( - ledger_config=ETHEREUM_TESTNET_CONFIG, - deployer_private_key_path=ETHEREUM_PRIVATE_KEY_PATH, - item_owner_private_key_path=ETHEREUM_PRIVATE_KEY_TWO_PATH, - ) - - cls.token_ids_a = [ - 340282366920938463463374607431768211456, - 340282366920938463463374607431768211457, - 340282366920938463463374607431768211458, - 340282366920938463463374607431768211459, - 340282366920938463463374607431768211460, - 340282366920938463463374607431768211461, - 340282366920938463463374607431768211462, - 340282366920938463463374607431768211463, - 340282366920938463463374607431768211464, - 340282366920938463463374607431768211465, - ] - - cls.token_id_b = 680564733841876926926749214863536422912 - - @classmethod - def finish_contract_deployment(cls) -> str: - """ - Finish deploying contract. - - :return: contract address - """ - contract_address = cls.ledger_api.get_contract_address( - cls.deployment_tx_receipt - ) - - if contract_address is None: - raise ValueError("Contract address not found!") # pragma: nocover - - return contract_address - - def test_generate_token_ids(self): - """Test the generate_token_ids method of the ERC1155 contract.""" - # setup - nft_token_type = 1 - nb_tokens = 2 - expected_toke_ids = [ - 340282366920938463463374607431768211456, - 340282366920938463463374607431768211457, - ] - - # operation - actual_toke_ids = self.contract.generate_token_ids(nft_token_type, nb_tokens) - - # after - assert actual_toke_ids == expected_toke_ids - - def test_generate_id(self): - """Test the _generate_id method of the ERC1155 contract.""" - # setup - ft_token_type = 2 - index = 0 - expected_toke_id = 680564733841876926926749214863536422912 - - # operation - actual_toke_id = self.contract._generate_id(index, ft_token_type) - - # after - assert actual_toke_id == expected_toke_id - - def test_get_create_batch_transaction(self): - """Test the get_create_batch_transaction method of the ERC1155 contract.""" - # operation - tx = self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_ids=self.token_ids_a, - ) - - # after - assert len(tx) == 7 - assert all( - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] - ) - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - def test_get_create_single_transaction(self): - """Test the get_create_single_transaction method of the ERC1155 contract.""" - # operation - tx = self.contract.get_create_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_id=self.token_id_b, - ) - - # after - assert len(tx) == 7 - assert all( - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] - ) - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - def test_get_mint_batch_transaction(self): - """Test the get_mint_batch_transaction method of the ERC1155 contract.""" - # operation - tx = self.contract.get_mint_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.item_owner_crypto.address, - token_ids=self.token_ids_a, - mint_quantities=[1] * len(self.token_ids_a), - ) - - # after - assert len(tx) == 7 - assert all( - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] - ) - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - def test_validate_mint_quantities(self): - """Test the validate_mint_quantities method of the ERC1155 contract.""" - # Valid NFTs - self.contract.validate_mint_quantities( - token_ids=self.token_ids_a, - mint_quantities=[1] * len(self.token_ids_a), - ) - - # Valid FTs - token_id = 680564733841876926926749214863536422912 - mint_quantity = 1 - self.contract.validate_mint_quantities( - token_ids=[token_id], - mint_quantities=[mint_quantity], - ) - - # Invalid NFTs - token_id = self.token_ids_a[0] - mint_quantity = 2 - with pytest.raises( - ValueError, - match=re.escape( - f"Cannot mint NFT (token_id={token_id}) with mint_quantity more than 1 (found={mint_quantity})" - ), - ): - self.contract.validate_mint_quantities( - token_ids=[token_id], - mint_quantities=[mint_quantity], - ) - - # Invalid: neither NFT nor FT - token_id = 1020847100762815390390123822295304634368 - mint_quantity = 1 - with pytest.raises( - ValueError, - match=re.escape( - f"The token type must be 1 or 2. Found type=3 for token_id={token_id}" - ), - ): - self.contract.validate_mint_quantities( - token_ids=[token_id], - mint_quantities=[mint_quantity], - ) - - def test_decode_id(self): - """Test the decode_id method of the ERC1155 contract.""" - # FT - expected_token_type = 2 - token_id = 680564733841876926926749214863536422912 - actual_token_type = self.contract.decode_id(token_id) - assert actual_token_type == expected_token_type - - # NFT - expected_token_type = 1 - token_id = 340282366920938463463374607431768211456 - actual_token_type = self.contract.decode_id(token_id) - assert actual_token_type == expected_token_type - - def test_get_mint_single_transaction(self): - """Test the get_mint_single_transaction method of the ERC1155 contract.""" - # operation - tx = self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.item_owner_crypto.address, - token_id=self.token_id_b, - mint_quantity=1, - ) - - # after - assert len(tx) == 7 - assert all( - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to", "data"] - ) - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - def test_get_balance(self): - """Test the get_balance method of the ERC1155 contract.""" - # operation - result = self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - token_id=self.token_id_b, - ) - - # after - assert "balance" in result - assert result["balance"][self.token_id_b] == 0 - - def test_get_balances(self): - """Test the get_balances method of the ERC1155 contract.""" - # operation - result = self.contract.get_balances( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - token_ids=self.token_ids_a, - ) - - # after - assert "balances" in result - assert all(result["balances"][token_id] == 0 for token_id in self.token_ids_a) - - def test_get_hash_single(self): - """Test the get_hash_single method of the ERC1155 contract.""" - # operation - result = self.contract.get_hash_single( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - from_address=self.deployer_crypto.address, - to_address=self.item_owner_crypto.address, - token_id=self.token_id_b, - from_supply=0, - to_supply=10, - value=1, - trade_nonce=1, - ) - - # after - assert isinstance(result, bytes) - - def test_get_hash_batch(self): - """Test the get_hash_batch method of the ERC1155 contract.""" - # operation - result = self.contract.get_hash_batch( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - from_address=self.deployer_crypto.address, - to_address=self.item_owner_crypto.address, - token_ids=self.token_ids_a, - from_supplies=[0, 1, 0, 0, 1, 0, 0, 0, 0, 1], - to_supplies=[0, 0, 0, 0, 0, 1, 0, 0, 0, 0], - value=1, - trade_nonce=1, - ) - - # after - assert isinstance(result, bytes) - - def test_generate_trade_nonce(self): - """Test the generate_trade_nonce method of the ERC1155 contract.""" - # operation - result = self.contract.generate_trade_nonce( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - ) - - # after - assert "trade_nonce" in result - assert isinstance(result["trade_nonce"], int) - - @pytest.mark.integration - def test_helper_methods_and_get_transactions(self): - """Test helper methods and get transactions.""" - expected_a = [ - 340282366920938463463374607431768211456, - 340282366920938463463374607431768211457, - 340282366920938463463374607431768211458, - 340282366920938463463374607431768211459, - 340282366920938463463374607431768211460, - 340282366920938463463374607431768211461, - 340282366920938463463374607431768211462, - 340282366920938463463374607431768211463, - 340282366920938463463374607431768211464, - 340282366920938463463374607431768211465, - ] - actual = self.contract.generate_token_ids(token_type=1, nb_tokens=10) - assert expected_a == actual - expected_b = [ - 680564733841876926926749214863536422912, - 680564733841876926926749214863536422913, - ] - actual = self.contract.generate_token_ids(token_type=2, nb_tokens=2) - assert expected_b == actual - tx = self.contract.get_deploy_transaction( - ledger_api=self.ledger_api, deployer_address=ETHEREUM_ADDRESS_ONE - ) - assert len(tx) == 7 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [key in tx for key in ["value", "from", "gas", "gasPrice", "nonce"]] - ), "Error, found: {}".format(tx) - tx = self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address=ETHEREUM_ADDRESS_ONE, - deployer_address=ETHEREUM_ADDRESS_ONE, - token_ids=expected_a, - ) - assert len(tx) == 7 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [ - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] - ] - ), "Error, found: {}".format(tx) - tx = self.contract.get_create_single_transaction( - ledger_api=self.ledger_api, - contract_address=ETHEREUM_ADDRESS_ONE, - deployer_address=ETHEREUM_ADDRESS_ONE, - token_id=expected_b[0], - ) - assert len(tx) == 7 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [ - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] - ] - ), "Error, found: {}".format(tx) - mint_quantities = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - tx = self.contract.get_mint_batch_transaction( - ledger_api=self.ledger_api, - contract_address=ETHEREUM_ADDRESS_ONE, - deployer_address=ETHEREUM_ADDRESS_ONE, - recipient_address=ETHEREUM_ADDRESS_ONE, - token_ids=expected_a, - mint_quantities=mint_quantities, - ) - assert len(tx) == 7 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [ - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] - ] - ), "Error, found: {}".format(tx) - mint_quantity = 1 - tx = self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address=ETHEREUM_ADDRESS_ONE, - deployer_address=ETHEREUM_ADDRESS_ONE, - recipient_address=ETHEREUM_ADDRESS_ONE, - token_id=expected_b[1], - mint_quantity=mint_quantity, - ) - assert len(tx) == 7 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [ - key in tx - for key in ["value", "chainId", "gas", "gasPrice", "nonce", "to"] - ] - ), "Error, found: {}".format(tx) - - @pytest.mark.integration - def test_get_single_atomic_swap(self): - """Test get single atomic swap.""" - from_address = ETHEREUM_ADDRESS_ONE - to_address = ETHEREUM_ADDRESS_TWO - token_id = self.contract.generate_token_ids(token_type=2, nb_tokens=1)[0] - from_supply = 0 - to_supply = 10 - value = 1 - trade_nonce = 1 - tx_hash = self.contract.get_hash_single( - self.ledger_api, - self.contract_address, - from_address, - to_address, - token_id, - from_supply, - to_supply, - value, - trade_nonce, - ) - assert isinstance(tx_hash, bytes) - signature = self.deployer_crypto.sign_message(tx_hash) - tx = self.contract.get_atomic_swap_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - from_address=from_address, - to_address=to_address, - token_id=token_id, - from_supply=from_supply, - to_supply=to_supply, - value=value, - trade_nonce=trade_nonce, - signature=signature, - ) - assert len(tx) == 8 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [ - key in tx - for key in [ - "value", - "chainId", - "gas", - "gasPrice", - "nonce", - "to", - "from", - ] - ] - ), "Error, found: {}".format(tx) - - @pytest.mark.integration - def test_get_batch_atomic_swap(self): - """Test get batch atomic swap.""" - from_address = ETHEREUM_ADDRESS_ONE - to_address = ETHEREUM_ADDRESS_TWO - token_ids = self.contract.generate_token_ids(token_type=2, nb_tokens=10) - from_supplies = [0, 1, 0, 0, 1, 0, 0, 0, 0, 1] - to_supplies = [0, 0, 0, 0, 0, 1, 0, 0, 0, 0] - value = 1 - trade_nonce = 1 - tx_hash = self.contract.get_hash_batch( - self.ledger_api, - self.contract_address, - from_address, - to_address, - token_ids, - from_supplies, - to_supplies, - value, - trade_nonce, - ) - assert isinstance(tx_hash, bytes) - signature = self.deployer_crypto.sign_message(tx_hash) - tx = self.contract.get_atomic_swap_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - from_address=from_address, - to_address=to_address, - token_ids=token_ids, - from_supplies=from_supplies, - to_supplies=to_supplies, - value=value, - trade_nonce=trade_nonce, - signature=signature, - ) - assert len(tx) == 8 - data = tx.pop("data") - assert len(data) > 0 and data.startswith("0x") - assert all( - [ - key in tx - for key in [ - "value", - "chainId", - "gas", - "gasPrice", - "nonce", - "to", - "from", - ] - ] - ), "Error, found: {}".format(tx) - - @pytest.mark.integration - def test_full(self): - """Setup.""" - # Test tokens IDs - token_ids = self.contract.generate_token_ids(token_type=2, nb_tokens=10) - - # create - tx = self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_ids=token_ids, - ) - tx_signed = self.deployer_crypto.sign_transaction(tx) - tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) - time.sleep(1) - receipt = self.ledger_api.get_transaction_receipt(tx_receipt) - assert self.ledger_api.is_transaction_settled(receipt) - - mint_quantities = [10] * len(token_ids) - # mint - tx = self.contract.get_mint_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.deployer_crypto.address, - token_ids=token_ids, - mint_quantities=mint_quantities, - ) - tx_signed = self.deployer_crypto.sign_transaction(tx) - tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) - time.sleep(1) - receipt = self.ledger_api.get_transaction_receipt(tx_receipt) - assert self.ledger_api.is_transaction_settled(receipt) - - tx = self.contract.get_mint_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.item_owner_crypto.address, - token_ids=token_ids, - mint_quantities=mint_quantities, - ) - tx_signed = self.deployer_crypto.sign_transaction(tx) - tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) - time.sleep(1) - receipt = self.ledger_api.get_transaction_receipt(tx_receipt) - assert self.ledger_api.is_transaction_settled(receipt) - - #  batch trade - from_address = self.deployer_crypto.address - to_address = self.item_owner_crypto.address - from_supplies = [0, 1, 0, 0, 1, 0, 0, 0, 0, 1] - to_supplies = [0, 0, 0, 0, 0, 1, 0, 0, 0, 0] - value = 0 - trade_nonce = 1 - tx_hash = self.contract.get_hash_batch( - self.ledger_api, - self.contract_address, - from_address, - to_address, - token_ids, - from_supplies, - to_supplies, - value, - trade_nonce, - ) - signature = self.item_owner_crypto.sign_message( - tx_hash, is_deprecated_mode=True - ) - tx = self.contract.get_atomic_swap_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - from_address=from_address, - to_address=to_address, - token_ids=token_ids, - from_supplies=from_supplies, - to_supplies=to_supplies, - value=value, - trade_nonce=trade_nonce, - signature=signature, - ) - tx_signed = self.deployer_crypto.sign_transaction(tx) - tx_receipt = self.ledger_api.send_signed_transaction(tx_signed) - time.sleep(1) - receipt = self.ledger_api.get_transaction_receipt(tx_receipt) - assert self.ledger_api.is_transaction_settled(receipt) - - -@pytest.mark.skip("Fetch.ai testnet not currently working.") -class TestCosmWasmContract(BaseContractTestCase): - """Test the cosmwasm contract.""" - - ledger_identifier = FetchAICrypto.identifier - path_to_contract = Path(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155") - fund_from_faucet = True - - @classmethod - def setup(cls): - """Setup.""" - # Test tokens IDs - super().setup(ledger_config=FETCHAI_TESTNET_CONFIG) - cls.token_ids_a = [ - 340282366920938463463374607431768211456, - 340282366920938463463374607431768211457, - 340282366920938463463374607431768211458, - 340282366920938463463374607431768211459, - 340282366920938463463374607431768211460, - 340282366920938463463374607431768211461, - 340282366920938463463374607431768211462, - 340282366920938463463374607431768211463, - 340282366920938463463374607431768211464, - 340282366920938463463374607431768211465, - ] - - cls.token_id_b = 680564733841876926926749214863536422912 - - @classmethod - def finish_contract_deployment(cls) -> str: - """ - Finish deploying contract. - - :return: contract address - """ - code_id = cast(FetchAIApi, cls.ledger_api).get_code_id( - cls.deployment_tx_receipt - ) - - assert code_id is not None - - # Init contract - tx = cls._contract.get_deploy_transaction( - ledger_api=cls.ledger_api, - deployer_address=cls.deployer_crypto.address, - code_id=code_id, - init_msg={}, - tx_fee=0, - amount=0, - label="ERC1155", - gas=1000000, - ) - - if tx is None: - raise ValueError("Deploy transaction not found!") # pragma: nocover - - tx_receipt = cls.sign_send_confirm_receipt_multisig_transaction( - tx, cls.ledger_api, [cls.deployer_crypto] - ) - - contract_address = cls.ledger_api.get_contract_address(tx_receipt) - - if contract_address is None: - raise ValueError("Contract address not found!") # pragma: nocover - - return contract_address - - @pytest.mark.integration - @pytest.mark.ledger - @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) - def test_create_and_mint_and_balances(self): - """Test cosmwasm contract create, mint and balances functionalities.""" - # Create single token - tx = self.contract.get_create_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_id=self.token_id_b, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Create batch of tokens - tx = self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_ids=self.token_ids_a, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Mint single token - tx = self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.item_owner_crypto.address, - token_id=self.token_id_b, - mint_quantity=1, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Get balance of single token - res = self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - token_id=self.token_id_b, - ) - assert "balance" in res - assert res["balance"][self.token_id_b] == 1 - - # Mint batch of tokens - tx = self.contract.get_mint_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.item_owner_crypto.address, - token_ids=self.token_ids_a, - mint_quantities=[1] * len(self.token_ids_a), - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Get balances of multiple tokens - res = self.contract.get_balances( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - token_ids=self.token_ids_a, - ) - assert "balances" in res - assert res["balances"] == {token_id: 1 for token_id in self.token_ids_a} - - @pytest.mark.integration - @pytest.mark.ledger - @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) - def test_cosmwasm_single_atomic_swap(self): - """Test single atomic swap.""" - # Create batch of tokens - tx = self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_ids=self.token_ids_a, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Mint single ERC1155 token a[0] to Deployer - tx = self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.deployer_crypto.address, - token_id=self.token_ids_a[0], - mint_quantity=1, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Store balance of Deployer's native tokens before atomic swap - original_deployer_balance = self.ledger_api.get_balance( - self.deployer_crypto.address - ) - - # Atomic swap - # Send 1 ERC1155 token a[0] from Deployer to Item owner - # Send 1 native token from Item owner to Deployer - tx = self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address=self.contract_address, - from_address=self.deployer_crypto.address, - to_address=self.item_owner_crypto.address, - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=1, - trade_nonce=0, - from_pubkey=self.deployer_crypto.public_key, - to_pubkey=self.item_owner_crypto.public_key, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto, self.item_owner_crypto] - ) - - # Check Item owner's ERC1155 token balance - result = self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - token_id=self.token_ids_a[0], - ) - - assert "balance" in result - assert result["balance"][self.token_ids_a[0]] == 1 - - # Check deployer's native token balance - deployer_balance = self.ledger_api.get_balance(self.deployer_crypto.address) - assert deployer_balance == original_deployer_balance + 1 - - # Other direction of atomic swap - # Send 1 ERC1155 token a[0] from Item owner to Deployer - # Send 1 native token from Item owner to Deployer - tx = self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address=self.contract_address, - from_address=self.deployer_crypto.address, - to_address=self.item_owner_crypto.address, - token_id=self.token_ids_a[0], - from_supply=0, - to_supply=1, - value=1, - trade_nonce=0, - from_pubkey=self.deployer_crypto.public_key, - to_pubkey=self.item_owner_crypto.public_key, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.item_owner_crypto] - ) - - # Check Item owner's ERC1155 token balance - result = self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.deployer_crypto.address, - token_id=self.token_ids_a[0], - ) - - assert "balance" in result - assert result["balance"][self.token_ids_a[0]] == 1 - - # Check deployer's native token balance - deployer_balance = self.ledger_api.get_balance(self.deployer_crypto.address) - assert deployer_balance == original_deployer_balance + 2 - - # Check invalid case with from_supply > 0 and to_supply > 0 - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address=self.contract_address, - from_address=self.deployer_crypto.address, - to_address=self.item_owner_crypto.address, - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=1, - value=1, - trade_nonce=0, - from_pubkey=self.deployer_crypto.public_key, - to_pubkey=self.item_owner_crypto.public_key, - ) - - @pytest.mark.integration - @pytest.mark.ledger - @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) - def test_cosmwasm_batch_atomic_swap(self): - """Test batch atomic swap.""" - - # Create batch of tokens - tx = self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - token_ids=self.token_ids_a, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Mint single token a[0] to Deployer - tx = self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.deployer_crypto.address, - token_id=self.token_ids_a[0], - mint_quantity=1, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Mint single token a[1] to Item owner - tx = self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - deployer_address=self.deployer_crypto.address, - recipient_address=self.item_owner_crypto.address, - token_id=self.token_ids_a[1], - mint_quantity=1, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto] - ) - - # Store balance of Deployer's native tokens before atomic swap - original_deployer_balance = self.ledger_api.get_balance( - self.deployer_crypto.address - ) - - # Atomic swap - # Send 1 ERC1155 token a[0] from Deployer to Item owner - # Send 1 ERC1155 token a[1] from Item owner to Deployer - # Send 1 native token from Item owner to Deployer - - tx = self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address=self.contract_address, - from_address=self.deployer_crypto.address, - to_address=self.item_owner_crypto.address, - token_ids=[self.token_ids_a[0], self.token_ids_a[1]], - from_supplies=[1, 0], - to_supplies=[0, 1], - value=1, - trade_nonce=0, - from_pubkey=self.deployer_crypto.public_key, - to_pubkey=self.item_owner_crypto.public_key, - ) - assert len(tx) == 2 - self.sign_send_confirm_receipt_multisig_transaction( - tx, self.ledger_api, [self.deployer_crypto, self.item_owner_crypto] - ) - - # Check Item owner's ERC1155 token balance - result = self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.item_owner_crypto.address, - token_id=self.token_ids_a[0], - ) - - assert "balance" in result - assert result["balance"][self.token_ids_a[0]] == 1 - - # Check Deployer's ERC1155 token balance - result = self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address=self.contract_address, - agent_address=self.deployer_crypto.address, - token_id=self.token_ids_a[1], - ) - - assert "balance" in result - assert result["balance"][self.token_ids_a[1]] == 1 - - # Check deployer's native token balance - deployer_balance = self.ledger_api.get_balance(self.deployer_crypto.address) - assert deployer_balance == original_deployer_balance + 1 - - -class TestContractCommon: - """Other tests for the contract.""" - - @classmethod - def setup(cls): - """Setup.""" - - # Register smart contract used for testing - cls.path_to_contract = Path( - ROOT_DIR, "packages", "fetchai", "contracts", "erc1155" - ) - - # register contract - configuration = cast( - ContractConfig, - load_component_configuration(ComponentType.CONTRACT, cls.path_to_contract), - ) - configuration._directory = ( # pylint: disable=protected-access - cls.path_to_contract - ) - if str(configuration.public_id) not in contract_registry.specs: - # load contract into sys modules - Contract.from_config(configuration) - cls.contract = contract_registry.make(str(configuration.public_id)) - - cls.token_ids_a = [ - 340282366920938463463374607431768211456, - ] - - # Create mock ledger with unknown identifier - cls.ledger_api = mock.Mock() - attrs = {"identifier": "dummy"} - cls.ledger_api.configure_mock(**attrs) - - @pytest.mark.ledger - def test_get_create_batch_transaction_wrong_identifier(self): - """Test if get_create_batch_transaction with wrong api identifier fails.""" - - # Test if function is not implemented for unknown ledger - with pytest.raises(NotImplementedError): - self.contract.get_create_batch_transaction( - ledger_api=self.ledger_api, - contract_address="contract_address", - deployer_address="address", - token_ids=self.token_ids_a, - ) - - @pytest.mark.ledger - def test_get_create_single_transaction_wrong_identifier(self): - """Test if get_create_single_transaction with wrong api identifier fails.""" - - # Test if function is not implemented for unknown ledger - with pytest.raises(NotImplementedError): - self.contract.get_create_single_transaction( - ledger_api=self.ledger_api, - contract_address="contract_address", - deployer_address="address", - token_id=self.token_ids_a[0], - ) - - @pytest.mark.ledger - def test_get_mint_batch_transaction_wrong_identifier(self): - """Test if get_mint_batch_transaction with wrong api identifier fails.""" - - # Test if function is not implemented for unknown ledger - with pytest.raises(NotImplementedError): - self.contract.get_mint_batch_transaction( - ledger_api=self.ledger_api, - contract_address="contract_address", - deployer_address="address", - recipient_address="address", - token_ids=self.token_ids_a, - mint_quantities=[1], - ) - - @pytest.mark.ledger - def test_get_mint_single_transaction_wrong_identifier(self): - """Test if get_mint_single_transaction with wrong api identifier fails.""" - - # Test if function is not implemented for unknown ledger - with pytest.raises(NotImplementedError): - self.contract.get_mint_single_transaction( - ledger_api=self.ledger_api, - contract_address="contract_address", - deployer_address="address", - recipient_address="address", - token_id=self.token_ids_a[0], - mint_quantity=1, - ) - - @pytest.mark.ledger - def test_get_balance_wrong_identifier(self): - """Test if get_balance with wrong api identifier fails.""" - - # Test if function is not implemented for unknown ledger - with pytest.raises(NotImplementedError): - self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address="contract_address", - agent_address="address", - token_id=self.token_ids_a[0], - ) - - @pytest.mark.ledger - def test_get_balance_wrong_query_res(self): - """Test if get_balance with wrong api identifier fails.""" - - # Create mock fetchai ledger that returns None on execute_contract_query - attrs = {"identifier": "fetchai", "execute_contract_query.return_value": None} - self.ledger_api.configure_mock(**attrs) - - # Test if get balance returns ValueError when querying contract returns None - with pytest.raises(ValueError): - self.contract.get_balance( - ledger_api=self.ledger_api, - contract_address="contract_address", - agent_address="address", - token_id=self.token_ids_a[0], - ) - - @pytest.mark.ledger - def test_get_balances_wrong_query_res(self): - """Test if get_balances with wrong api identifier fails.""" - - # Create mock fetchai ledger that returns None on execute_contract_query - attrs = {"identifier": "fetchai", "execute_contract_query.return_value": None} - self.ledger_api.configure_mock(**attrs) - - # Test if get balance returns ValueError when querying contract returns None - with pytest.raises(ValueError): - self.contract.get_balances( - ledger_api=self.ledger_api, - contract_address="contract_address", - agent_address="address", - token_ids=self.token_ids_a, - ) - - @pytest.mark.ledger - def test_get_hash_batch_not_same(self): - """Test if get_hash_batch returns ValueError when on-chain hash is not same as computed hash.""" - - self.ledger_api.identifier = "ethereum" - - # Test if get hash returns ValueError when on chain hash is not same as computed hash - with mock.patch.object(type(self.contract), "_get_hash_batch", new=mock.Mock()): - with pytest.raises(ValueError): - self.contract.get_hash_batch( - ledger_api=self.ledger_api, - contract_address="contract_address", - from_address="address", - to_address="address", - token_ids=self.token_ids_a, - from_supplies=[1], - to_supplies=[0], - value=123, - trade_nonce=123, - ) - - @pytest.mark.ledger - def test_generate_trade_nonce_if_exist(self): - """Test if generate_trade_nonce retries when nonce already exist.""" - - # Etherem ledger api mock - self.ledger_api.identifier = "ethereum" - - # instance.functions.is_nonce_used(agent_address, trade_nonce).call() -> True, False - is_nonce_used_mock = mock.Mock() - is_nonce_used_mock.configure_mock(**{"call.side_effect": [True, False]}) - - # instance.functions.is_nonce_used(agent_address, trade_nonce) -> is_nonce_used_mock with call method - instance_mock = mock.Mock() - instance_mock.configure_mock( - **{"functions.is_nonce_used.return_value": is_nonce_used_mock} - ) - - # cls.get_instance(ledger_api, contract_address) -> instance_mock - get_instance_mock = mock.Mock() - get_instance_mock.configure_mock(**{"return_value": instance_mock}) - - # Patch get_instance method to return get_instance_mock which returns instance of instance_mock when called - with mock.patch.object( - type(self.contract), "get_instance", new=get_instance_mock - ): - self.contract.generate_trade_nonce( - ledger_api=self.ledger_api, - contract_address="contract_address", - agent_address="address", - ) - - # Check if is_nonce_used was called twice - assert is_nonce_used_mock.call.call_count == 2 - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_eth_no_signature(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError if signature not present on Ethereum case.""" - - self.ledger_api.identifier = "ethereum" - - # Test if get_atomic_swap_single_transaction returns RuntimeError when signature is missing - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=1, - trade_nonce=0, - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_eth_pubkeys(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError if pubkeys are present on Ethereum case.""" - - self.ledger_api.identifier = "ethereum" - - # Test if get_atomic_swap_single_transaction returns RuntimeError when pubkey is present - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=1, - trade_nonce=0, - signature="signature", - from_pubkey="deadbeef", - to_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_signature(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError if signature is present on Cosmos/Fetch case.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction returns RuntimeError when signature is present - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=1, - trade_nonce=0, - signature="signature", - from_pubkey="deadbeef", - to_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_valid(self): - """Test if get_atomic_swap_single_transaction allows one pubkey in case of only one direction of transfers.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction works with only to_pubkey - tx = self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=0, - to_supply=1, - value=1, - trade_nonce=0, - to_pubkey="deadbeef", - ) - assert tx is not None - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_one_pubkey_invalid(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError with missing from_pubkey.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with missing from_key - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=1, - trade_nonce=0, - to_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError with missing to_pubkey.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with missing from_key - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=1, - trade_nonce=0, - from_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_eth_pubkeys(self): - """Test if get_atomic_swap_batch_transaction returns RuntimeError if pubkeys are present on Ethereum case.""" - - self.ledger_api.identifier = "ethereum" - - # Test if get_atomic_swap_batch_transaction returns RuntimeError when pubkey is present - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=1, - trade_nonce=0, - signature="signature", - from_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_signature(self): - """Test if get_atomic_swap_batch_transaction returns RuntimeError if signature is present on Cosmos/Fetch case.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_batch_transaction returns RuntimeError when signature is present - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=1, - trade_nonce=0, - signature="signature", - from_pubkey="deadbeef", - to_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_valid(self): - """Test if get_atomic_swap_batch_transaction allows one pubkey in case of only one direction of transfers.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_batch_transaction works with only to_pubkey - tx = self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[0], - to_supplies=[1], - value=1, - trade_nonce=0, - to_pubkey="deadbeef", - ) - assert tx is not None - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_one_pubkey_invalid(self): - """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing from_pubkey.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_batch_transaction fails with missing from_key - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=1, - trade_nonce=0, - to_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_ba_transaction_eth_no_signature(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError if signature not present on Ethereum case.""" - - self.ledger_api.identifier = "ethereum" - - # Test if get_atomic_swap_single_transaction returns RuntimeError when signature is missing - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=1, - trade_nonce=0, - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_to_pubkey_missing(self): - """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing to_pubkey.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with all amounts to be zero - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=1, - trade_nonce=0, - from_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_to_pubkey_missing_no_from_pubkey_required( - self, - ): - """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing to_pubkey and from_pubkey not required.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with missing to_pubkey - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[0], - to_supplies=[1], - value=1, - trade_nonce=0, - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_missing_no_to_pubkey_required( - self, - ): - """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing from_pubkey and to_pubkey not required.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with missing from_pubkey - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=0, - trade_nonce=0, - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_cosmos_from_pubkey_only(self): - """Test if get_atomic_swap_batch_transaction returns Tx in case with only from_pubkey.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction works with only from_pubkey - res = self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[1], - to_supplies=[0], - value=0, - trade_nonce=0, - from_pubkey="deadbeef", - ) - assert res is not None - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_amounts_missing(self): - """Test if get_atomic_swap_single_transaction returns RuntimeError with missing amounts.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with all amounts to be zero - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=0, - to_supply=0, - value=0, - trade_nonce=0, - from_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_batch_transaction_amounts_missing(self): - """Test if get_atomic_swap_batch_transaction returns RuntimeError with missing amounts.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with all amounts to be zero - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_batch_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_ids=[self.token_ids_a[0]], - from_supplies=[0], - to_supplies=[0], - value=0, - trade_nonce=0, - from_pubkey="deadbeef", - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_to_pubkey_missing_no_from_pubkey_required( - self, - ): - """Test if get_atomic_swap_single_transaction returns RuntimeError with missing to_pubkey and from_pubkey not required.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with missing to_pubkey - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=0, - to_supply=1, - value=1, - trade_nonce=0, - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_missing_no_to_pubkey_required( - self, - ): - """Test if get_atomic_swap_single_transaction returns RuntimeError with missing from_pubkey and to_pubkey not required.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction fails with missing from_pubkey - with pytest.raises(RuntimeError): - self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=0, - trade_nonce=0, - ) - - @pytest.mark.ledger - def test_get_atomic_swap_single_transaction_cosmos_from_pubkey_only(self): - """Test if get_atomic_swap_single_transaction returns Tx in case with only from_pubkey.""" - - self.ledger_api.identifier = "fetchai" - - # Test if get_atomic_swap_single_transaction works with only from_pubkey - res = self.contract.get_atomic_swap_single_transaction( - self.ledger_api, - contract_address="address", - from_address="address", - to_address="address", - token_id=self.token_ids_a[0], - from_supply=1, - to_supply=0, - value=0, - trade_nonce=0, - from_pubkey="deadbeef", - ) - assert res is not None diff --git a/tests/test_packages/test_protocols/test_contract_api.py b/tests/test_packages/test_protocols/test_contract_api.py deleted file mode 100644 index 1616f90e26..0000000000 --- a/tests/test_packages/test_protocols/test_contract_api.py +++ /dev/null @@ -1,579 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the contract_api protocol package.""" - -import logging -import sys -from typing import Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.contract_api.dialogues import ( - ContractApiDialogue, - ContractApiDialogues, -) -from packages.fetchai.protocols.contract_api.message import ContractApiMessage -from packages.fetchai.protocols.contract_api.message import ( - _default_logger as contract_api_message_logger, -) - -from tests.conftest import ROOT_DIR - - -logger = logging.getLogger(__name__) -sys.path.append(ROOT_DIR) - - -def test_get_deploy_transaction_serialization(): - """Test the serialization for 'get_deploy_transaction' speech-act works.""" - kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION, - ledger_id="some_ledger_id", - contract_id="some_contract_id", - callable="some_callable", - kwargs=kwargs_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_get_raw_transaction_serialization(): - """Test the serialization for 'get_raw_transaction' speech-act works.""" - kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION, - ledger_id="some_ledger_id", - contract_id="some_contract_id", - contract_address="some_contract_address", - callable="some_callable", - kwargs=kwargs_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_get_raw_message_serialization(): - """Test the serialization for 'get_raw_message' speech-act works.""" - kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.GET_RAW_MESSAGE, - ledger_id="some_ledger_id", - contract_id="some_contract_id", - contract_address="some_contract_address", - callable="some_callable", - kwargs=kwargs_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_get_state_serialization(): - """Test the serialization for 'get_state' speech-act works.""" - kwargs_arg = ContractApiMessage.Kwargs({"key_1": 1, "key_2": 2}) - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.GET_STATE, - ledger_id="some_ledger_id", - contract_id="some_contract_id", - contract_address="some_contract_address", - callable="some_callable", - kwargs=kwargs_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_state_serialization(): - """Test the serialization for 'state' speech-act works.""" - state_arg = ContractApiMessage.State("some_ledger_id", {"key": "some_body"}) - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.STATE, - state=state_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_raw_transaction_serialization(): - """Test the serialization for 'raw_transaction' speech-act works.""" - raw_transaction_arg = ContractApiMessage.RawTransaction( - "some_ledger_id", {"body": "some_body"} - ) - msg = ContractApiMessage( - message_id=2, - target=1, - performative=ContractApiMessage.Performative.RAW_TRANSACTION, - raw_transaction=raw_transaction_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_raw_message_serialization(): - """Test the serialization for 'raw_message' speech-act works.""" - raw_message_arg = ContractApiMessage.RawMessage("some_ledger_id", b"some_body") - msg = ContractApiMessage( - performative=ContractApiMessage.Performative.RAW_MESSAGE, - raw_message=raw_message_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_error_serialization(): - """Test the serialization for 'error' speech-act works.""" - msg = ContractApiMessage( - performative=ContractApiMessage.Performative.ERROR, - code=7, - message="some_error_message", - data=b"some_error_data", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = ContractApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_performative_string_value(): - """Test the string value of the performatives.""" - assert ( - str(ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION) - == "get_deploy_transaction" - ), "The str value must be get_deploy_transaction" - assert ( - str(ContractApiMessage.Performative.GET_RAW_TRANSACTION) - == "get_raw_transaction" - ), "The str value must be get_raw_transaction" - assert ( - str(ContractApiMessage.Performative.GET_RAW_MESSAGE) == "get_raw_message" - ), "The str value must be get_raw_message" - assert ( - str(ContractApiMessage.Performative.GET_STATE) == "get_state" - ), "The str value must be get_state" - assert ( - str(ContractApiMessage.Performative.STATE) == "state" - ), "The str value must be state" - assert ( - str(ContractApiMessage.Performative.RAW_TRANSACTION) == "raw_transaction" - ), "The str value must be raw_transaction" - assert ( - str(ContractApiMessage.Performative.RAW_MESSAGE) == "raw_message" - ), "The str value must be raw_message" - assert ( - str(ContractApiMessage.Performative.ERROR) == "error" - ), "The str value must be error" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.RAW_MESSAGE, - raw_message=ContractApiMessage.RawMessage("some_ledger_id", b"some_body"), - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - ContractApiMessage.Performative, "__eq__", return_value=False - ): - ContractApiMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.RAW_MESSAGE, - raw_message=ContractApiMessage.RawMessage("some_ledger_id", b"some_body"), - ) - - encoded_msg = ContractApiMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - ContractApiMessage.Performative, "__eq__", return_value=False - ): - ContractApiMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.contract_api.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the message is incorrect.""" - with mock.patch.object(contract_api_message_logger, "error") as mock_logger: - ContractApiMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=ContractApiMessage.Performative.RAW_MESSAGE, - raw_message=ContractApiMessage.RawMessage("some_ledger_id", b"some_body"), - ) - - mock_logger.assert_any_call("some error") - - -def test_kwargs(): - """Test the kwargs custom type.""" - body = {"key_1": 1, "key_2": 2} - kwargs = ContractApiMessage.Kwargs(body) - assert str(kwargs) == "Kwargs: body={}".format(body) - - -class TestDialogues: - """Tests contract_api dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.agent_addr = "agent address" - cls.ledger_addr = "ledger address" - cls.agent_dialogues = AgentDialogues(cls.agent_addr) - cls.ledger_dialogues = LedgerDialogues(cls.ledger_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.agent_dialogues._create_self_initiated( - dialogue_opponent_addr=self.ledger_addr, - dialogue_reference=(str(0), ""), - role=ContractApiDialogue.Role.AGENT, - ) - assert isinstance(result, ContractApiDialogue) - assert result.role == ContractApiDialogue.Role.AGENT, "The role must be Agent." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.agent_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.ledger_addr, - dialogue_reference=(str(0), ""), - role=ContractApiDialogue.Role.AGENT, - ) - assert isinstance(result, ContractApiDialogue) - assert result.role == ContractApiDialogue.Role.AGENT, "The role must be agent." - - -class AgentDialogue(ContractApiDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[ContractApiMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - ContractApiDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class AgentDialogues(ContractApiDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return ContractApiDialogue.Role.AGENT - - ContractApiDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=AgentDialogue, - ) - - -class LedgerDialogue(ContractApiDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[ContractApiMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - ContractApiDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class LedgerDialogues(ContractApiDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return ContractApiDialogue.Role.LEDGER - - ContractApiDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=LedgerDialogue, - ) diff --git a/tests/test_packages/test_skills/test_echo/__init__.py b/tests/test_packages/test_skills/test_echo/__init__.py deleted file mode 100644 index 782cb6502b..0000000000 --- a/tests/test_packages/test_skills/test_echo/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""The tests module contains the tests of the packages/skills/echo dir.""" diff --git a/tests/test_packages/test_skills/test_echo/test_behaviours.py b/tests/test_packages/test_skills/test_echo/test_behaviours.py deleted file mode 100644 index 7dbee7f3c8..0000000000 --- a/tests/test_packages/test_skills/test_echo/test_behaviours.py +++ /dev/null @@ -1,84 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the behaviour class of the echo skill.""" - -import logging -from pathlib import Path -from typing import cast -from unittest.mock import patch - -from aea.test_tools.test_skill import BaseSkillTestCase - -from packages.fetchai.skills.echo.behaviours import EchoBehaviour - -from tests.conftest import ROOT_DIR - - -class TestEchoBehaviour(BaseSkillTestCase): - """Test EchoBehaviour behaviour of echo.""" - - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") - is_agent_to_agent_messages = False - - @classmethod - def setup(cls): - """Setup the test class.""" - super().setup() - cls.echo_behaviour = cast( - EchoBehaviour, cls._skill.skill_context.behaviours.echo - ) - cls.logger = cls._skill.skill_context.logger - - def test_setup(self): - """Test the setup method of the echo behaviour.""" - # operation - with patch.object(self.logger, "log") as mock_logger: - assert self.echo_behaviour.setup() is None - - # after - self.assert_quantity_in_outbox(0) - - mock_logger.assert_any_call( - logging.INFO, "Echo Behaviour: setup method called." - ) - - def test_act(self): - """Test the act method of the echo behaviour.""" - # operation - with patch.object(self.logger, "log") as mock_logger: - assert self.echo_behaviour.act() is None - - # after - self.assert_quantity_in_outbox(0) - - mock_logger.assert_any_call(logging.INFO, "Echo Behaviour: act method called.") - - def test_teardown(self): - """Test the teardown method of the echo behaviour.""" - # operation - with patch.object(self.logger, "log") as mock_logger: - assert self.echo_behaviour.teardown() is None - - # after - self.assert_quantity_in_outbox(0) - - mock_logger.assert_any_call( - logging.INFO, "Echo Behaviour: teardown method called." - ) diff --git a/tests/test_packages/test_skills/test_echo/test_dialogues.py b/tests/test_packages/test_skills/test_echo/test_dialogues.py deleted file mode 100644 index 9cad9c27cb..0000000000 --- a/tests/test_packages/test_skills/test_echo/test_dialogues.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the dialogue classes of the echo skill.""" - -from pathlib import Path -from typing import cast - -from aea.test_tools.test_skill import BaseSkillTestCase, COUNTERPARTY_AGENT_ADDRESS - -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.skills.echo.dialogues import DefaultDialogue, DefaultDialogues - -from tests.conftest import ROOT_DIR - - -class TestDialogues(BaseSkillTestCase): - """Test dialogue class of echo.""" - - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") - - @classmethod - def setup(cls): - """Setup the test class.""" - super().setup() - cls.default_dialogues = cast( - DefaultDialogues, cls._skill.skill_context.default_dialogues - ) - - def test_default_dialogues(self): - """Test the DefaultDialogues class.""" - _, dialogue = self.default_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=DefaultMessage.Performative.BYTES, - content=b"some_content", - ) - assert dialogue.role == DefaultDialogue.Role.AGENT - assert dialogue.self_address == self.skill.skill_context.agent_name diff --git a/tests/test_packages/test_skills/test_echo/test_handlers.py b/tests/test_packages/test_skills/test_echo/test_handlers.py deleted file mode 100644 index bd95293206..0000000000 --- a/tests/test_packages/test_skills/test_echo/test_handlers.py +++ /dev/null @@ -1,196 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the handler class of the echo skill.""" - -import logging -from pathlib import Path -from typing import cast -from unittest.mock import patch - -from aea.protocols.dialogue.base import DialogueMessage -from aea.test_tools.test_skill import BaseSkillTestCase - -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.skills.echo.dialogues import DefaultDialogues -from packages.fetchai.skills.echo.handlers import EchoHandler - -from tests.conftest import ROOT_DIR - - -class TestEchoHandler(BaseSkillTestCase): - """Test EchoHandler of echo.""" - - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "echo") - - @classmethod - def setup(cls): - """Setup the test class.""" - super().setup() - cls.echo_handler = cast(EchoHandler, cls._skill.skill_context.handlers.echo) - cls.logger = cls._skill.skill_context.logger - - cls.default_dialogues = cast( - DefaultDialogues, cls._skill.skill_context.default_dialogues - ) - - cls.content = b"some_content" - cls.list_of_messages = ( - DialogueMessage( - DefaultMessage.Performative.BYTES, {"content": cls.content} - ), - ) - - def test_setup(self): - """Test the setup method of the echo handler.""" - with patch.object(self.logger, "log") as mock_logger: - assert self.echo_handler.setup() is None - - # after - self.assert_quantity_in_outbox(0) - - mock_logger.assert_any_call(logging.INFO, "Echo Handler: setup method called.") - - def test_handle_unidentified_dialogue(self): - """Test the _handle_unidentified_dialogue method of the oef_search handler.""" - # setup - incorrect_dialogue_reference = ("", "") - incoming_message = self.build_incoming_message( - message_type=DefaultMessage, - dialogue_reference=incorrect_dialogue_reference, - performative=DefaultMessage.Performative.BYTES, - content=self.content, - to=self.skill.skill_context.agent_name, - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.echo_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid default message={incoming_message}, unidentified dialogue.", - ) - - def test_handle_error(self): - """Test the _handle_error method of the oef_search handler.""" - # setup - default_dialogue = self.prepare_skill_dialogue( - dialogues=self.default_dialogues, - messages=self.list_of_messages[:1], - ) - incoming_message = self.build_incoming_message_for_skill_dialogue( - dialogue=default_dialogue, - performative=DefaultMessage.Performative.ERROR, - error_code=DefaultMessage.ErrorCode.INVALID_DIALOGUE, - error_msg="Invalid dialogue.", - error_data={"default_message": b"some_bytes"}, - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.echo_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received default error message={incoming_message} in dialogue={default_dialogue}.", - ) - - def test_handle_bytes(self): - """Test the _handle_error method of the oef_search handler.""" - # setup - default_dialogue = self.prepare_skill_dialogue( - dialogues=self.default_dialogues, - messages=self.list_of_messages[:1], - ) - incoming_message = cast( - DefaultMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=default_dialogue, - performative=DefaultMessage.Performative.BYTES, - content=self.content, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.echo_handler.handle(incoming_message) - - # after - self.assert_quantity_in_outbox(1) - - mock_logger.assert_any_call( - logging.INFO, - f"Echo Handler: message={incoming_message}, sender={incoming_message.sender}", - ) - - message = self.get_message_from_outbox() - has_attributes, error_str = self.message_has_attributes( - actual_message=message, - message_type=DefaultMessage, - performative=DefaultMessage.Performative.BYTES, - to=incoming_message.sender, - sender=self.skill.skill_context.agent_name, - target=incoming_message.message_id, - content=incoming_message.content, - ) - assert has_attributes, error_str - - def test_handle_invalid(self): - """Test the _handle_invalid method of the echo handler.""" - # setup - default_dialogue = self.prepare_skill_dialogue( - dialogues=self.default_dialogues, - messages=self.list_of_messages[:1], - ) - incoming_message = cast( - DefaultMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=default_dialogue, - performative=DefaultMessage.Performative.END, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.echo_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid message={incoming_message} in dialogue={self.default_dialogues.get_dialogue(incoming_message)}.", - ) - - def test_retrieve_protocol_dialogues_from_handler(self): - """Test retrieve protocol dialogues from handler""" - assert self.echo_handler.protocol_dialogues() is self.default_dialogues - - def test_teardown(self): - """Test the teardown method of the echo handler.""" - with patch.object(self.logger, "log") as mock_logger: - assert self.echo_handler.teardown() is None - - # after - self.assert_quantity_in_outbox(0) - - mock_logger.assert_any_call( - logging.INFO, "Echo Handler: teardown method called." - ) diff --git a/tests/test_packages/test_skills/test_erc1155_client/__init__.py b/tests/test_packages/test_skills/test_erc1155_client/__init__.py deleted file mode 100644 index 1a721bf66b..0000000000 --- a/tests/test_packages/test_skills/test_erc1155_client/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""The tests module contains the tests of the packages/skills/erc1155_client dir.""" diff --git a/tests/test_packages/test_skills/test_erc1155_client/intermediate_class.py b/tests/test_packages/test_skills/test_erc1155_client/intermediate_class.py deleted file mode 100644 index 77e3b7ce39..0000000000 --- a/tests/test_packages/test_skills/test_erc1155_client/intermediate_class.py +++ /dev/null @@ -1,217 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021 Valory AG -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module sets up test environment for erc1155_client skill.""" - -from pathlib import Path -from typing import cast - -from aea.helpers.search.models import ( - Attribute, - Constraint, - ConstraintType, - DataModel, - Description, - Query, -) -from aea.helpers.transaction.base import RawMessage, RawTransaction, Terms -from aea.protocols.dialogue.base import DialogueMessage -from aea.test_tools.test_skill import BaseSkillTestCase - -from packages.fetchai.protocols.contract_api.custom_types import Kwargs -from packages.fetchai.protocols.contract_api.message import ContractApiMessage -from packages.fetchai.protocols.fipa.message import FipaMessage -from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage -from packages.fetchai.protocols.oef_search.message import OefSearchMessage -from packages.fetchai.skills.erc1155_client.behaviours import SearchBehaviour -from packages.fetchai.skills.erc1155_client.dialogues import ( - ContractApiDialogues, - DefaultDialogues, - FipaDialogues, - LedgerApiDialogues, - OefSearchDialogues, - SigningDialogues, -) -from packages.fetchai.skills.erc1155_client.handlers import ( - ContractApiHandler, - FipaHandler, - LedgerApiHandler, - OefSearchHandler, - SigningHandler, -) -from packages.fetchai.skills.erc1155_client.strategy import Strategy -from packages.open_aea.protocols.signing.message import SigningMessage - -from tests.conftest import ROOT_DIR - - -class ERC1155ClientTestCase(BaseSkillTestCase): - """Sets the erc1155_client class up for testing.""" - - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "erc1155_client") - - @classmethod - def setup(cls): - """Setup the test class.""" - cls.location = {"longitude": 0.1270, "latitude": 51.5194} - cls.search_query = { - "search_key": "seller_service", - "search_value": "erc1155_contract", - "constraint_type": "==", - } - cls.search_radius = 5.0 - config_overrides = { - "models": { - "strategy": { - "args": { - "location": cls.location, - "search_query": cls.search_query, - "search_radius": cls.search_radius, - } - } - }, - } - - super().setup(config_overrides=config_overrides) - - # behaviours - cls.search_behaviour = cast( - SearchBehaviour, cls._skill.skill_context.behaviours.search - ) - - # dialogues - cls.contract_api_dialogues = cast( - ContractApiDialogues, cls._skill.skill_context.contract_api_dialogues - ) - cls.default_dialogues = cast( - DefaultDialogues, cls._skill.skill_context.default_dialogues - ) - cls.fipa_dialogues = cast( - FipaDialogues, cls._skill.skill_context.fipa_dialogues - ) - cls.ledger_api_dialogues = cast( - LedgerApiDialogues, cls._skill.skill_context.ledger_api_dialogues - ) - cls.oef_search_dialogues = cast( - OefSearchDialogues, cls._skill.skill_context.oef_search_dialogues - ) - cls.signing_dialogues = cast( - SigningDialogues, cls._skill.skill_context.signing_dialogues - ) - - # handlers - cls.fipa_handler = cast(FipaHandler, cls._skill.skill_context.handlers.fipa) - cls.oef_search_handler = cast( - OefSearchHandler, cls._skill.skill_context.handlers.oef_search - ) - cls.contract_api_handler = cast( - ContractApiHandler, cls._skill.skill_context.handlers.contract_api - ) - cls.signing_handler = cast( - SigningHandler, cls._skill.skill_context.handlers.signing - ) - cls.ledger_api_handler = cast( - LedgerApiHandler, cls._skill.skill_context.handlers.ledger_api - ) - - # models - cls.strategy = cast(Strategy, cls._skill.skill_context.strategy) - - cls.logger = cls._skill.skill_context.logger - - # mocked objects - cls.ledger_id = "some_ledger_id" - cls.contract_id = "some_contract_id" - cls.contract_address = "some_contract_address" - cls.callable = "some_callable" - cls.body = {"some_key": "some_value"} - cls.kwargs = Kwargs(cls.body) - cls.address = "some_address" - cls.mocked_terms = Terms( - cls.ledger_id, - cls._skill.skill_context.agent_address, - "counterprty", - {"currency_id": 50}, - {"good_id": -10}, - "some_nonce", - ) - cls.mocked_query = Query( - [Constraint("some_attribute_name", ConstraintType("==", "some_value"))], - DataModel( - "some_data_model_name", - [ - Attribute( - "some_attribute_name", - str, - False, - "Some attribute descriptions.", - ) - ], - ), - ) - cls.mocked_proposal = Description( - { - "contract_address": "some_contract_address", - "token_id": "123456", - "trade_nonce": "876438756348568", - "from_supply": "543", - "to_supply": "432", - "value": "67", - } - ) - cls.mocked_raw_tx = (RawTransaction(cls.ledger_id, {"some_key": "some_value"}),) - cls.mocked_raw_msg = RawMessage(cls.ledger_id, b"some_body") - - # list of messages - cls.list_of_fipa_messages = ( - DialogueMessage(FipaMessage.Performative.CFP, {"query": cls.mocked_query}), - DialogueMessage( - FipaMessage.Performative.PROPOSE, {"proposal": cls.mocked_proposal} - ), - ) - cls.list_of_oef_search_messages = ( - DialogueMessage( - OefSearchMessage.Performative.SEARCH_SERVICES, - {"query": cls.mocked_query}, - ), - ) - cls.list_of_contract_api_messages = ( - DialogueMessage( - ContractApiMessage.Performative.GET_RAW_MESSAGE, - { - "ledger_id": cls.ledger_id, - "contract_id": cls.contract_id, - "contract_address": cls.contract_address, - "callable": cls.callable, - "kwargs": cls.kwargs, - }, - ), - ) - cls.list_of_signing_messages = ( - DialogueMessage( - SigningMessage.Performative.SIGN_MESSAGE, - {"terms": cls.mocked_terms, "raw_message": cls.mocked_raw_msg}, - ), - ) - cls.list_of_ledger_api_messages = ( - DialogueMessage( - LedgerApiMessage.Performative.GET_BALANCE, - {"ledger_id": cls.ledger_id, "address": "some_address"}, - ), - ) diff --git a/tests/test_packages/test_skills/test_erc1155_client/test_behaviours.py b/tests/test_packages/test_skills/test_erc1155_client/test_behaviours.py deleted file mode 100644 index ff2ed889f6..0000000000 --- a/tests/test_packages/test_skills/test_erc1155_client/test_behaviours.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the behaviour classes of the erc1155_client skill.""" - -from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage -from packages.fetchai.protocols.oef_search.message import OefSearchMessage -from packages.fetchai.skills.erc1155_client.behaviours import LEDGER_API_ADDRESS - -from tests.test_packages.test_skills.test_erc1155_client.intermediate_class import ( - ERC1155ClientTestCase, -) - - -class TestSearchBehaviour(ERC1155ClientTestCase): - """Test search behaviour of erc1155_client.""" - - def test_setup(self): - """Test the setup method of the search behaviour.""" - # operation - self.search_behaviour.setup() - - # after - self.assert_quantity_in_outbox(1) - has_attributes, error_str = self.message_has_attributes( - actual_message=self.get_message_from_outbox(), - message_type=LedgerApiMessage, - performative=LedgerApiMessage.Performative.GET_BALANCE, - to=LEDGER_API_ADDRESS, - sender=str(self.skill.public_id), - ledger_id=self.strategy.ledger_id, - address=self.skill.skill_context.agent_address, - ) - assert has_attributes, error_str - - def test_act_is_searching(self): - """Test the act method of the search behaviour where is_searching is True.""" - # setup - self.strategy._is_searching = True - - # operation - self.search_behaviour.act() - - # after - self.assert_quantity_in_outbox(1) - has_attributes, error_str = self.message_has_attributes( - actual_message=self.get_message_from_outbox(), - message_type=OefSearchMessage, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - to=self.skill.skill_context.search_service_address, - sender=str(self.skill.public_id), - query=self.skill.skill_context.strategy.get_location_and_service_query(), - ) - assert has_attributes, error_str - - def test_act_not_is_searching(self): - """Test the act method of the search behaviour where is_searching is False.""" - # setup - self.strategy.is_searching = False - - # operation - self.search_behaviour.act() - - # after - self.assert_quantity_in_outbox(0) - - def test_teardown(self): - """Test the teardown method of the search behaviour.""" - assert self.search_behaviour.teardown() is None - self.assert_quantity_in_outbox(0) diff --git a/tests/test_packages/test_skills/test_erc1155_client/test_dialogues.py b/tests/test_packages/test_skills/test_erc1155_client/test_dialogues.py deleted file mode 100644 index 115221cd65..0000000000 --- a/tests/test_packages/test_skills/test_erc1155_client/test_dialogues.py +++ /dev/null @@ -1,188 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021 Valory AG -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the dialogue classes of the erc1155_client skill.""" - -import pytest - -from aea.exceptions import AEAEnforceError -from aea.protocols.dialogue.base import DialogueLabel -from aea.test_tools.test_skill import COUNTERPARTY_AGENT_ADDRESS - -from packages.fetchai.protocols.contract_api.message import ContractApiMessage -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.protocols.fipa.message import FipaMessage -from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage -from packages.fetchai.protocols.oef_search.message import OefSearchMessage -from packages.fetchai.skills.erc1155_client.dialogues import ( - ContractApiDialogue, - DefaultDialogue, - FipaDialogue, - LedgerApiDialogue, - OefSearchDialogue, - SigningDialogue, -) -from packages.open_aea.protocols.signing.message import SigningMessage - -from tests.test_packages.test_skills.test_erc1155_client.intermediate_class import ( - ERC1155ClientTestCase, -) - - -class TestDialogues(ERC1155ClientTestCase): - """Test dialogue classes of erc1155_client.""" - - def test_contract_api_dialogue(self): - """Test the ContractApiDialogue class.""" - contract_api_dialogue = ContractApiDialogue( - DialogueLabel( - ("", ""), - COUNTERPARTY_AGENT_ADDRESS, - self.skill.skill_context.agent_address, - ), - self.skill.skill_context.agent_address, - role=ContractApiDialogue.Role.AGENT, - ) - - # associated_fipa_dialogue - with pytest.raises(ValueError, match="Associated fipa dialogue not set!"): - assert contract_api_dialogue.associated_fipa_dialogue - fipa_dialogue = FipaDialogue( - DialogueLabel( - ("", ""), - COUNTERPARTY_AGENT_ADDRESS, - self.skill.skill_context.agent_address, - ), - self.skill.skill_context.agent_address, - role=FipaDialogue.Role.BUYER, - ) - contract_api_dialogue.associated_fipa_dialogue = fipa_dialogue - with pytest.raises( - AEAEnforceError, match="Associated fipa dialogue already set!" - ): - contract_api_dialogue.associated_fipa_dialogue = fipa_dialogue - assert contract_api_dialogue.associated_fipa_dialogue == fipa_dialogue - - # terms - with pytest.raises(ValueError, match="Terms not set!"): - assert contract_api_dialogue.terms - contract_api_dialogue.terms = self.mocked_terms - with pytest.raises(AEAEnforceError, match="Terms already set!"): - contract_api_dialogue.terms = self.mocked_terms - assert contract_api_dialogue.terms == self.mocked_terms - - def test_contract_api_dialogues(self): - """Test the ContractApiDialogues class.""" - _, dialogue = self.contract_api_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION, - ledger_id=self.ledger_id, - contract_id=self.contract_id, - callable=self.callable, - kwargs=self.kwargs, - ) - assert dialogue.role == ContractApiDialogue.Role.AGENT - assert dialogue.self_address == str(self.skill.skill_context.skill_id) - - def test_default_dialogues(self): - """Test the DefaultDialogues class.""" - _, dialogue = self.default_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=DefaultMessage.Performative.BYTES, - content=b"some_content", - ) - assert dialogue.role == DefaultDialogue.Role.AGENT - assert dialogue.self_address == self.skill.skill_context.agent_address - - def test_fipa_dialogues(self): - """Test the FipaDialogues class.""" - _, dialogue = self.fipa_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=FipaMessage.Performative.CFP, - query=self.mocked_query, - ) - assert dialogue.role == FipaDialogue.Role.SELLER - assert dialogue.self_address == self.skill.skill_context.agent_address - - def test_ledger_api_dialogues(self): - """Test the LedgerApiDialogues class.""" - _, dialogue = self.ledger_api_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=LedgerApiMessage.Performative.GET_BALANCE, - ledger_id=self.ledger_id, - address=self.address, - ) - assert dialogue.role == LedgerApiDialogue.Role.AGENT - assert dialogue.self_address == str(self.skill.skill_context.skill_id) - - def test_oef_search_dialogues(self): - """Test the OefSearchDialogues class.""" - _, dialogue = self.oef_search_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=self.mocked_query, - ) - assert dialogue.role == OefSearchDialogue.Role.AGENT - assert dialogue.self_address == str(self.skill.skill_context.skill_id) - - def test_signing_dialogue(self): - """Test the SigningDialogue class.""" - signing_dialogue = SigningDialogue( - DialogueLabel( - ("", ""), - COUNTERPARTY_AGENT_ADDRESS, - self.skill.skill_context.agent_address, - ), - self.skill.skill_context.agent_address, - role=ContractApiDialogue.Role.AGENT, - ) - - # associated_contract_api_dialogue - with pytest.raises( - ValueError, match="Associated contract api dialogue not set!" - ): - assert signing_dialogue.associated_contract_api_dialogue - contract_api_dialogue = ContractApiDialogue( - DialogueLabel( - ("", ""), - COUNTERPARTY_AGENT_ADDRESS, - self.skill.skill_context.agent_address, - ), - self.skill.skill_context.agent_address, - role=ContractApiDialogue.Role.AGENT, - ) - signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue - with pytest.raises( - AEAEnforceError, match="Associated contract api dialogue already set!" - ): - signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue - assert ( - signing_dialogue.associated_contract_api_dialogue == contract_api_dialogue - ) - - def test_signing_dialogues(self): - """Test the SigningDialogues class.""" - _, dialogue = self.signing_dialogues.create( - counterparty=COUNTERPARTY_AGENT_ADDRESS, - performative=SigningMessage.Performative.SIGN_TRANSACTION, - terms=self.mocked_terms, - raw_transaction=self.mocked_raw_tx, - ) - assert dialogue.role == SigningDialogue.Role.SKILL - assert dialogue.self_address == str(self.skill.skill_context.skill_id) diff --git a/tests/test_packages/test_skills/test_erc1155_client/test_handlers.py b/tests/test_packages/test_skills/test_erc1155_client/test_handlers.py deleted file mode 100644 index d722e25f69..0000000000 --- a/tests/test_packages/test_skills/test_erc1155_client/test_handlers.py +++ /dev/null @@ -1,860 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2022 Valory AG -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the handler classes of the erc1155_client skill.""" - -import logging -from typing import cast -from unittest.mock import patch - -from aea.helpers.search.models import Description -from aea.helpers.transaction.base import RawMessage, State, Terms -from aea.test_tools.test_skill import COUNTERPARTY_AGENT_ADDRESS - -from packages.fetchai.protocols.contract_api.message import ContractApiMessage -from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.protocols.fipa.message import FipaMessage -from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage -from packages.fetchai.protocols.oef_search.message import OefSearchMessage -from packages.fetchai.skills.erc1155_client.dialogues import ( - ContractApiDialogue, - FipaDialogue, - LedgerApiDialogue, - OefSearchDialogue, - SigningDialogue, -) -from packages.fetchai.skills.erc1155_client.handlers import LEDGER_API_ADDRESS -from packages.open_aea.protocols.signing.message import SigningMessage - -from tests.test_packages.test_skills.test_erc1155_client.intermediate_class import ( - ERC1155ClientTestCase, -) - - -class TestFipaHandler(ERC1155ClientTestCase): - """Test fipa handler of erc1155_client.""" - - def test_setup(self): - """Test the setup method of the fipa handler.""" - assert self.fipa_handler.setup() is None - self.assert_quantity_in_outbox(0) - - def test_handle_unidentified_dialogue(self): - """Test the _handle_unidentified_dialogue method of the fipa handler.""" - # setup - incorrect_dialogue_reference = ("", "") - incoming_message = cast( - FipaMessage, - self.build_incoming_message( - message_type=FipaMessage, - dialogue_reference=incorrect_dialogue_reference, - performative=FipaMessage.Performative.ACCEPT, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.fipa_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"unidentified dialogue for message={incoming_message}.", - ) - - self.assert_quantity_in_outbox(1) - has_attributes, error_str = self.message_has_attributes( - actual_message=self.get_message_from_outbox(), - message_type=DefaultMessage, - performative=DefaultMessage.Performative.ERROR, - to=incoming_message.sender, - sender=self.skill.skill_context.agent_address, - error_code=DefaultMessage.ErrorCode.INVALID_DIALOGUE, - error_msg="Invalid dialogue.", - error_data={"fipa_message": incoming_message.encode()}, - ) - assert has_attributes, error_str - - def test_handle_propose_i(self): - """Test the _handle_propose method of the fipa handler where all expected keys exist in the proposal.""" - # setup - fipa_dialogue = cast( - FipaDialogue, - self.prepare_skill_dialogue( - dialogues=self.fipa_dialogues, - messages=self.list_of_fipa_messages[:1], - ), - ) - incoming_message = cast( - FipaMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=fipa_dialogue, - performative=FipaMessage.Performative.PROPOSE, - proposal=self.mocked_proposal, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.fipa_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received valid PROPOSE from sender={COUNTERPARTY_AGENT_ADDRESS[-5:]}: proposal={incoming_message.proposal.values}", - ) - - self.assert_quantity_in_outbox(1) - message = self.get_message_from_outbox() - has_attributes, error_str = self.message_has_attributes( - actual_message=message, - message_type=ContractApiMessage, - performative=ContractApiMessage.Performative.GET_RAW_MESSAGE, - to=LEDGER_API_ADDRESS, - sender=str(self.skill.skill_context.skill_id), - ledger_id=self.strategy.ledger_id, - contract_id=self.strategy.contract_id, - contract_address=incoming_message.proposal.values["contract_address"], - callable="get_hash_single", - kwargs=ContractApiMessage.Kwargs( - { - "from_address": incoming_message.sender, - "to_address": self.skill.skill_context.agent_address, - "token_id": int(incoming_message.proposal.values["token_id"]), - "from_supply": int(incoming_message.proposal.values["from_supply"]), - "to_supply": int(incoming_message.proposal.values["to_supply"]), - "value": int(incoming_message.proposal.values["value"]), - "trade_nonce": int(incoming_message.proposal.values["trade_nonce"]), - } - ), - ) - assert has_attributes, error_str - - contract_api_dialogue = cast( - ContractApiDialogue, self.contract_api_dialogues.get_dialogue(message) - ) - - expected_terms = Terms( - ledger_id=self.strategy.ledger_id, - sender_address=self.skill.skill_context.agent_address, - counterparty_address=incoming_message.sender, - amount_by_currency_id={}, - quantities_by_good_id={ - str(incoming_message.proposal.values["token_id"]): int( - incoming_message.proposal.values["from_supply"] - ) - - int(incoming_message.proposal.values["to_supply"]) - }, - is_sender_payable_tx_fee=False, - nonce=str(incoming_message.proposal.values["trade_nonce"]), - ) - assert contract_api_dialogue.terms == expected_terms - assert contract_api_dialogue.associated_fipa_dialogue == fipa_dialogue - - mock_logger.assert_any_call( - logging.INFO, - "requesting single hash message from contract api...", - ) - - def test_handle_propose_ii(self): - """Test the _handle_propose method of the fipa handler where some expected keys do NOT exist in the proposal.""" - # setup - invalid_proposal = Description({"some_key": "v1", "some_key_2": "12"}) - - fipa_dialogue = cast( - FipaDialogue, - self.prepare_skill_dialogue( - dialogues=self.fipa_dialogues, - messages=self.list_of_fipa_messages[:1], - ), - ) - incoming_message = cast( - FipaMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=fipa_dialogue, - performative=FipaMessage.Performative.PROPOSE, - proposal=invalid_proposal, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.fipa_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid PROPOSE from sender={COUNTERPARTY_AGENT_ADDRESS[-5:]}: proposal={incoming_message.proposal.values}", - ) - - def test_handle_invalid(self): - """Test the _handle_invalid method of the fipa handler.""" - # setup - fipa_dialogue = cast( - FipaDialogue, - self.prepare_skill_dialogue( - dialogues=self.fipa_dialogues, - messages=self.list_of_fipa_messages[:2], - ), - ) - incoming_message = cast( - FipaMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=fipa_dialogue, - performative=FipaMessage.Performative.ACCEPT, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.fipa_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.WARNING, - f"cannot handle fipa message of performative={incoming_message.performative} in dialogue={fipa_dialogue}.", - ) - - def test_teardown(self): - """Test the teardown method of the fipa handler.""" - assert self.fipa_handler.teardown() is None - self.assert_quantity_in_outbox(0) - - -class TestOefSearchHandler(ERC1155ClientTestCase): - """Test oef_search handler of erc1155_client.""" - - is_agent_to_agent_messages = False - - def test_setup(self): - """Test the setup method of the oef_search handler.""" - assert self.oef_search_handler.setup() is None - self.assert_quantity_in_outbox(0) - - def test_handle_unidentified_dialogue(self): - """Test the _handle_unidentified_dialogue method of the oef_search handler.""" - # setup - incorrect_dialogue_reference = ("", "") - incoming_message = cast( - OefSearchMessage, - self.build_incoming_message( - message_type=OefSearchMessage, - dialogue_reference=incorrect_dialogue_reference, - performative=OefSearchMessage.Performative.OEF_ERROR, - oef_error_operation=OefSearchMessage.OefErrorOperation.REGISTER_SERVICE, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.oef_search_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid oef_search message={incoming_message}, unidentified dialogue.", - ) - - def test_handle_error(self): - """Test the _handle_error method of the oef_search handler.""" - # setup - oef_search_dialogue = cast( - OefSearchDialogue, - self.prepare_skill_dialogue( - dialogues=self.oef_search_dialogues, - messages=self.list_of_oef_search_messages[:1], - ), - ) - incoming_message = cast( - OefSearchMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=oef_search_dialogue, - performative=OefSearchMessage.Performative.OEF_ERROR, - oef_error_operation=OefSearchMessage.OefErrorOperation.REGISTER_SERVICE, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.oef_search_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received oef_search error message={incoming_message} in dialogue={oef_search_dialogue}.", - ) - - def test_handle_search_i(self): - """Test the _handle_search method of the oef_search handler where the number of agents found is NOT 0.""" - # setup - agents = ("agent_1", "agent_2") - oef_search_dialogue = cast( - OefSearchDialogue, - self.prepare_skill_dialogue( - dialogues=self.oef_search_dialogues, - messages=self.list_of_oef_search_messages[:1], - ), - ) - incoming_message = cast( - OefSearchMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=oef_search_dialogue, - performative=OefSearchMessage.Performative.SEARCH_RESULT, - agents=agents, - agents_info=OefSearchMessage.AgentsInfo( - { - "agent_1": {"key_1": "value_1", "key_2": "value_2"}, - "agent_2": {"key_3": "value_3", "key_4": "value_4"}, - } - ), - ), - ) - - # before - assert self.strategy.is_searching is True - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.oef_search_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"found agents={list(map(lambda x: x[-5:], incoming_message.agents))}, stopping search.", - ) - - assert self.strategy.is_searching is False - - self.assert_quantity_in_outbox(len(agents)) - for agent in agents: - has_attributes, error_str = self.message_has_attributes( - actual_message=self.get_message_from_outbox(), - message_type=FipaMessage, - performative=FipaMessage.Performative.CFP, - to=agent, - sender=self.skill.skill_context.agent_address, - query=self.strategy.get_service_query(), - ) - assert has_attributes, error_str - mock_logger.assert_any_call( - logging.INFO, f"sending CFP to agent={agent[-5:]}" - ) - - def test_handle_search_ii(self): - """Test the _handle_search method of the oef_search handler where the number of agents found is 0.""" - # setup - agents = tuple() - oef_search_dialogue = cast( - OefSearchDialogue, - self.prepare_skill_dialogue( - dialogues=self.oef_search_dialogues, - messages=self.list_of_oef_search_messages[:1], - ), - ) - incoming_message = cast( - OefSearchMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=oef_search_dialogue, - performative=OefSearchMessage.Performative.SEARCH_RESULT, - agents=agents, - agents_info=OefSearchMessage.AgentsInfo({}), - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.oef_search_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"found no agents in dialogue={oef_search_dialogue}, continue searching.", - ) - - def test_handle_invalid(self): - """Test the _handle_invalid method of the oef_search handler.""" - # setup - incoming_message = cast( - OefSearchMessage, - self.build_incoming_message( - message_type=OefSearchMessage, - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=self.mocked_proposal, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.oef_search_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.WARNING, - f"cannot handle oef_search message of performative={incoming_message.performative} in dialogue={self.oef_search_dialogues.get_dialogue(incoming_message)}.", - ) - - def test_teardown(self): - """Test the teardown method of the oef_search handler.""" - assert self.oef_search_handler.teardown() is None - self.assert_quantity_in_outbox(0) - - -class TestContractApiHandler(ERC1155ClientTestCase): - """Test contract_api handler of erc1155_client.""" - - is_agent_to_agent_messages = False - - def test_setup(self): - """Test the setup method of the contract_api handler.""" - assert self.contract_api_handler.setup() is None - self.assert_quantity_in_outbox(0) - - def test_handle_unidentified_dialogue(self): - """Test the _handle_unidentified_dialogue method of the signing handler.""" - # setup - incorrect_dialogue_reference = ("", "") - incoming_message = cast( - ContractApiMessage, - self.build_incoming_message( - message_type=ContractApiMessage, - dialogue_reference=incorrect_dialogue_reference, - performative=ContractApiMessage.Performative.STATE, - state=State(self.ledger_id, self.body), - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.contract_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid contract_api message={incoming_message}, unidentified dialogue.", - ) - - def test_handle_raw_message(self): - """Test the _handle_raw_message method of the signing handler.""" - # setup - contract_api_dialogue = cast( - ContractApiDialogue, - self.prepare_skill_dialogue( - dialogues=self.contract_api_dialogues, - messages=self.list_of_contract_api_messages[:1], - ), - ) - contract_api_dialogue.terms = self.mocked_terms - incoming_message = cast( - ContractApiMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=contract_api_dialogue, - performative=ContractApiMessage.Performative.RAW_MESSAGE, - raw_message=self.mocked_raw_msg, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.contract_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, f"received raw message={incoming_message}" - ) - - self.assert_quantity_in_decision_making_queue(1) - message = self.get_message_from_decision_maker_inbox() - has_attributes, error_str = self.message_has_attributes( - actual_message=message, - message_type=SigningMessage, - performative=SigningMessage.Performative.SIGN_MESSAGE, - to=self.skill.skill_context.decision_maker_address, - sender=str(self.skill.skill_context.skill_id), - raw_message=RawMessage( - incoming_message.raw_message.ledger_id, - incoming_message.raw_message.body, - is_deprecated_mode=True, - ), - terms=contract_api_dialogue.terms, - ) - assert has_attributes, error_str - - assert ( - cast( - SigningDialogue, self.signing_dialogues.get_dialogue(message) - ).associated_contract_api_dialogue - == contract_api_dialogue - ) - - mock_logger.assert_any_call( - logging.INFO, - "proposing the transaction to the decision maker. Waiting for confirmation ...", - ) - - def test_handle_error(self): - """Test the _handle_error method of the signing handler.""" - # setup - contract_api_dialogue = cast( - ContractApiDialogue, - self.prepare_skill_dialogue( - dialogues=self.contract_api_dialogues, - messages=self.list_of_contract_api_messages[:1], - ), - ) - incoming_message = cast( - ContractApiMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=contract_api_dialogue, - performative=ContractApiMessage.Performative.ERROR, - data=b"some_data", - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.contract_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received contract_api error message={incoming_message} in dialogue={contract_api_dialogue}.", - ) - - def test_handle_invalid(self): - """Test the _handle_invalid method of the signing handler.""" - # setup - invalid_performative = ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION - incoming_message = cast( - ContractApiMessage, - self.build_incoming_message( - message_type=ContractApiMessage, - dialogue_reference=("1", ""), - performative=invalid_performative, - ledger_id=self.ledger_id, - contract_id=self.contract_id, - callable=self.callable, - kwargs=self.kwargs, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.contract_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.WARNING, - f"cannot handle contract_api message of performative={invalid_performative} in dialogue={self.contract_api_dialogues.get_dialogue(incoming_message)}.", - ) - - def test_teardown(self): - """Test the teardown method of the contract_api handler.""" - assert self.contract_api_handler.teardown() is None - self.assert_quantity_in_outbox(0) - - -class TestSigningHandler(ERC1155ClientTestCase): - """Test signing handler of erc1155_client.""" - - is_agent_to_agent_messages = False - - def test_setup(self): - """Test the setup method of the signing handler.""" - assert self.signing_handler.setup() is None - self.assert_quantity_in_outbox(0) - - def test_handle_unidentified_dialogue(self): - """Test the _handle_unidentified_dialogue method of the signing handler.""" - # setup - incorrect_dialogue_reference = ("", "") - incoming_message = cast( - SigningMessage, - self.build_incoming_message( - message_type=SigningMessage, - dialogue_reference=incorrect_dialogue_reference, - performative=SigningMessage.Performative.ERROR, - error_code=SigningMessage.ErrorCode.UNSUCCESSFUL_MESSAGE_SIGNING, - to=str(self.skill.skill_context.skill_id), - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.signing_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid signing message={incoming_message}, unidentified dialogue.", - ) - - def test_handle_signed_message( - self, - ): - """Test the _handle_signed_message method of the signing handler.""" - # setup - signing_counterparty = self.skill.skill_context.decision_maker_address - - fipa_dialogue = cast( - FipaDialogue, - self.prepare_skill_dialogue( - dialogues=self.fipa_dialogues, - messages=self.list_of_fipa_messages[:2], - counterparty=COUNTERPARTY_AGENT_ADDRESS, - ), - ) - signing_dialogue = cast( - SigningDialogue, - self.prepare_skill_dialogue( - dialogues=self.signing_dialogues, - messages=self.list_of_signing_messages[:1], - counterparty=signing_counterparty, - ), - ) - contract_api_dialogue = cast( - ContractApiDialogue, - self.prepare_skill_dialogue( - dialogues=self.contract_api_dialogues, - messages=self.list_of_contract_api_messages[:4], - ), - ) - - signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue - contract_api_dialogue.associated_fipa_dialogue = fipa_dialogue - - incoming_message = cast( - SigningMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=signing_dialogue, - performative=SigningMessage.Performative.SIGNED_MESSAGE, - signed_message=SigningMessage.SignedMessage( - self.ledger_id, - "some_body", - ), - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.signing_handler.handle(incoming_message) - - # after - fipa_dialogue_opponent = fipa_dialogue.dialogue_label.dialogue_opponent_addr - mock_logger.assert_any_call( - logging.INFO, - f"sending ACCEPT_W_INFORM to agent={fipa_dialogue_opponent[-5:]}: tx_signature={incoming_message.signed_message}", - ) - - self.assert_quantity_in_outbox(1) - message = self.get_message_from_outbox() - has_attributes, error_str = self.message_has_attributes( - actual_message=message, - message_type=FipaMessage, - performative=FipaMessage.Performative.ACCEPT_W_INFORM, - to=fipa_dialogue_opponent, - sender=self.skill.skill_context.agent_address, - info={"tx_signature": incoming_message.signed_message.body}, - ) - assert has_attributes, error_str - - def test_handle_error(self): - """Test the _handle_error method of the signing handler.""" - # setup - signing_counterparty = self.skill.skill_context.decision_maker_address - signing_dialogue = self.prepare_skill_dialogue( - dialogues=self.signing_dialogues, - messages=self.list_of_signing_messages[:1], - counterparty=signing_counterparty, - ) - incoming_message = cast( - SigningMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=signing_dialogue, - performative=SigningMessage.Performative.ERROR, - error_code=SigningMessage.ErrorCode.UNSUCCESSFUL_TRANSACTION_SIGNING, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.signing_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"transaction signing was not successful. Error_code={incoming_message.error_code} in dialogue={signing_dialogue}", - ) - - def test_handle_invalid(self): - """Test the _handle_invalid method of the signing handler.""" - # setup - invalid_performative = SigningMessage.Performative.SIGN_TRANSACTION - incoming_message = self.build_incoming_message( - message_type=SigningMessage, - dialogue_reference=("1", ""), - performative=invalid_performative, - terms=self.mocked_terms, - raw_transaction=SigningMessage.RawTransaction( - self.ledger_id, {"some_key": "some_value"} - ), - to=str(self.skill.skill_context.skill_id), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.signing_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.WARNING, - f"cannot handle signing message of performative={invalid_performative} in dialogue={self.signing_dialogues.get_dialogue(incoming_message)}.", - ) - - def test_teardown(self): - """Test the teardown method of the signing handler.""" - assert self.signing_handler.teardown() is None - self.assert_quantity_in_outbox(0) - - -class TestLedgerApiHandler(ERC1155ClientTestCase): - """Test ledger_api handler of erc1155_client.""" - - is_agent_to_agent_messages = False - - def test_setup(self): - """Test the setup method of the ledger_api handler.""" - assert self.ledger_api_handler.setup() is None - self.assert_quantity_in_outbox(0) - - def test_handle_unidentified_dialogue(self): - """Test the _handle_unidentified_dialogue method of the ledger_api handler.""" - # setup - incorrect_dialogue_reference = ("", "") - incoming_message = cast( - LedgerApiMessage, - self.build_incoming_message( - message_type=LedgerApiMessage, - dialogue_reference=incorrect_dialogue_reference, - performative=LedgerApiMessage.Performative.BALANCE, - ledger_id=self.ledger_id, - balance=10, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.ledger_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received invalid ledger_api message={incoming_message}, unidentified dialogue.", - ) - - def test_handle_balance(self): - """Test the _handle_balance method of the ledger_api handler.""" - # setup - balance = 10 - ledger_api_dialogue = cast( - LedgerApiDialogue, - self.prepare_skill_dialogue( - dialogues=self.ledger_api_dialogues, - messages=self.list_of_ledger_api_messages[:1], - counterparty=LEDGER_API_ADDRESS, - ), - ) - incoming_message = cast( - LedgerApiMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=ledger_api_dialogue, - performative=LedgerApiMessage.Performative.BALANCE, - ledger_id=self.ledger_id, - balance=balance, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.ledger_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"starting balance on {self.ledger_id} ledger={incoming_message.balance}.", - ) - - def test_handle_error(self): - """Test the _handle_error method of the ledger_api handler.""" - # setup - ledger_api_dialogue = cast( - LedgerApiDialogue, - self.prepare_skill_dialogue( - dialogues=self.ledger_api_dialogues, - messages=self.list_of_ledger_api_messages[:1], - ), - ) - incoming_message = cast( - LedgerApiMessage, - self.build_incoming_message_for_skill_dialogue( - dialogue=ledger_api_dialogue, - performative=LedgerApiMessage.Performative.ERROR, - code=1, - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.ledger_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.INFO, - f"received ledger_api error message={incoming_message} in dialogue={ledger_api_dialogue}.", - ) - - def test_handle_invalid(self): - """Test the _handle_invalid method of the ledger_api handler.""" - # setup - invalid_performative = LedgerApiMessage.Performative.GET_BALANCE - incoming_message = cast( - LedgerApiMessage, - self.build_incoming_message( - message_type=LedgerApiMessage, - dialogue_reference=("1", ""), - performative=invalid_performative, - ledger_id=self.ledger_id, - address=self.address, - to=str(self.skill.skill_context.skill_id), - ), - ) - - # operation - with patch.object(self.logger, "log") as mock_logger: - self.ledger_api_handler.handle(incoming_message) - - # after - mock_logger.assert_any_call( - logging.WARNING, - f"cannot handle ledger_api message of performative={invalid_performative} in dialogue={self.ledger_api_dialogues.get_dialogue(incoming_message)}.", - ) - - def test_teardown(self): - """Test the teardown method of the ledger_api handler.""" - assert self.ledger_api_handler.teardown() is None - self.assert_quantity_in_outbox(0) diff --git a/tests/test_packages/test_skills/test_erc1155_client/test_strategy.py b/tests/test_packages/test_skills/test_erc1155_client/test_strategy.py deleted file mode 100644 index 9cf203f1c5..0000000000 --- a/tests/test_packages/test_skills/test_erc1155_client/test_strategy.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -"""This module contains the tests of the strategy class of the erc1155_client skill.""" - -from aea.helpers.search.models import Constraint, ConstraintType, Query - -from packages.fetchai.skills.erc1155_client.strategy import ( - CONTRACT_ID, - SIMPLE_SERVICE_MODEL, -) - -from tests.test_packages.test_skills.test_erc1155_client.intermediate_class import ( - ERC1155ClientTestCase, -) - - -class TestStrategy(ERC1155ClientTestCase): - """Test Strategy of erc1155_client.""" - - def test_properties(self): - """Test the properties of Strategy class.""" - assert self.strategy.ledger_id == self.skill.skill_context.default_ledger_id - assert self.strategy.contract_id == str(CONTRACT_ID) - - def test_get_location_and_service_query(self): - """Test the get_location_and_service_query method of the Strategy class.""" - query = self.strategy.get_location_and_service_query() - - assert type(query) == Query - assert len(query.constraints) == 2 - assert query.model is None - - location_constraint = Constraint( - "location", - ConstraintType( - "distance", (self.strategy._agent_location, self.search_radius) - ), - ) - assert query.constraints[0] == location_constraint - - service_key_constraint = Constraint( - self.search_query["search_key"], - ConstraintType( - self.search_query["constraint_type"], - self.search_query["search_value"], - ), - ) - assert query.constraints[1] == service_key_constraint - - def test_get_service_query(self): - """Test the get_service_query method of the Strategy class.""" - query = self.strategy.get_service_query() - - assert type(query) == Query - assert len(query.constraints) == 1 - - assert query.model == SIMPLE_SERVICE_MODEL - - service_key_constraint = Constraint( - self.search_query["search_key"], - ConstraintType( - self.search_query["constraint_type"], - self.search_query["search_value"], - ), - ) - assert query.constraints[0] == service_key_constraint From 83e1918e7a1745e6baa29a6df0c83a35bfce3f79 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 06:14:33 +0000 Subject: [PATCH 42/93] feat: port protocols tests into packages --- aea/cli/test.py | 12 +- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/gym_aea/aea-config.yaml | 10 +- .../agents/my_first_aea/aea-config.yaml | 8 +- .../fetchai/connections/gym/connection.yaml | 2 +- .../connections/http_client/connection.yaml | 2 +- .../connections/http_server/connection.yaml | 2 +- .../connections/ledger/connection.yaml | 2 +- .../fetchai/connections/local/connection.yaml | 6 +- .../fetchai/connections/stub/connection.yaml | 5 +- .../fetchai/protocols/default/protocol.yaml | 1 + .../protocols/default/tests/test_default.py | 212 +++++ packages/fetchai/protocols/fipa/protocol.yaml | 1 + .../fetchai/protocols/fipa/tests/test_fipa.py | 863 ++++++++++++++++++ packages/fetchai/protocols/gym/protocol.yaml | 1 + .../fetchai/protocols/gym/tests/test_gym.py | 421 +++++++++ packages/fetchai/protocols/http/protocol.yaml | 1 + .../fetchai/protocols/http/tests/test_http.py | 322 +++++++ .../protocols/ledger_api/protocol.yaml | 1 + .../ledger_api/tests/test_ledger_api.py | 669 ++++++++++++++ .../protocols/oef_search/protocol.yaml | 1 + .../oef_search/tests/test_oef_search.py | 490 ++++++++++ .../protocols/state_update/protocol.yaml | 1 + .../state_update/tests/test_state_update.py | 233 +++++ packages/fetchai/protocols/tac/protocol.yaml | 1 + .../fetchai/protocols/tac/tests/test_tac.py | 574 ++++++++++++ packages/fetchai/skills/echo/skill.yaml | 2 +- .../fetchai/skills/erc1155_client/skill.yaml | 10 +- .../fetchai/skills/erc1155_deploy/skill.yaml | 10 +- packages/fetchai/skills/error/skill.yaml | 2 +- .../skills/fipa_dummy_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 10 +- .../fetchai/skills/generic_seller/skill.yaml | 10 +- packages/fetchai/skills/gym/skill.yaml | 6 +- packages/fetchai/skills/http_echo/skill.yaml | 4 +- packages/hashes.csv | 58 +- .../open_aea/agents/gym_aea/aea-config.yaml | 10 +- .../open_aea/agents/http_echo/aea-config.yaml | 8 +- .../agents/my_first_aea/aea-config.yaml | 8 +- 39 files changed, 3887 insertions(+), 96 deletions(-) create mode 100644 packages/fetchai/protocols/default/tests/test_default.py create mode 100644 packages/fetchai/protocols/fipa/tests/test_fipa.py create mode 100644 packages/fetchai/protocols/gym/tests/test_gym.py create mode 100644 packages/fetchai/protocols/http/tests/test_http.py create mode 100644 packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py create mode 100644 packages/fetchai/protocols/oef_search/tests/test_oef_search.py create mode 100644 packages/fetchai/protocols/state_update/tests/test_state_update.py create mode 100644 packages/fetchai/protocols/tac/tests/test_tac.py diff --git a/aea/cli/test.py b/aea/cli/test.py index 2b195d8cca..8e95f943d6 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -19,6 +19,7 @@ # ------------------------------------------------------------------------------ """Implementation of the 'aea test' command.""" +import os import sys from pathlib import Path from typing import Callable, Optional, Sequence, Set, cast @@ -107,23 +108,17 @@ def skill(ctx: Context, skill_public_id: PublicId, args: Sequence[str]) -> None: @click.argument( "path", type=click.Path(exists=True, file_okay=False, dir_okay=True), required=True ) -@click.option( - "--registry-path", - type=click.Path(exists=True, file_okay=False, dir_okay=True), -) @pytest_args @pass_ctx def by_path( ctx: Context, path: str, - registry_path: Optional[str], args: Sequence[str], ) -> None: """Executes a test suite of a package specified by a path.""" click.echo(f"Executing tests of package at {path}'...") full_path = Path(ctx.cwd) / Path(path) - registry_path = Path(registry_path or Path.cwd() / PACKAGES) - test_package_by_path(full_path, args, packages_dir=registry_path) + test_package_by_path(full_path, args, packages_dir=Path(ctx.registry_path)) def test_item( @@ -184,6 +179,9 @@ def test_package_by_path( "one of either aea_project_path or packages_dir must be specified", ) root_packages = aea_project_path if aea_project_path else packages_dir + + os.environ["PACKAGES_DIR"] = str(root_packages) + package_path_finder = ( find_component_directory_from_component_id if aea_project_path diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 5840b0e194..96c63b24e9 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq +- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 4da51758c2..f41f89ef76 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu +- fetchai/gym:0.20.0:bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 7e005205d6..304edb5ad3 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq +- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy +- fetchai/echo:0.19.0:bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index ff08db8c42..77a8fe97f3 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a class_name: GymConnection config: env: '' diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index e369ed2865..905568d13e 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -15,7 +15,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky class_name: HTTPClientConnection config: host: 127.0.0.1 diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index d46868784b..5d14d630f6 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -19,7 +19,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky class_name: HTTPServerConnection config: api_spec_path: null diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index 4a0ca716c7..805b2a7501 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae +- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u class_name: LedgerConnection config: ledger_apis: diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index d693220845..f044dfb512 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -15,9 +15,9 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy class_name: OEFLocalConnection config: {} excluded_protocols: [] diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index 01b4bec2b9..d4054f9397 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -10,13 +10,14 @@ fingerprint: README.md: bafybeiht3qtxpf2meyrveoghidjtdsz433wguz4wlxhzsiixpafkrjv7yy __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 + input_file: bafybeiftu27piztiu5bfxbvhqsbppgtseykyfot6wtlrrzeuzya6zrgpky tests/__init__.py: bafybeihodqbifehez7r4zalztsn5ildne4rxc6rvdhykl7vscghxi4v45i tests/test_stub.py: bafybeickhyxxbaygqa234xk4afjqklj46455rgghyhfcnbfb76e6lm3hpe fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/protocols/default/protocol.yaml b/packages/fetchai/protocols/default/protocol.yaml index 0971537b02..cbc269a779 100644 --- a/packages/fetchai/protocols/default/protocol.yaml +++ b/packages/fetchai/protocols/default/protocol.yaml @@ -15,6 +15,7 @@ fingerprint: dialogues.py: bafybeihzqqwczdvfzskslup72mpmzumic7irvgz274olbuqbdjm3hdnj4q message.py: bafybeigryznjuxefo5htam6xrrn7e6hfkki7h2sbaaxg22omcp4mhb7bf4 serialization.py: bafybeiefqupq73s7eczkga2t5yd622owcm6elj7fa4fm5hq236j3avwhpy + tests/test_default.py: bafybeifczqdqn6zj5qci2dv4oukkoaak5cxux6jvo73td3tcnxnprjw4ry fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/default/tests/test_default.py b/packages/fetchai/protocols/default/tests/test_default.py new file mode 100644 index 0000000000..faac2bd409 --- /dev/null +++ b/packages/fetchai/protocols/default/tests/test_default.py @@ -0,0 +1,212 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the messages module.""" + +from typing import Type +from unittest import mock +from unittest.mock import patch + +import pytest + +from aea.common import Address +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +from packages.fetchai.protocols.default.dialogues import ( + DefaultDialogue as BaseDefaultDialogue, +) +from packages.fetchai.protocols.default.dialogues import ( + DefaultDialogues as BaseDefaultDialogues, +) +from packages.fetchai.protocols.default.message import DefaultMessage + + +def test_default_bytes_serialization(): + """Test that the serialization for the 'simple' protocol works for the BYTES message.""" + expected_msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + msg_bytes = DefaultMessage.serializer.encode(expected_msg) + actual_msg = DefaultMessage.serializer.decode(msg_bytes) + assert expected_msg == actual_msg + + +def test_default_error_serialization(): + """Test that the serialization for the 'simple' protocol works for the ERROR message.""" + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.ERROR, + error_code=DefaultMessage.ErrorCode.UNSUPPORTED_PROTOCOL, + error_msg="An error", + error_data={"error": b"Some error data"}, + ) + msg_bytes = DefaultMessage.serializer.encode(msg) + actual_msg = DefaultMessage.serializer.decode(msg_bytes) + expected_msg = msg + assert expected_msg == actual_msg + + +def test_default_end_serialization(): + """Test that the serialization for the 'simple' protocol works for the END message.""" + msg = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.END, + ) + msg_bytes = DefaultMessage.serializer.encode(msg) + actual_msg = DefaultMessage.serializer.decode(msg_bytes) + expected_msg = msg + assert expected_msg == actual_msg + + +def test_default_message_str_values(): + """Tests the returned string values of default Message.""" + assert ( + str(DefaultMessage.Performative.BYTES) == "bytes" + ), "DefaultMessage.Performative.BYTES must be bytes" + assert ( + str(DefaultMessage.Performative.ERROR) == "error" + ), "DefaultMessage.Performative.ERROR must be error" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = DefaultMessage( + performative=DefaultMessage.Performative.BYTES, content=b"hello" + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + DefaultMessage.Performative, "__eq__", return_value=False + ): + DefaultMessage.serializer.encode(msg) + + +def test_check_consistency_raises_exception_when_type_not_recognized(): + """Test that we raise exception when the type of the message is not recognized.""" + message = DefaultMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + # mock the __eq__ method such that any kind of matching is going to fail. + with mock.patch.object(DefaultMessage.Performative, "__eq__", return_value=False): + assert not message._is_consistent() + + +def test_default_valid_performatives(): + """Test 'valid_performatives' getter.""" + msg = DefaultMessage(DefaultMessage.Performative.BYTES, content=b"") + assert msg.valid_performatives == set( + map(lambda x: x.value, iter(DefaultMessage.Performative)) + ) + + +def test_serializer_performative_not_found(): + """Test the serializer when the performative is not found.""" + message = DefaultMessage( + message_id=1, + target=0, + performative=DefaultMessage.Performative.BYTES, + content=b"", + ) + message_bytes = message.serializer.encode(message) + with patch.object(DefaultMessage.Performative, "__eq__", return_value=False): + with pytest.raises(ValueError, match="Performative not valid: .*"): + message.serializer.decode(message_bytes) + + +def test_dialogues(): + """Test intiaontiation of dialogues.""" + default_dialogues = DefaultDialogues("agent_addr") + msg, dialogue = default_dialogues.create( + counterparty="abc", + performative=DefaultMessage.Performative.BYTES, + content=b"hello", + ) + assert dialogue is not None + + +class DefaultDialogue(BaseDefaultDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[DefaultMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + BaseDefaultDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class DefaultDialogues(BaseDefaultDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return DefaultDialogue.Role.AGENT + + BaseDefaultDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=DefaultDialogue, + ) diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml index a8ab998d6f..85d4c4f081 100644 --- a/packages/fetchai/protocols/fipa/protocol.yaml +++ b/packages/fetchai/protocols/fipa/protocol.yaml @@ -15,6 +15,7 @@ fingerprint: fipa_pb2.py: bafybeicgs4xb5aggw7pv5szdcp7jjdvii3hec3savyt2amsjkfjkd4ywja message.py: bafybeib2wjkf5ku5oomvti2mxved4qceqsw4e2p3hb4vlafz6zvfvgseou serialization.py: bafybeift53kcwwj77jkpk2tqfqg3wkwyo7ok3ceywrevg76mpbstxq4gpi + tests/test_fipa.py: bafybeicnbveyjrewnlczb4t5o3eqzjl7k54qt4pwucewkzxanw5m5ulfl4 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/fipa/tests/test_fipa.py b/packages/fetchai/protocols/fipa/tests/test_fipa.py new file mode 100644 index 0000000000..1ca1b4407f --- /dev/null +++ b/packages/fetchai/protocols/fipa/tests/test_fipa.py @@ -0,0 +1,863 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the fipa protocol package.""" + +import logging +import sys +from typing import Any, Optional, Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.helpers.search.models import Constraint, ConstraintType, Description, Query +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues +from packages.fetchai.protocols.fipa.message import FipaMessage +from packages.fetchai.protocols.fipa.message import ( + _default_logger as fipa_message_logger, +) + +from tests.conftest import ROOT_DIR + + +logger = logging.getLogger(__name__) +sys.path.append(ROOT_DIR) + + +def test_cfp_serialization(): + """Test that the serialization for the 'fipa' protocol works.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.CFP, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_propose_serialization(): + """Test that the serialization for the 'fipa' protocol works.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.PROPOSE, + proposal=Description({"foo1": 1, "bar1": 2}), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_accept_serialization(): + """Test that the serialization for the 'fipa' protocol works.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.ACCEPT, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_decline_serialization(): + """Test that the serialization for the 'fipa' protocol works.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.DECLINE, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_match_accept_serialization(): + """Test the serialization - deserialization of the match_accept performative.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.MATCH_ACCEPT, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_accept_with_inform_serialization(): + """Test the serialization - deserialization of the accept_with_address performative.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.ACCEPT_W_INFORM, + info={"address": "dummy_address"}, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_match_accept_with_inform_serialization(): + """Test the serialization - deserialization of the match_accept_with_address performative.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.MATCH_ACCEPT_W_INFORM, + info={"address": "dummy_address", "signature": "my_signature"}, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_inform_serialization(): + """Test the serialization-deserialization of the inform performative.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.INFORM, + info={"foo": "bar"}, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_end_serialization(): + """Test the serialization-deserialization of the end performative.""" + msg = FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.END, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = FipaMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_performative_string_value(): + """Test the string value of the performatives.""" + assert str(FipaMessage.Performative.CFP) == "cfp", "The str value must be cfp" + assert ( + str(FipaMessage.Performative.PROPOSE) == "propose" + ), "The str value must be propose" + assert ( + str(FipaMessage.Performative.DECLINE) == "decline" + ), "The str value must be decline" + assert ( + str(FipaMessage.Performative.ACCEPT) == "accept" + ), "The str value must be accept" + assert ( + str(FipaMessage.Performative.MATCH_ACCEPT) == "match_accept" + ), "The str value must be match_accept" + assert ( + str(FipaMessage.Performative.ACCEPT_W_INFORM) == "accept_w_inform" + ), "The str value must be accept_w_inform" + assert ( + str(FipaMessage.Performative.MATCH_ACCEPT_W_INFORM) == "match_accept_w_inform" + ), "The str value must be match_accept_w_inform" + assert ( + str(FipaMessage.Performative.INFORM) == "inform" + ), "The str value must be inform" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = FipaMessage( + performative=FipaMessage.Performative.ACCEPT, + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(FipaMessage.Performative, "__eq__", return_value=False): + FipaMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = FipaMessage( + performative=FipaMessage.Performative.ACCEPT, + ) + + encoded_msg = FipaMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(FipaMessage.Performative, "__eq__", return_value=False): + FipaMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.fipa.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the fipa message is incorrect.""" + with mock.patch.object(fipa_message_logger, "error") as mock_logger: + FipaMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=FipaMessage.Performative.ACCEPT, + ) + + mock_logger.assert_any_call("some error") + + +class TestDialogues: + """Tests fipa dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.buyer_addr = "buyer address" + cls.seller_addr = "seller address" + cls.buyer_dialogues = BuyerDialogues(cls.buyer_addr) + cls.seller_dialogues = SellerDialogues(cls.seller_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.buyer_dialogues._create_self_initiated( + dialogue_opponent_addr=self.seller_addr, + dialogue_reference=(str(0), ""), + role=FipaDialogue.Role.SELLER, + ) + assert isinstance(result, FipaDialogue) + assert result.role == FipaDialogue.Role.SELLER, "The role must be seller." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.buyer_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.seller_addr, + dialogue_reference=(str(0), ""), + role=FipaDialogue.Role.BUYER, + ) + assert isinstance(result, FipaDialogue) + assert result.role == FipaDialogue.Role.BUYER, "The role must be buyer." + + def test_dialogue_endstates(self): + """Test the end states of a dialogue.""" + assert self.buyer_dialogues.dialogue_stats is not None + self.buyer_dialogues.dialogue_stats.add_dialogue_endstate( + FipaDialogue.EndState.SUCCESSFUL, is_self_initiated=True + ) + self.buyer_dialogues.dialogue_stats.add_dialogue_endstate( + FipaDialogue.EndState.DECLINED_CFP, is_self_initiated=False + ) + assert self.buyer_dialogues.dialogue_stats.self_initiated == { + FipaDialogue.EndState.SUCCESSFUL: 1, + FipaDialogue.EndState.DECLINED_PROPOSE: 0, + FipaDialogue.EndState.DECLINED_ACCEPT: 0, + FipaDialogue.EndState.DECLINED_CFP: 0, + } + assert self.buyer_dialogues.dialogue_stats.other_initiated == { + FipaDialogue.EndState.SUCCESSFUL: 0, + FipaDialogue.EndState.DECLINED_PROPOSE: 0, + FipaDialogue.EndState.DECLINED_ACCEPT: 0, + FipaDialogue.EndState.DECLINED_CFP: 1, + } + + def test_dialogues_self_initiated(self): + """Test an end to end scenario of client-seller dialogue.""" + + # Create a message destined for the seller. + cfp_msg, buyer_dialogue = self.buyer_dialogues.create( + counterparty=self.seller_addr, + performative=FipaMessage.Performative.CFP, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + + # Checking that I can retrieve the dialogue. + retrieved_dialogue = self.buyer_dialogues.get_dialogue(cfp_msg) + assert ( + retrieved_dialogue == buyer_dialogue + ), "Should have found correct dialogue" + + assert ( + cfp_msg.dialogue_reference[0] != "" and cfp_msg.dialogue_reference[1] == "" + ), "The dialogue_reference is not set correctly." + + # MESSAGE BEING SENT BETWEEN AGENTS + + # Creates a new dialogue for the seller side based on the income message. + seller_dialogue = self.seller_dialogues.update(cfp_msg) + + # Check that both fields in the dialogue_reference are set. + last_msg = seller_dialogue.last_incoming_message + assert last_msg == cfp_msg, "The messages must be equal" + + # Generate a proposal message to send to the buyer. + proposal = Description({"foo1": 1, "bar1": 2}) + proposal_msg = seller_dialogue.reply( + target_message=cfp_msg, + performative=FipaMessage.Performative.PROPOSE, + proposal=proposal, + ) + + # MESSAGE BEING SENT BETWEEN AGENTS + + # Client received the message and we extend the incoming messages list. + buyer_dialogue = self.buyer_dialogues.update(proposal_msg) + + # Check that both fields in the dialogue_reference are set. + last_msg = buyer_dialogue.last_incoming_message + assert last_msg == proposal_msg, "The two messages must be equal." + + # Retrieve the dialogue based on the received message. + retrieved_dialogue = self.buyer_dialogues.get_dialogue(proposal_msg) + assert retrieved_dialogue == buyer_dialogue, "Should have found dialogue" + + # Create an accept_w_inform message to send seller. + accept_msg = buyer_dialogue.reply( + target_message=proposal_msg, + performative=FipaMessage.Performative.ACCEPT_W_INFORM, + info={"address": "dummy_address"}, + ) + # MESSAGE BEING SENT BETWEEN AGENTS + + # Adds the message to the seller incoming message list. + seller_dialogue = self.seller_dialogues.update(accept_msg) + + retrieved_dialogue = self.seller_dialogues.get_dialogue(accept_msg) + assert seller_dialogue == retrieved_dialogue, "Should have found dialogue" + + def test_update(self): + """Test the `update` functionality.""" + cfp_msg, buyer_dialogue = self.buyer_dialogues.create( + counterparty=self.seller_addr, + performative=FipaMessage.Performative.CFP, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + + assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing message." + assert len(buyer_dialogue._incoming_messages) == 0, "Some incoming messages." + assert ( + buyer_dialogue.last_outgoing_message == cfp_msg + ), "Wrong outgoing message." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[0] != "" + ), "Dialogue reference incorrect." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[1] == "" + ), "Dialogue reference incorrect." + dialogue_reference_left_part = buyer_dialogue.dialogue_label.dialogue_reference[ + 0 + ] + + # message arrives at counterparty + seller_dialogue = self.seller_dialogues.update(cfp_msg) + + assert len(seller_dialogue._outgoing_messages) == 0, "Some outgoing message." + assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." + assert ( + seller_dialogue.last_incoming_message == cfp_msg + ), "Wrong incoming message." + assert ( + seller_dialogue.dialogue_label.dialogue_reference[0] != "" + ), "Dialogue reference incorrect." + assert ( + seller_dialogue.dialogue_label.dialogue_reference[1] != "" + ), "Dialogue reference incorrect." + + # seller creates response message + proposal_msg = seller_dialogue.reply( + target_message=cfp_msg, + performative=FipaMessage.Performative.PROPOSE, + proposal=Description({"foo1": 1, "bar1": 2}), + ) + + assert len(seller_dialogue._outgoing_messages) == 1, "No outgoing messages." + assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." + assert ( + seller_dialogue.last_outgoing_message == proposal_msg + ), "Wrong outgoing message." + + # message arrives at counterparty + self.buyer_dialogues.update(proposal_msg) + + assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing messages." + assert len(buyer_dialogue._incoming_messages) == 1, "No incoming messages." + assert ( + buyer_dialogue.last_outgoing_message == cfp_msg + ), "Wrong outgoing message." + assert ( + buyer_dialogue.last_incoming_message == proposal_msg + ), "Wrong incoming message." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[0] != "" + ), "Dialogue reference incorrect." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[1] != "" + ), "Dialogue reference incorrect." + assert ( + dialogue_reference_left_part + == buyer_dialogue.dialogue_label.dialogue_reference[0] + ), "Dialogue refernce changed unexpectedly." + + def test_counter_proposing(self): + """Test that fipa supports counter proposing.""" + cfp_msg, buyer_dialogue = self.buyer_dialogues.create( + counterparty=self.seller_addr, + performative=FipaMessage.Performative.CFP, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + + assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing message." + assert len(buyer_dialogue._incoming_messages) == 0, "Some incoming messages." + assert ( + buyer_dialogue.last_outgoing_message == cfp_msg + ), "wrong outgoing message in buyer dialogue after sending cfp." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[0] != "" + ), "Dialogue reference incorrect." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[1] == "" + ), "Dialogue reference incorrect." + dialogue_reference_left_part = buyer_dialogue.dialogue_label.dialogue_reference[ + 0 + ] + + # cfp arrives at seller + + seller_dialogue = self.seller_dialogues.update(cfp_msg) + + assert len(seller_dialogue._outgoing_messages) == 0, "Some outgoing message." + assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." + assert ( + seller_dialogue.last_incoming_message == cfp_msg + ), "wrong incoming message in seller dialogue after receiving cfp." + assert ( + seller_dialogue.dialogue_label.dialogue_reference[0] != "" + ), "Dialogue reference incorrect." + assert ( + seller_dialogue.dialogue_label.dialogue_reference[1] != "" + ), "Dialogue reference incorrect." + + # seller creates proposal + proposal_msg = seller_dialogue.reply( + target_message=cfp_msg, + performative=FipaMessage.Performative.PROPOSE, + proposal=Description({"foo1": 1, "bar1": 2}), + ) + + assert len(seller_dialogue._outgoing_messages) == 1, "No outgoing messages." + assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." + assert ( + seller_dialogue.last_outgoing_message == proposal_msg + ), "wrong outgoing message in seller dialogue after sending proposal." + + # proposal arrives at buyer + + buyer_dialogue = self.buyer_dialogues.update(proposal_msg) + + assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing messages." + assert len(buyer_dialogue._incoming_messages) == 1, "No incoming messages." + assert ( + buyer_dialogue.last_incoming_message == proposal_msg + ), "wrong incoming message in buyer dialogue after receiving proposal." + assert ( + buyer_dialogue.last_incoming_message == proposal_msg + ), "Wrong incoming message." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[0] != "" + ), "Dialogue reference incorrect." + assert ( + buyer_dialogue.dialogue_label.dialogue_reference[1] != "" + ), "Dialogue reference incorrect." + assert ( + dialogue_reference_left_part + == buyer_dialogue.dialogue_label.dialogue_reference[0] + ), "Dialogue refernce changed unexpectedly." + + # buyer creates counter proposal 1 + counter_proposal_msg_1 = buyer_dialogue.reply( + target_message=proposal_msg, + performative=FipaMessage.Performative.PROPOSE, + proposal=Description({"foo1": 3, "bar1": 3}), + ) + + assert ( + len(buyer_dialogue._outgoing_messages) == 2 + ), "incorrect number of outgoing_messages in buyer dialogue after sending counter-proposal 1." + assert ( + len(buyer_dialogue._incoming_messages) == 1 + ), "incorrect number of incoming_messages in buyer dialogue after sending counter-proposal 1." + assert ( + buyer_dialogue.last_outgoing_message == counter_proposal_msg_1 + ), "wrong outgoing message in buyer dialogue after sending counter-proposal 1." + + # counter-proposal 1 arrives at seller + + seller_dialogue = self.seller_dialogues.update(counter_proposal_msg_1) + + assert ( + len(seller_dialogue._outgoing_messages) == 1 + ), "incorrect number of outgoing_messages in seller dialogue after receiving counter-proposal 1." + assert ( + len(seller_dialogue._incoming_messages) == 2 + ), "incorrect number of incoming_messages in seller dialogue after receiving counter-proposal 1." + assert ( + seller_dialogue.last_incoming_message == counter_proposal_msg_1 + ), "wrong incoming message in seller dialogue after receiving counter-proposal 1." + + # seller creates counter-proposal 2 + counter_proposal_msg_2 = seller_dialogue.reply( + target_message=counter_proposal_msg_1, + performative=FipaMessage.Performative.PROPOSE, + proposal=Description({"foo1": 2, "bar1": 2}), + ) + + assert ( + len(seller_dialogue._outgoing_messages) == 2 + ), "incorrect number of outgoing_messages in seller dialogue after sending counter-proposal 2." + assert ( + len(seller_dialogue._incoming_messages) == 2 + ), "incorrect number of incoming_messages in seller dialogue after sending counter-proposal 2." + assert ( + seller_dialogue.last_outgoing_message == counter_proposal_msg_2 + ), "wrong outgoing message in seller dialogue after sending counter-proposal 2." + + # counter-proposal 2 arrives at buyer + + buyer_dialogue = self.buyer_dialogues.update(counter_proposal_msg_2) + + assert ( + len(buyer_dialogue._outgoing_messages) == 2 + ), "incorrect number of outgoing_messages in buyer dialogue after receiving counter-proposal 2." + assert ( + len(buyer_dialogue._incoming_messages) == 2 + ), "incorrect number of incoming_messages in buyer dialogue after receiving counter-proposal 2." + assert ( + buyer_dialogue.last_incoming_message == counter_proposal_msg_2 + ), "wrong incoming message in buyer dialogue after receiving counter-proposal 2." + + +class BuyerDialogue(FipaDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[FipaMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + FipaDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class BuyerDialogues(FipaDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return FipaDialogue.Role.BUYER + + FipaDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=BuyerDialogue, + ) + + +class SellerDialogue(FipaDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + __slots__ = ("some_object",) + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[FipaMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + FipaDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + self.some_object = None # type: Optional[Any] + + +class SellerDialogues(FipaDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return FipaDialogue.Role.SELLER + + FipaDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=SellerDialogue, + ) diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml index 94d89f2fef..5ec483f1b9 100644 --- a/packages/fetchai/protocols/gym/protocol.yaml +++ b/packages/fetchai/protocols/gym/protocol.yaml @@ -15,6 +15,7 @@ fingerprint: gym_pb2.py: bafybeihpz5o5kus64bsz7rextgizhqhaqidtxgnq7ijhhta5hnyfvlh6re message.py: bafybeidutr4rssoui26znxgbhkxsjpqx7mrdiryvjpnbm7ls6vtrbz3jim serialization.py: bafybeiabjo2b3y7jy6jlo4qt7fhhnkz2ge7bjvej4mfapxgfyehjp6pera + tests/test_gym.py: bafybeibxerpuzjkjbba7yxmypxvu2z3gxfbanake27okc3qyz6d57exowi fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/gym/tests/test_gym.py b/packages/fetchai/protocols/gym/tests/test_gym.py new file mode 100644 index 0000000000..31bb8062d7 --- /dev/null +++ b/packages/fetchai/protocols/gym/tests/test_gym.py @@ -0,0 +1,421 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the gym protocol package.""" + +from typing import Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.gym.dialogues import GymDialogue, GymDialogues +from packages.fetchai.protocols.gym.message import GymMessage +from packages.fetchai.protocols.gym.message import _default_logger as gym_message_logger + + +def test_act_serialization(): + """Test the serialization for 'act' speech-act works.""" + msg = GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.ACT, + action=GymMessage.AnyObject("some_action"), + step_id=1, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = GymMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_percept_serialization(): + """Test the serialization for 'percept' speech-act works.""" + msg = GymMessage( + message_id=2, + dialogue_reference=(str(0), ""), + target=1, + performative=GymMessage.Performative.PERCEPT, + step_id=1, + observation=GymMessage.AnyObject("some_observation"), + reward=10.0, + done=False, + info=GymMessage.AnyObject("some_info"), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = GymMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_status_serialization(): + """Test the serialization for 'status' speech-act works.""" + content_arg = { + "key_1": "value_1", + "key_2": "value_2", + } + msg = GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.STATUS, + content=content_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = GymMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_reset_serialization(): + """Test the serialization for 'reset' speech-act works.""" + msg = GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.RESET, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = GymMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_close_serialization(): + """Test the serialization for 'close' speech-act works.""" + msg = GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.CLOSE, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = GymMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_performative_string_value(): + """Test the string value of the performatives.""" + assert str(GymMessage.Performative.ACT) == "act", "The str value must be act" + assert ( + str(GymMessage.Performative.PERCEPT) == "percept" + ), "The str value must be percept" + assert ( + str(GymMessage.Performative.STATUS) == "status" + ), "The str value must be status" + assert str(GymMessage.Performative.RESET) == "reset", "The str value must be reset" + assert str(GymMessage.Performative.CLOSE) == "close", "The str value must be close" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.RESET, + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(GymMessage.Performative, "__eq__", return_value=False): + GymMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.RESET, + ) + + encoded_msg = GymMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(GymMessage.Performative, "__eq__", return_value=False): + GymMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.gym.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the message is incorrect.""" + with mock.patch.object(gym_message_logger, "error") as mock_logger: + GymMessage( + message_id=1, + dialogue_reference=(str(0), ""), + target=0, + performative=GymMessage.Performative.RESET, + ) + + mock_logger.assert_any_call("some error") + + +class TestDialogues: + """Tests gym dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.agent_addr = "agent address" + cls.env_addr = "env address" + cls.agent_dialogues = AgentDialogues(cls.agent_addr) + cls.env_dialogues = EnvironmentDialogues(cls.env_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.agent_dialogues._create_self_initiated( + dialogue_opponent_addr=self.env_addr, + dialogue_reference=(str(0), ""), + role=GymDialogue.Role.AGENT, + ) + assert isinstance(result, GymDialogue) + assert result.role == GymDialogue.Role.AGENT, "The role must be Agent." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.agent_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.env_addr, + dialogue_reference=(str(0), ""), + role=GymDialogue.Role.AGENT, + ) + assert isinstance(result, GymDialogue) + assert result.role == GymDialogue.Role.AGENT, "The role must be agent." + + +class AgentDialogue(GymDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[GymMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + GymDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class AgentDialogues(GymDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return GymDialogue.Role.AGENT + + GymDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=AgentDialogue, + ) + + +class EnvironmentDialogue(GymDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[GymMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + GymDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class EnvironmentDialogues(GymDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return GymDialogue.Role.ENVIRONMENT + + GymDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=EnvironmentDialogue, + ) diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml index e1e366dfe7..8ebc2d641c 100644 --- a/packages/fetchai/protocols/http/protocol.yaml +++ b/packages/fetchai/protocols/http/protocol.yaml @@ -14,6 +14,7 @@ fingerprint: http_pb2.py: bafybeihox5yofjmegpwlbh4gmk5hb5bw6btjgdtvzuthio4km4j2axpbd4 message.py: bafybeicinzlrgvhjb3wjegef2nars2dtlqlts3zg4jgk443dsm5jlhjz5q serialization.py: bafybeiekyjreps7iqgmsxzgvlf55kqnhgzt3pvh7qtytmi2o2sui2ulrum + tests/test_http.py: bafybeie57rfgtytqttcsmyaq2iqfo2ao4iu6ixkdf5gc447v2pszx6jjvi fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/http/tests/test_http.py b/packages/fetchai/protocols/http/tests/test_http.py new file mode 100644 index 0000000000..18077d7435 --- /dev/null +++ b/packages/fetchai/protocols/http/tests/test_http.py @@ -0,0 +1,322 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the http protocol package.""" + +import sys +from typing import Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues +from packages.fetchai.protocols.http.message import HttpMessage +from packages.fetchai.protocols.http.message import ( + _default_logger as http_message_logger, +) + + +def test_request_serialization(): + """Test the serialization for 'request' speech-act works.""" + msg = HttpMessage( + performative=HttpMessage.Performative.REQUEST, + method="some_method", + url="url", + version="some_version", + headers="some_headers", + body=b"some_body", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = HttpMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_response_serialization(): + """Test the serialization for 'response' speech-act works.""" + msg = HttpMessage( + message_id=2, + target=1, + performative=HttpMessage.Performative.RESPONSE, + version="some_version", + status_code=1, + status_text="some_status_text", + headers="some_headers", + body=b"some_body", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = HttpMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_performative_string_value(): + """Test the string value of the performatives.""" + assert ( + str(HttpMessage.Performative.REQUEST) == "request" + ), "The str value must be request" + assert ( + str(HttpMessage.Performative.RESPONSE) == "response" + ), "The str value must be response" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = HttpMessage( + performative=HttpMessage.Performative.REQUEST, + method="some_method", + url="url", + version="some_version", + headers="some_headers", + body=b"some_body", + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(HttpMessage.Performative, "__eq__", return_value=False): + HttpMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = HttpMessage( + performative=HttpMessage.Performative.REQUEST, + method="some_method", + url="url", + version="some_version", + headers="some_headers", + body=b"some_body", + ) + + encoded_msg = HttpMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(HttpMessage.Performative, "__eq__", return_value=False): + HttpMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.http.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the message is incorrect.""" + with mock.patch.object(http_message_logger, "error") as mock_logger: + HttpMessage( + performative=HttpMessage.Performative.REQUEST, + method="some_method", + url="url", + version="some_version", + headers="some_headers", + body=b"some_body", + ) + + mock_logger.assert_any_call("some error") + + +class TestDialogues: + """Tests http dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.agent_addr = "agent address" + cls.server_addr = "server address" + cls.agent_dialogues = AgentDialogues(cls.agent_addr) + cls.server_dialogues = ServerDialogues(cls.server_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.agent_dialogues._create_self_initiated( + dialogue_opponent_addr=self.server_addr, + dialogue_reference=(str(0), ""), + role=HttpDialogue.Role.CLIENT, + ) + assert isinstance(result, HttpDialogue) + assert result.role == HttpDialogue.Role.CLIENT, "The role must be client." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.agent_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.server_addr, + dialogue_reference=(str(0), ""), + role=HttpDialogue.Role.CLIENT, + ) + assert isinstance(result, HttpDialogue) + assert result.role == HttpDialogue.Role.CLIENT, "The role must be client." + + +class AgentDialogue(HttpDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[HttpMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + HttpDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class AgentDialogues(HttpDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return HttpDialogue.Role.CLIENT + + HttpDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=AgentDialogue, + ) + + +class ServerDialogue(HttpDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[HttpMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + HttpDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class ServerDialogues(HttpDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return HttpDialogue.Role.SERVER + + HttpDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=ServerDialogue, + ) diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml index a9cd2f182d..8603157f23 100644 --- a/packages/fetchai/protocols/ledger_api/protocol.yaml +++ b/packages/fetchai/protocols/ledger_api/protocol.yaml @@ -15,6 +15,7 @@ fingerprint: ledger_api_pb2.py: bafybeigshvrwgmug3c6dhqxzxkuzyaxjizaogvb7zo2nzqfqiw4mgvq6by message.py: bafybeicl3lsm2c7o4yxvm3k3jhi6nksjr3b7kvrrdpp2hbndxh5rxebjyq serialization.py: bafybeicwffv5vih2hzs5d6vws5j6egofycidmi4gos2brnmgn3ohydaxvq + tests/test_ledger_api.py: bafybeibxi4sjvscaxnve22nv775snhtr35kwz7jjszoer7rsjuzkb2dcfe fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py new file mode 100644 index 0000000000..8879782bf6 --- /dev/null +++ b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py @@ -0,0 +1,669 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the messages module.""" + +import sys +from typing import Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.helpers.transaction.base import State +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.ledger_api.custom_types import Kwargs +from packages.fetchai.protocols.ledger_api.dialogues import ( + LedgerApiDialogue, + LedgerApiDialogues, +) +from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage +from packages.fetchai.protocols.ledger_api.message import ( + _default_logger as ledger_api_message_logger, +) + + +def test_get_balance_serialization(): + """Test the serialization for 'get_balance' speech-act works.""" + msg = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_BALANCE, + ledger_id="some_ledger_id", + address="some_address", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_get_state_serialization(): + """Test the serialization for 'get_state' speech-act works.""" + + args = ("arg1", "arg2") + kwargs = Kwargs({"key": "value"}) + + assert str(kwargs) == "Kwargs: body={'key': 'value'}" + + msg = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_STATE, + ledger_id="some_ledger_id", + callable="some_function", + args=args, + kwargs=kwargs, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_get_raw_transaction_serialization(): + """Test the serialization for 'get_raw_transaction' speech-act works.""" + terms_arg = LedgerApiMessage.Terms( + ledger_id="some_ledger_id", + sender_address="some_sender_address", + counterparty_address="some_counterparty_address", + amount_by_currency_id={"currency_id_1": 1}, + quantities_by_good_id={"good_id_1": -1, "good_id_2": -2}, + nonce="some_nonce", + is_sender_payable_tx_fee=False, + fee_by_currency_id={"currency_id_1": 1}, + is_strict=True, + ) + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.GET_RAW_TRANSACTION, + terms=terms_arg, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_send_signed_transaction_serialization(): + """Test the serialization for 'send_signed_transaction' speech-act works.""" + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION, + signed_transaction=LedgerApiMessage.SignedTransaction( + "some_ledger_id", {"body": "some_body"} + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_get_transaction_receipt_serialization(): + """Test the serialization for 'get_transaction_receipt' speech-act works.""" + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT, + transaction_digest=LedgerApiMessage.TransactionDigest( + "some_ledger_id", "some_body" + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_balance_serialization(): + """Test the serialization for 'balance' speech-act works.""" + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.BALANCE, + ledger_id="some_ledger_id", + balance=125, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_state_serialization(): + """Test the serialization for 'state' speech-act works.""" + + ledger_id = "some_ledger_id" + state = State(ledger_id, {"key": "some_state"}) + + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.STATE, + ledger_id=ledger_id, + state=state, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_raw_transaction_serialization(): + """Test the serialization for 'raw_transaction' speech-act works.""" + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.RAW_TRANSACTION, + raw_transaction=LedgerApiMessage.RawTransaction( + "some_ledger_id", {"body": "some_body"} + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_transaction_digest_serialization(): + """Test the serialization for 'transaction_digest' speech-act works.""" + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.TRANSACTION_DIGEST, + transaction_digest=LedgerApiMessage.TransactionDigest( + "some_ledger_id", "some_body" + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_transaction_receipt_serialization(): + """Test the serialization for 'transaction_receipt' speech-act works.""" + msg = LedgerApiMessage( + message_id=2, + target=1, + performative=LedgerApiMessage.Performative.TRANSACTION_RECEIPT, + transaction_receipt=LedgerApiMessage.TransactionReceipt( + "some_ledger_id", {"key": "some_receipt"}, {"key": "some_transaction"} + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_error_serialization(): + """Test the serialization for 'error' speech-act works.""" + msg = LedgerApiMessage( + performative=LedgerApiMessage.Performative.ERROR, + code=7, + message="some_error_message", + data=b"some_error_data", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_performative_string_value(): + """Test the string value of the performatives.""" + assert ( + str(LedgerApiMessage.Performative.GET_BALANCE) == "get_balance" + ), "The str value must be get_balance" + assert ( + str(LedgerApiMessage.Performative.GET_RAW_TRANSACTION) == "get_raw_transaction" + ), "The str value must be get_raw_transaction" + assert ( + str(LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION) + == "send_signed_transaction" + ), "The str value must be send_signed_transaction" + assert ( + str(LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT) + == "get_transaction_receipt" + ), "The str value must be get_transaction_receipt" + assert ( + str(LedgerApiMessage.Performative.BALANCE) == "balance" + ), "The str value must be balance" + assert ( + str(LedgerApiMessage.Performative.RAW_TRANSACTION) == "raw_transaction" + ), "The str value must be raw_transaction" + assert ( + str(LedgerApiMessage.Performative.TRANSACTION_DIGEST) == "transaction_digest" + ), "The str value must be transaction_digest" + assert ( + str(LedgerApiMessage.Performative.TRANSACTION_RECEIPT) == "transaction_receipt" + ), "The str value must be transaction_receipt" + assert ( + str(LedgerApiMessage.Performative.ERROR) == "error" + ), "The str value must be error" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_BALANCE, + ledger_id="some_ledger_id", + address="some_address", + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + LedgerApiMessage.Performative, "__eq__", return_value=False + ): + LedgerApiMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_BALANCE, + ledger_id="some_ledger_id", + address="some_address", + ) + + encoded_msg = LedgerApiMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + LedgerApiMessage.Performative, "__eq__", return_value=False + ): + LedgerApiMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.ledger_api.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the message is incorrect.""" + with mock.patch.object(ledger_api_message_logger, "error") as mock_logger: + LedgerApiMessage( + performative=LedgerApiMessage.Performative.GET_BALANCE, + ledger_id="some_ledger_id", + address="some_address", + ) + + mock_logger.assert_any_call("some error") + + +class TestDialogues: + """Tests ledger_api dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.agent_addr = "agent address" + cls.ledger_addr = "ledger address" + cls.agent_dialogues = AgentDialogues(cls.agent_addr) + cls.ledger_dialogues = LedgerDialogues(cls.ledger_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.agent_dialogues._create_self_initiated( + dialogue_opponent_addr=self.ledger_addr, + dialogue_reference=(str(0), ""), + role=LedgerApiDialogue.Role.AGENT, + ) + assert isinstance(result, LedgerApiDialogue) + assert result.role == LedgerApiDialogue.Role.AGENT, "The role must be agent." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.agent_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.ledger_addr, + dialogue_reference=(str(0), ""), + role=LedgerApiDialogue.Role.AGENT, + ) + assert isinstance(result, LedgerApiDialogue) + assert result.role == LedgerApiDialogue.Role.AGENT, "The role must be agen t." + + +class AgentDialogue(LedgerApiDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[LedgerApiMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + LedgerApiDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class AgentDialogues(LedgerApiDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return LedgerApiDialogue.Role.AGENT + + LedgerApiDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=AgentDialogue, + ) + + +class LedgerDialogue(LedgerApiDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[LedgerApiMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + LedgerApiDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class LedgerDialogues(LedgerApiDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return LedgerApiDialogue.Role.LEDGER + + LedgerApiDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=LedgerDialogue, + ) diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml index d50a5eaed4..02643c9672 100644 --- a/packages/fetchai/protocols/oef_search/protocol.yaml +++ b/packages/fetchai/protocols/oef_search/protocol.yaml @@ -15,6 +15,7 @@ fingerprint: oef_search.proto: bafybeifvmxnxg4cuxkj64iqeifyv7jl4ihxgsope7p4j74yotedboai7jm oef_search_pb2.py: bafybeibzoqlyihqvgvvpz2bbjekf547n6j677ufw3hy2eqlyhedcuqqbjm serialization.py: bafybeiavvusik7aycfaqsuign5hpqfq5bgw5vwimpeqxtgymbuokvdd5f4 + tests/test_oef_search.py: bafybeifwsm3dct5p7m7zesmfvcxkph4jt2vmjtjg2zfv4mjwb4qf65vbje fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py new file mode 100644 index 0000000000..3cdd85be52 --- /dev/null +++ b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py @@ -0,0 +1,490 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the oef_search protocol package.""" + +import sys +from typing import Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.helpers.search.models import Constraint, ConstraintType, Description, Query +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.oef_search.dialogues import ( + OefSearchDialogue, + OefSearchDialogues, +) +from packages.fetchai.protocols.oef_search.message import OefSearchMessage +from packages.fetchai.protocols.oef_search.message import ( + _default_logger as oef_search_message_logger, +) + + +def test_register_service_serialization(): + """Test the serialization for 'register_service' speech-act works.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=Description({"foo1": 1, "bar1": 2}), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_unregister_service_serialization(): + """Test the serialization for 'unregister_service' speech-act works.""" + msg = OefSearchMessage( + message_id=2, + target=1, + performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, + service_description=Description({"foo1": 1, "bar1": 2}), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_search_services_serialization(): + """Test the serialization for 'search_services' speech-act works.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.SEARCH_SERVICES, + query=Query([Constraint("something", ConstraintType(">", 1))]), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_search_result_serialization(): + """Test the serialization for 'search_result' speech-act works.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.SEARCH_RESULT, + agents=("agent_1", "agent_2", "agent_3"), + agents_info=OefSearchMessage.AgentsInfo( + { + "key_1": {"key_1": b"value_1", "key_2": b"value_2"}, + "key_2": {"key_3": b"value_3", "key_4": b"value_4"}, + } + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_success_serialization(): + """Test the serialization for 'success' speech-act works.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.SUCCESS, + agents_info=OefSearchMessage.AgentsInfo( + { + "key_1": {"key_1": b"value_1", "key_2": b"value_2"}, + "key_2": {"key_3": b"value_3", "key_4": b"value_4"}, + } + ), + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_oef_error_serialization(): + """Test the serialization for 'oef_error' speech-act works.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.OEF_ERROR, + oef_error_operation=OefSearchMessage.OefErrorOperation.OTHER, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_oef_type_string_value(): + """Test the string value of the type.""" + assert ( + str(OefSearchMessage.Performative.REGISTER_SERVICE) == "register_service" + ), "The str value must be register_service" + assert ( + str(OefSearchMessage.Performative.UNREGISTER_SERVICE) == "unregister_service" + ), "The str value must be unregister_service" + assert ( + str(OefSearchMessage.Performative.SEARCH_SERVICES) == "search_services" + ), "The str value must be search_services" + assert ( + str(OefSearchMessage.Performative.OEF_ERROR) == "oef_error" + ), "The str value must be oef_error" + assert ( + str(OefSearchMessage.Performative.SEARCH_RESULT) == "search_result" + ), "The str value must be search_result" + + +def test_oef_error_operation(): + """Test the string value of the error operation.""" + assert ( + str(OefSearchMessage.OefErrorOperation.REGISTER_SERVICE) == "0" + ), "The str value must be 0" + assert ( + str(OefSearchMessage.OefErrorOperation.UNREGISTER_SERVICE) == "1" + ), "The str value must be 1" + assert ( + str(OefSearchMessage.OefErrorOperation.SEARCH_SERVICES) == "2" + ), "The str value must be 2" + assert ( + str(OefSearchMessage.OefErrorOperation.SEND_MESSAGE) == "3" + ), "The str value must be 3" + assert ( + str(OefSearchMessage.OefErrorOperation.OTHER) == "10000" + ), "The str value must be 10000" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=Description({"foo1": 1, "bar1": 2}), + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + OefSearchMessage.Performative, "__eq__", return_value=False + ): + OefSearchMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = OefSearchMessage( + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=Description({"foo1": 1, "bar1": 2}), + ) + + encoded_msg = OefSearchMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object( + OefSearchMessage.Performative, "__eq__", return_value=False + ): + OefSearchMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.oef_search.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the fipa message is incorrect.""" + with mock.patch.object(oef_search_message_logger, "error") as mock_logger: + OefSearchMessage( + performative=OefSearchMessage.Performative.REGISTER_SERVICE, + service_description=Description({"foo1": 1, "bar1": 2}), + ) + + mock_logger.assert_any_call("some error") + + +def test_agent_info(): + """Test the agent_info custom type.""" + agents_info = OefSearchMessage.AgentsInfo( + { + "agent_address_1": {"key_1": b"value_1", "key_2": b"value_2"}, + "agent_address_2": {"key_3": b"value_3", "key_4": b"value_4"}, + } + ) + assert agents_info.get_info_for_agent("agent_address_1") == { + "key_1": b"value_1", + "key_2": b"value_2", + } + + with pytest.raises(ValueError, match="body must not be None"): + OefSearchMessage.AgentsInfo(None) + + +class TestDialogues: + """Tests oef_search dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.agent_addr = "agent address" + cls.oef_node_addr = "oef_node address" + cls.agent_dialogues = BuyerDialogues(cls.agent_addr) + cls.oef_node_dialogues = OEFNodeDialogues(cls.oef_node_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.agent_dialogues._create_self_initiated( + dialogue_opponent_addr=self.oef_node_addr, + dialogue_reference=(str(0), ""), + role=OefSearchDialogue.Role.AGENT, + ) + assert isinstance(result, OefSearchDialogue) + assert result.role == OefSearchDialogue.Role.AGENT, "The role must be agent." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.agent_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.oef_node_addr, + dialogue_reference=(str(0), ""), + role=OefSearchDialogue.Role.AGENT, + ) + assert isinstance(result, OefSearchDialogue) + assert result.role == OefSearchDialogue.Role.AGENT, "The role must be agent." + + +class BuyerDialogue(OefSearchDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[OefSearchMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + OefSearchDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class BuyerDialogues(OefSearchDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return OefSearchDialogue.Role.AGENT + + OefSearchDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=BuyerDialogue, + ) + + +class OEFNodeDialogue(OefSearchDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[OefSearchMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + OefSearchDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class OEFNodeDialogues(OefSearchDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return OefSearchDialogue.Role.OEF_NODE + + OefSearchDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=OEFNodeDialogue, + ) diff --git a/packages/fetchai/protocols/state_update/protocol.yaml b/packages/fetchai/protocols/state_update/protocol.yaml index 6f83bfc523..afdf7c9ed9 100644 --- a/packages/fetchai/protocols/state_update/protocol.yaml +++ b/packages/fetchai/protocols/state_update/protocol.yaml @@ -14,6 +14,7 @@ fingerprint: serialization.py: bafybeiffesod4s4s6hxrgrh4ylbo7jxos752ix5khlzodwujahk34ouaem state_update.proto: bafybeiawlpcxmdojiwekzptaonfkubyxlwpblcgvkrzgle4lihs5ykmnvm state_update_pb2.py: bafybeihehsm5uvve3i63igdk5efg3t6aao65jftllrgm5l5gdkr7sj34ce + tests/test_state_update.py: bafybeiedtd4d5jzxeavhq733dhds3dskb2ojgbjjmmjsf7hzs5v7grqpki fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/state_update/tests/test_state_update.py b/packages/fetchai/protocols/state_update/tests/test_state_update.py new file mode 100644 index 0000000000..a1a0f398d8 --- /dev/null +++ b/packages/fetchai/protocols/state_update/tests/test_state_update.py @@ -0,0 +1,233 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains tests for transaction.""" +from typing import Type +from unittest.mock import patch + +import pytest + +from aea.common import Address +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +from packages.fetchai.protocols.state_update.dialogues import ( + StateUpdateDialogue as BaseStateUpdateDialogue, +) +from packages.fetchai.protocols.state_update.dialogues import ( + StateUpdateDialogues as BaseStateUpdateDialogues, +) +from packages.fetchai.protocols.state_update.message import StateUpdateMessage + + +class TestStateUpdateMessage: + """Test the StateUpdateMessage.""" + + def test_message_consistency(self): + """Test for an error in consistency of a message.""" + currency_endowment = {"FET": 100} + good_endowment = {"a_good": 2} + exchange_params = {"FET": 10.0} + utility_params = {"a_good": 20.0} + assert StateUpdateMessage( + performative=StateUpdateMessage.Performative.INITIALIZE, + amount_by_currency_id=currency_endowment, + quantities_by_good_id=good_endowment, + exchange_params_by_currency_id=exchange_params, + utility_params_by_good_id=utility_params, + ) + currency_change = {"FET": 10} + good_change = {"a_good": 1} + stum = StateUpdateMessage( + performative=StateUpdateMessage.Performative.APPLY, + amount_by_currency_id=currency_change, + quantities_by_good_id=good_change, + ) + assert stum._is_consistent() + assert len(stum.valid_performatives) == 3 + stum = StateUpdateMessage( + performative=StateUpdateMessage.Performative.END, + ) + assert stum._is_consistent() + + def test_message_inconsistency(self): + """Test for an error in consistency of a message.""" + currency_endowment = {"FET": 100} + good_endowment = {"a_good": 2} + exchange_params = {"UNKNOWN": 10.0} + utility_params = {"a_good": 20.0} + with pytest.raises(ValueError, match="Field .* is not supported"): + StateUpdateMessage( + performative=StateUpdateMessage.Performative.INITIALIZE, + amount_by_currency_id=currency_endowment, + quantities_by_good_id=good_endowment, + exchange_params_by_currency_id=exchange_params, + utility_params_by_good_id=utility_params, + non_exists_field="some value", + ) + + +class TestSerialization: + """Test state update message serialization.""" + + def test_serialization_initialize(self): + """Test serialization of initialize message.""" + currency_endowment = {"FET": 100} + good_endowment = {"a_good": 2} + exchange_params = {"FET": 10.0} + utility_params = {"a_good": 20.0} + msg = StateUpdateMessage( + performative=StateUpdateMessage.Performative.INITIALIZE, + amount_by_currency_id=currency_endowment, + quantities_by_good_id=good_endowment, + exchange_params_by_currency_id=exchange_params, + utility_params_by_good_id=utility_params, + ) + encoded_msg = msg.serializer.encode(msg) + decoded_msg = msg.serializer.decode(encoded_msg) + assert msg == decoded_msg + + def test_serialization_apply(self): + """Test serialization of apply message.""" + currency_change = {"FET": 10} + good_change = {"a_good": 1} + msg = StateUpdateMessage( + performative=StateUpdateMessage.Performative.APPLY, + amount_by_currency_id=currency_change, + quantities_by_good_id=good_change, + ) + assert msg._is_consistent() + assert len(msg.valid_performatives) == 3 + encoded_msg = msg.serializer.encode(msg) + decoded_msg = msg.serializer.decode(encoded_msg) + assert msg == decoded_msg + + def test_serialization_end(self): + """Test serialization of end message.""" + msg = StateUpdateMessage( + performative=StateUpdateMessage.Performative.END, + ) + assert msg._is_consistent() + assert len(msg.valid_performatives) == 3 + encoded_msg = msg.serializer.encode(msg) + decoded_msg = msg.serializer.decode(encoded_msg) + assert msg == decoded_msg + + +def test_serialization_negative(): + """Test serialization when performative is not recognized.""" + currency_change = {"FET": 10} + good_change = {"a_good": 1} + msg = StateUpdateMessage( + performative=StateUpdateMessage.Performative.APPLY, + amount_by_currency_id=currency_change, + quantities_by_good_id=good_change, + ) + + with patch.object(StateUpdateMessage.Performative, "__eq__", return_value=False): + with pytest.raises( + ValueError, match=f"Performative not valid: {msg.performative}" + ): + msg.serializer.encode(msg) + + encoded_tx_bytes = msg.serializer.encode(msg) + with patch.object(StateUpdateMessage.Performative, "__eq__", return_value=False): + with pytest.raises( + ValueError, match=f"Performative not valid: {msg.performative}" + ): + msg.serializer.decode(encoded_tx_bytes) + + +def test_performative_str(): + """Test performative __str__.""" + assert str(StateUpdateMessage.Performative.INITIALIZE) == "initialize" + assert str(StateUpdateMessage.Performative.APPLY) == "apply" + + +def test_dialogues(): + """Test intiaontiation of dialogues.""" + state_update_dialogues = StateUpdateDialogues("agent_addr") + msg, dialogue = state_update_dialogues.create( + counterparty="abc", + performative=StateUpdateMessage.Performative.INITIALIZE, + amount_by_currency_id={}, + quantities_by_good_id={}, + exchange_params_by_currency_id={}, + utility_params_by_good_id={}, + ) + assert dialogue is not None + + +class StateUpdateDialogue(BaseStateUpdateDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[StateUpdateMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + BaseStateUpdateDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class StateUpdateDialogues(BaseStateUpdateDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return StateUpdateDialogue.Role.SKILL + + BaseStateUpdateDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=StateUpdateDialogue, + ) diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml index 57f652c652..1a63d1a1da 100644 --- a/packages/fetchai/protocols/tac/protocol.yaml +++ b/packages/fetchai/protocols/tac/protocol.yaml @@ -16,6 +16,7 @@ fingerprint: serialization.py: bafybeifv24cywhafg5db6mmqxc3fz3jmt7bjg4jsaioeivqkvv2ra7rimq tac.proto: bafybeicqiktmsp2ud7zbddsovubo4cd6jtgqwdpm3dwegvf7xhlc3culmq tac_pb2.py: bafybeiduhujxst63ocjj4nh2pddbxqyqbpibmcvrx2xkqubo3dj247gqoa + tests/test_tac.py: bafybeiaagu3dlqdm57zp7uzuw2abg4qwb42g2nlpqip5lq2o2tndswi37u fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/tac/tests/test_tac.py b/packages/fetchai/protocols/tac/tests/test_tac.py new file mode 100644 index 0000000000..c8319460b7 --- /dev/null +++ b/packages/fetchai/protocols/tac/tests/test_tac.py @@ -0,0 +1,574 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2021 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the http protocol package.""" + +import sys +from typing import Type +from unittest import mock + +import pytest + +from aea.common import Address +from aea.exceptions import AEAEnforceError +from aea.mail.base import Envelope +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +import packages +from packages.fetchai.protocols.tac.dialogues import TacDialogue, TacDialogues +from packages.fetchai.protocols.tac.message import TacMessage +from packages.fetchai.protocols.tac.message import _default_logger as tac_message_logger + + +def test_tac_message_instantiation(): + """Test instantiation of the tac message.""" + assert TacMessage( + performative=TacMessage.Performative.REGISTER, agent_name="some_name" + ) + assert TacMessage(performative=TacMessage.Performative.UNREGISTER) + assert TacMessage( + performative=TacMessage.Performative.TRANSACTION, + transaction_id="some_id", + ledger_id="some_ledger", + sender_address="some_address", + counterparty_address="some_other_address", + amount_by_currency_id={"FET": 10}, + fee_by_currency_id={"FET": 1}, + quantities_by_good_id={"123": 0, "1234": 10}, + nonce=1, + sender_signature="some_signature", + counterparty_signature="some_other_signature", + ) + assert TacMessage(performative=TacMessage.Performative.CANCELLED) + assert TacMessage( + performative=TacMessage.Performative.GAME_DATA, + amount_by_currency_id={"FET": 10}, + exchange_params_by_currency_id={"FET": 10.0}, + quantities_by_good_id={"123": 20, "1234": 15}, + utility_params_by_good_id={"123": 30.0, "1234": 50.0}, + fee_by_currency_id={"FET": 1}, + agent_addr_to_name={"agent_1": "Agent one", "agent_2": "Agent two"}, + currency_id_to_name={"FET": "currency_name"}, + good_id_to_name={"123": "First good", "1234": "Second good"}, + version_id="game_version_1", + ) + assert TacMessage( + performative=TacMessage.Performative.TRANSACTION_CONFIRMATION, + transaction_id="some_id", + amount_by_currency_id={"FET": 10}, + quantities_by_good_id={"123": 20, "1234": 15}, + ) + assert TacMessage( + performative=TacMessage.Performative.TAC_ERROR, + error_code=TacMessage.ErrorCode.GENERIC_ERROR, + info={"msg": "This is info msg."}, + ) + assert str(TacMessage.Performative.REGISTER) == "register" + + +def test_register_serialization(): + """Test the serialization for 'register' speech-act works.""" + msg = TacMessage( + performative=TacMessage.Performative.REGISTER, + agent_name="some_agent_name", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_unregister_serialization(): + """Test the serialization for 'unregister' speech-act works.""" + msg = TacMessage( + message_id=2, + target=1, + performative=TacMessage.Performative.UNREGISTER, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_transaction_serialization(): + """Test the serialization for 'transaction' speech-act works.""" + msg = TacMessage( + performative=TacMessage.Performative.TRANSACTION, + transaction_id="some_transaction_id", + ledger_id="some_ledger_id", + sender_address="some_sender_address", + counterparty_address="some_counterparty_address", + amount_by_currency_id={"key_1": 1, "key_2": 2}, + fee_by_currency_id={"key_1": 1, "key_2": 2}, + quantities_by_good_id={"key_1": 1, "key_2": 2}, + nonce="some_nonce", + sender_signature="some_sender_signature", + counterparty_signature="some_counterparty_signature", + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_cancelled_serialization(): + """Test the serialization for 'cancelled' speech-act works.""" + msg = TacMessage( + performative=TacMessage.Performative.CANCELLED, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_game_data_serialization(): + """Test the serialization for 'game_data' speech-act works.""" + msg = TacMessage( + performative=TacMessage.Performative.GAME_DATA, + amount_by_currency_id={"key_1": 1, "key_2": 2}, + exchange_params_by_currency_id={"key_1": 1.0, "key_2": 2.0}, + quantities_by_good_id={"key_1": 1, "key_2": 2}, + utility_params_by_good_id={"key_1": 1.0, "key_2": 2.0}, + fee_by_currency_id={"key_1": 1, "key_2": 2}, + agent_addr_to_name={"key_1": "value_1", "key_2": "value_2"}, + currency_id_to_name={"key_1": "value_1", "key_2": "value_2"}, + good_id_to_name={"key_1": "value_1", "key_2": "value_2"}, + version_id="some_version_id", + info={"key_1": "value_1", "key_2": "value_2"}, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_transaction_confirmation_serialization(): + """Test the serialization for 'transaction_confirmation' speech-act works.""" + msg = TacMessage( + performative=TacMessage.Performative.TRANSACTION_CONFIRMATION, + transaction_id="some_transaction_id", + amount_by_currency_id={"key_1": 1, "key_2": 2}, + quantities_by_good_id={"key_1": 1, "key_2": 2}, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_tac_error_serialization(): + """Test the serialization for 'tac_error' speech-act works.""" + msg = TacMessage( + performative=TacMessage.Performative.TAC_ERROR, + error_code=TacMessage.ErrorCode.GENERIC_ERROR, + info={"key_1": "value_1", "key_2": "value_2"}, + ) + msg.to = "receiver" + envelope = Envelope( + to=msg.to, + sender="sender", + message=msg, + ) + envelope_bytes = envelope.encode() + + actual_envelope = Envelope.decode(envelope_bytes) + expected_envelope = envelope + assert expected_envelope.to == actual_envelope.to + assert expected_envelope.sender == actual_envelope.sender + assert ( + expected_envelope.protocol_specification_id + == actual_envelope.protocol_specification_id + ) + assert expected_envelope.message != actual_envelope.message + + actual_msg = TacMessage.serializer.decode(actual_envelope.message) + actual_msg.to = actual_envelope.to + actual_msg.sender = actual_envelope.sender + expected_msg = msg + assert expected_msg == actual_msg + + +def test_oef_type_string_value(): + """Test the string value of the type.""" + assert ( + str(TacMessage.Performative.REGISTER) == "register" + ), "The str value must be register" + assert ( + str(TacMessage.Performative.UNREGISTER) == "unregister" + ), "The str value must be unregister" + assert ( + str(TacMessage.Performative.TRANSACTION) == "transaction" + ), "The str value must be transaction" + assert ( + str(TacMessage.Performative.CANCELLED) == "cancelled" + ), "The str value must be cancelled" + assert ( + str(TacMessage.Performative.GAME_DATA) == "game_data" + ), "The str value must be game_data" + assert ( + str(TacMessage.Performative.TRANSACTION_CONFIRMATION) + == "transaction_confirmation" + ), "The str value must be transaction_confirmation" + assert ( + str(TacMessage.Performative.TAC_ERROR) == "tac_error" + ), "The str value must be tac_error" + + +def test_error_code_to_msg(): + """Test the serialization for 'tac_error' speech-act works.""" + + assert ( + str(TacMessage.ErrorCode.to_msg(0)) == "Unexpected error." + ), 'The str value must be "Unexpected error."' + assert ( + str(TacMessage.ErrorCode.to_msg(1)) == "Request not recognized" + ), 'The str value must be "Request not recognized"' + assert ( + str(TacMessage.ErrorCode.to_msg(2)) == "Agent addr already registered." + ), 'The str value must be "Agent addr already registered."' + assert ( + str(TacMessage.ErrorCode.to_msg(3)) == "Agent name already registered." + ), 'The str value must be "Agent name already registered."' + assert ( + str(TacMessage.ErrorCode.to_msg(4)) == "Agent not registered." + ), 'The str value must be "Agent not registered."' + assert ( + str(TacMessage.ErrorCode.to_msg(5)) == "Error in checking transaction" + ), 'The str value must be "Error in checking transaction"' + assert ( + str(TacMessage.ErrorCode.to_msg(6)) + == "The transaction request does not match with a previous transaction request with the same id." + ), 'The str value must be "The transaction request does not match with a previous transaction request with the same id."' + assert ( + str(TacMessage.ErrorCode.to_msg(7)) == "Agent name not in whitelist." + ), 'The str value must be "Agent name not in whitelist."' + assert ( + str(TacMessage.ErrorCode.to_msg(8)) == "The competition is not running yet." + ), 'The str value must be "The competition is not running yet."' + assert ( + str(TacMessage.ErrorCode.to_msg(9)) + == "The message is inconsistent with the dialogue." + ), 'The str value must be "The message is inconsistent with the dialogue."' + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = TacMessage( + performative=TacMessage.Performative.CANCELLED, + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(TacMessage.Performative, "__eq__", return_value=False): + TacMessage.serializer.encode(msg) + + +def test_decoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during decoding.""" + msg = TacMessage( + performative=TacMessage.Performative.CANCELLED, + ) + + encoded_msg = TacMessage.serializer.encode(msg) + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(TacMessage.Performative, "__eq__", return_value=False): + TacMessage.serializer.decode(encoded_msg) + + +@mock.patch.object( + packages.fetchai.protocols.tac.message, + "enforce", + side_effect=AEAEnforceError("some error"), +) +def test_incorrect_message(mocked_enforce): + """Test that we raise an exception when the message is incorrect.""" + with mock.patch.object(tac_message_logger, "error") as mock_logger: + TacMessage( + performative=TacMessage.Performative.CANCELLED, + ) + + mock_logger.assert_any_call("some error") + + +class TestDialogues: + """Tests tac dialogues.""" + + @classmethod + def setup_class(cls): + """Set up the test.""" + cls.agent_addr = "agent address" + cls.controller_addr = "controller address" + cls.agent_dialogues = AgentDialogues(cls.agent_addr) + cls.controller_dialogues = ControllerDialogues(cls.controller_addr) + + def test_create_self_initiated(self): + """Test the self initialisation of a dialogue.""" + result = self.agent_dialogues._create_self_initiated( + dialogue_opponent_addr=self.controller_addr, + dialogue_reference=(str(0), ""), + role=TacDialogue.Role.PARTICIPANT, + ) + assert isinstance(result, TacDialogue) + assert ( + result.role == TacDialogue.Role.PARTICIPANT + ), "The role must be participant." + + def test_create_opponent_initiated(self): + """Test the opponent initialisation of a dialogue.""" + result = self.agent_dialogues._create_opponent_initiated( + dialogue_opponent_addr=self.controller_addr, + dialogue_reference=(str(0), ""), + role=TacDialogue.Role.PARTICIPANT, + ) + assert isinstance(result, TacDialogue) + assert ( + result.role == TacDialogue.Role.PARTICIPANT + ), "The role must be participant." + + +class AgentDialogue(TacDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[TacMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + TacDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class AgentDialogues(TacDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return TacDialogue.Role.PARTICIPANT + + TacDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=AgentDialogue, + ) + + +class ControllerDialogue(TacDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[TacMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + TacDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class ControllerDialogues(TacDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return TacDialogue.Role.CONTROLLER + + TacDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=ControllerDialogue, + ) diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 80022ae4d9..d310a9badf 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy skills: [] behaviours: echo: diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index cb81750616..d321226ccd 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -21,15 +21,15 @@ fingerprint: tests/test_strategy.py: bafybeic3zyvuaaqtfpdsgkfqlkyn2ftzlkmxs2cgfw5ub4qylnbguk7rbq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 53687ceb4a..c8e55ffd83 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -15,15 +15,15 @@ fingerprint: strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/error/skill.yaml b/packages/fetchai/skills/error/skill.yaml index 710510382c..8ddeeb8412 100644 --- a/packages/fetchai/skills/error/skill.yaml +++ b/packages/fetchai/skills/error/skill.yaml @@ -13,7 +13,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml index 1ba26d83ec..35f992f64b 100644 --- a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml +++ b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml @@ -15,7 +15,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose +- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i skills: [] behaviours: initializer: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index a57acbdfed..9fb522d1e1 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -14,13 +14,13 @@ fingerprint: strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: [] behaviours: diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 7aee54beeb..5b9356a8bd 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -15,13 +15,13 @@ fingerprint: strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa +- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/fipa:1.0.0:bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -- fetchai/ledger_api:1.0.0:bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -- fetchai/oef_search:1.0.0:bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 6aea634435..d6960c1ac1 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,11 +15,11 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 9237eb0ef2..56b7134844 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -15,8 +15,8 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky skills: [] behaviours: {} handlers: diff --git a/packages/hashes.csv b/packages/hashes.csv index f3b2f0bac9..da184ec486 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,36 +1,36 @@ -fetchai/agents/error_test,bafybeig57ii3i6h63sdkkrkwrvy5mdsmvgrkfw2h4usofpt2jcpgj36gnq -fetchai/agents/gym_aea,bafybeigrzuxo5amvwn56ikypgmriuw4ixc4znyab3sdssqzosm7c4l4og4 -fetchai/agents/my_first_aea,bafybeiajiiumw4sgih2orzlp4w7hkmzjppbzifle34obcbitk3jbnwswg4 -fetchai/connections/gym,bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm -fetchai/connections/http_client,bafybeif27hbtpzqe54vkvbsfwsyem2fimq46cgca3rfuvbh2sdzfbgor5i -fetchai/connections/http_server,bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je -fetchai/connections/ledger,bafybeihg36exkl37ulpydkm2nfwzghomjnnbrvdgapjzlkm5biisitzbxa -fetchai/connections/local,bafybeidr3wjv6h2wgysm26bbcs26zuzesmzq2dh5dhrqtoiilnfrubaure -fetchai/connections/stub,bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq +fetchai/agents/error_test,bafybeibaadvuqyyhgzvuvvdujahs4srchci5dguamslwgtohy74ik6uy7e +fetchai/agents/gym_aea,bafybeiehf7ogdbort7qigtuwezz5aewzgfgzfyke4v2spjkk23t637erpu +fetchai/agents/my_first_aea,bafybeihqrio6rmj5dolw4agfo4jgkzkjcnx5qnecuiv3hvl67dlb2aqspm +fetchai/connections/gym,bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +fetchai/connections/http_client,bafybeicb5ckt7xyyxk7djguraloe6qm4m7nayujjjjdpirivpcvdb3b6km +fetchai/connections/http_server,bafybeib2xtqle4gjxik27xsrvotv2t6iqqwrgbspjlbbntwee3nssb5wyy +fetchai/connections/ledger,bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +fetchai/connections/local,bafybeibnwhom4vyb47z6msnnh336cydvzta5xifbgi7vllbv5ccrjkhnju +fetchai/connections/stub,bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -fetchai/protocols/default,bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -fetchai/protocols/fipa,bafybeigdyz2p6yzx2jmnhyukcyxk25nkevmzwplyde7trtsq4txdxboose -fetchai/protocols/gym,bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe -fetchai/protocols/http,bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq -fetchai/protocols/ledger_api,bafybeiardigq2zupq2zmyv4i4wjydflzwyz7bl6xhxxcwtiesevqss5fae -fetchai/protocols/oef_search,bafybeieytybenjlkcdzmqw2u6xzl26jtoe4fjlzxifqy3ollobtq4k33ii -fetchai/protocols/state_update,bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe -fetchai/protocols/tac,bafybeifnnnw5nlqsoio4777s643m5lqryjct5ztqti22qf2kri4gurhcdm -fetchai/skills/echo,bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy -fetchai/skills/erc1155_client,bafybeihbzxcmwkaxnxvsrfkmlfa5y6fvbqmjcqqeztmg7jtyo26asobf3y -fetchai/skills/erc1155_deploy,bafybeihyde4lpbpm4eydveowp2kdrw25murprahrtobb4ydr6wbujf5px4 -fetchai/skills/error,bafybeib5lt6t6dlilcwrzlxokyu23gqfyizy66otnhapfdfaotc5jppney +fetchai/protocols/default,bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +fetchai/protocols/fipa,bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +fetchai/protocols/gym,bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +fetchai/protocols/http,bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +fetchai/protocols/ledger_api,bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +fetchai/protocols/oef_search,bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +fetchai/protocols/state_update,bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m +fetchai/protocols/tac,bafybeicpyc26jkkw73nm23llmywiew32moztazzbz3smcdze2cmlkq4kee +fetchai/skills/echo,bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre +fetchai/skills/erc1155_client,bafybeifmialtp4qwzusa7ohhdcg62ai7l3b6l65posq2olw2bq6gnwgjly +fetchai/skills/erc1155_deploy,bafybeie2qc444lvzv5pfdva5y3luwbzckts3qu7gk4tfrmm3wkfkwjtbxm +fetchai/skills/error,bafybeidxuxq32xopdw73b2xr7ufgbytkjettfzknupgr5gt4fnd7lbarjy fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu -fetchai/skills/fipa_dummy_buyer,bafybeibyvdfb7ytj36544np4anwahwhfs3v652sdkpqqa4t7uthzwspy7a -fetchai/skills/generic_buyer,bafybeieekzr3dpo3avi72l3gcxtfdjgbrfufkr542w2tclho6qe6nkv3km -fetchai/skills/generic_seller,bafybeig4kvs5pyhk4dt6xjcuvnxcajkb6t6jz74srbsxyaa33aohdtjqha -fetchai/skills/gym,bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu -fetchai/skills/http_echo,bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm +fetchai/skills/fipa_dummy_buyer,bafybeialocgbh25dnwrmgo5xofc5kn5skxwzurfgepmklz6ze3mujddase +fetchai/skills/generic_buyer,bafybeihnv5h33bpvntnvxfbi77uix75zn355tty2b4loqjddyj35nm5noq +fetchai/skills/generic_seller,bafybeiej5igqv2kxwug7ykgzhi4k2kexy5q6jdjwih5f3ndop6mrng7mim +fetchai/skills/gym,bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm +fetchai/skills/http_echo,bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeic4xvz5hwabultbdczapr34gttobhqw5r3k5c25tsprozx2gwyjku -open_aea/agents/http_echo,bafybeick5guncuvf3zehoqfudca6r5q3a6qktsy7k5m5feilqpw37ltopu -open_aea/agents/my_first_aea,bafybeia5retw3um6guuqya44fxco3dkzoefr7r6ytgaouny3eu5mw3o754 +open_aea/agents/gym_aea,bafybeia3rtiche7ir3h5j4qnrekwrukvp4ysnsrtn6laaajm5pl5byyqie +open_aea/agents/http_echo,bafybeib4hxhkee6vgbvmnwmk4fjql2fdqhmke6mz7mo3x54j6lht6duvze +open_aea/agents/my_first_aea,bafybeic245xjddl3zyvpj5uuwtaqdmhsws6rasb2kdo6ip6e54fhnz2dvy open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 9f2f182d72..5ec6fb0a11 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibu4kczqmv3okppxafezzlddwhqhhrgnfvu4gdalkpfw2tr3j7ihm +- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/gym:1.0.0:bafybeibvxyiuksh62vjq55o4qejkwbwt5n2sj4outkvsszjrtrq26z4hqe -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeib4ug4tfiynmxwpb62imyine4olp4qy5bvaousuiukfyqi7mcstwu +- fetchai/gym:0.20.0:bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index e8110ce74b..5aef0a4f83 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeigm6m73zasjeru2vsus656t3g2a3ajcgjhht3cngqohyevi4n67je +- fetchai/http_server:0.22.0:bafybeib2xtqle4gjxik27xsrvotv2t6iqqwrgbspjlbbntwee3nssb5wyy contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/http_echo:0.20.0:bafybeif2kvwuicnpdrvs4aa2icgwxgvwq4vnfxsddd6ynv2lnl3gr6u2xm +- fetchai/http_echo:0.20.0:bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index c3f8152741..2d09a7cb43 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeicc7yje2w3brh3mowsr4yo5li4i5sq4cfe727ypuehtnwu4g6gkuq +- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy contracts: [] protocols: -- fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm -- fetchai/state_update:1.0.0:bafybeihaknve6slfpsml5bz62xqwxcpv3u7bqaskuataehsrgygoeiucqe +- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/echo:0.19.0:bafybeih5i46zusayargb5yotgwneeg3tkydl5gxi7ymza2nykeet7lphoy +- fetchai/echo:0.19.0:bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From 79e6114bb25990a4ae2f5519a394939b9592ffee Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 06:46:29 +0000 Subject: [PATCH 43/93] feat: move ercc1155_buyer skill tests to package --- packages/fetchai/skills/erc1155_deploy/skill.yaml | 6 ++++++ .../fetchai/skills/erc1155_deploy/tests}/__init__.py | 0 .../skills/erc1155_deploy/tests}/intermediate_class.py | 5 +++-- .../fetchai/skills/erc1155_deploy/tests}/test_behaviours.py | 3 +-- .../fetchai/skills/erc1155_deploy/tests}/test_dialogues.py | 5 ++--- .../fetchai/skills/erc1155_deploy/tests}/test_handlers.py | 5 ++--- .../fetchai/skills/erc1155_deploy/tests}/test_strategy.py | 3 +-- 7 files changed, 15 insertions(+), 12 deletions(-) rename {tests/test_packages/test_skills/test_erc1155_deploy => packages/fetchai/skills/erc1155_deploy/tests}/__init__.py (100%) rename {tests/test_packages/test_skills/test_erc1155_deploy => packages/fetchai/skills/erc1155_deploy/tests}/intermediate_class.py (99%) rename {tests/test_packages/test_skills/test_erc1155_deploy => packages/fetchai/skills/erc1155_deploy/tests}/test_behaviours.py (99%) rename {tests/test_packages/test_skills/test_erc1155_deploy => packages/fetchai/skills/erc1155_deploy/tests}/test_dialogues.py (99%) rename {tests/test_packages/test_skills/test_erc1155_deploy => packages/fetchai/skills/erc1155_deploy/tests}/test_handlers.py (99%) rename {tests/test_packages/test_skills/test_erc1155_deploy => packages/fetchai/skills/erc1155_deploy/tests}/test_strategy.py (99%) diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index c8e55ffd83..1ac6abae34 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -13,6 +13,12 @@ fingerprint: dialogues.py: bafybeichr247l7yyggfsul2d2b42365cvxvuidovsfx5xvybabi7gfbudq handlers.py: bafybeigf65e2hhzropscpyyvksxrtnkopofmbdhqfb6jty3vcdsippmz6a strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey + tests/__init__.py: bafybeig6dkwpgzga7j7xtr4m2lue5geufhea2wrhrr4t24maf3qb6f7ofq + tests/intermediate_class.py: bafybeig3htavq3dtrhvskev76ecusndajmfgnjyyys7uneou7jugwaxkuq + tests/test_behaviours.py: bafybeiezsoqme6k2dedjf3lrlvg2jjw7wgpqaebui5nfpegfbvgy5nth6a + tests/test_dialogues.py: bafybeia3c7b3fccfkiaaoyjd46vpbd3tx3zu4t3vflkospdusqcguftg3m + tests/test_handlers.py: bafybeifqmviuflrq25cuxrydjnipq43sb3v4jb6obpyhiud2idhagbl4ui + tests/test_strategy.py: bafybeihjb32d5x7qzilodj6coe7x3hox2bmzh5zcmhanwxpvsn44vf6nu4 fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je diff --git a/tests/test_packages/test_skills/test_erc1155_deploy/__init__.py b/packages/fetchai/skills/erc1155_deploy/tests/__init__.py similarity index 100% rename from tests/test_packages/test_skills/test_erc1155_deploy/__init__.py rename to packages/fetchai/skills/erc1155_deploy/tests/__init__.py diff --git a/tests/test_packages/test_skills/test_erc1155_deploy/intermediate_class.py b/packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py similarity index 99% rename from tests/test_packages/test_skills/test_erc1155_deploy/intermediate_class.py rename to packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py index eaeb5a5109..2878af1372 100644 --- a/tests/test_packages/test_skills/test_erc1155_deploy/intermediate_class.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py @@ -68,13 +68,14 @@ from packages.fetchai.skills.erc1155_deploy.strategy import Strategy from packages.open_aea.protocols.signing.message import SigningMessage -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class ERC1155DeployTestCase(BaseSkillTestCase): """Sets the erc1155_deploy class up for testing.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "erc1155_deploy") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): diff --git a/tests/test_packages/test_skills/test_erc1155_deploy/test_behaviours.py b/packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py similarity index 99% rename from tests/test_packages/test_skills/test_erc1155_deploy/test_behaviours.py rename to packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py index 2a88711243..e0affdd640 100644 --- a/tests/test_packages/test_skills/test_erc1155_deploy/test_behaviours.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py @@ -28,8 +28,7 @@ from packages.fetchai.protocols.oef_search.message import OefSearchMessage from packages.fetchai.skills.erc1155_deploy.behaviours import LEDGER_API_ADDRESS from packages.fetchai.skills.erc1155_deploy.dialogues import ContractApiDialogue - -from tests.test_packages.test_skills.test_erc1155_deploy.intermediate_class import ( +from packages.fetchai.skills.erc1155_deploy.tests.intermediate_class import ( ERC1155DeployTestCase, ) diff --git a/tests/test_packages/test_skills/test_erc1155_deploy/test_dialogues.py b/packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py similarity index 99% rename from tests/test_packages/test_skills/test_erc1155_deploy/test_dialogues.py rename to packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py index e14ff39ed5..5feb86dcad 100644 --- a/tests/test_packages/test_skills/test_erc1155_deploy/test_dialogues.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py @@ -38,11 +38,10 @@ OefSearchDialogue, SigningDialogue, ) -from packages.open_aea.protocols.signing.message import SigningMessage - -from tests.test_packages.test_skills.test_erc1155_deploy.intermediate_class import ( +from packages.fetchai.skills.erc1155_deploy.tests.intermediate_class import ( ERC1155DeployTestCase, ) +from packages.open_aea.protocols.signing.message import SigningMessage class TestDialogues(ERC1155DeployTestCase): diff --git a/tests/test_packages/test_skills/test_erc1155_deploy/test_handlers.py b/packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py similarity index 99% rename from tests/test_packages/test_skills/test_erc1155_deploy/test_handlers.py rename to packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py index aefaa3e555..636e01a4c2 100644 --- a/tests/test_packages/test_skills/test_erc1155_deploy/test_handlers.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py @@ -41,11 +41,10 @@ SigningDialogue, ) from packages.fetchai.skills.erc1155_deploy.handlers import LEDGER_API_ADDRESS -from packages.open_aea.protocols.signing.message import SigningMessage - -from tests.test_packages.test_skills.test_erc1155_deploy.intermediate_class import ( +from packages.fetchai.skills.erc1155_deploy.tests.intermediate_class import ( ERC1155DeployTestCase, ) +from packages.open_aea.protocols.signing.message import SigningMessage class TestFipaHandler(ERC1155DeployTestCase): diff --git a/tests/test_packages/test_skills/test_erc1155_deploy/test_strategy.py b/packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py similarity index 99% rename from tests/test_packages/test_skills/test_erc1155_deploy/test_strategy.py rename to packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py index 6c3c1f0cef..265dc2c6fd 100644 --- a/tests/test_packages/test_skills/test_erc1155_deploy/test_strategy.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py @@ -36,8 +36,7 @@ SIMPLE_SERVICE_MODEL, Strategy, ) - -from tests.test_packages.test_skills.test_erc1155_deploy.intermediate_class import ( +from packages.fetchai.skills.erc1155_deploy.tests.intermediate_class import ( ERC1155DeployTestCase, ) From ce9f1da4015306752f92a77fcdac4cc14fcbece8 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 06:46:55 +0000 Subject: [PATCH 44/93] feat: move generic_buyer skill tests to package --- packages/fetchai/skills/generic_buyer/skill.yaml | 5 +++++ .../fetchai/skills/generic_buyer/tests}/__init__.py | 0 .../skills/generic_buyer/tests}/test_behaviours.py | 7 +++---- .../skills/generic_buyer/tests}/test_dialogues.py | 5 +++-- .../skills/generic_buyer/tests}/test_handlers.py | 11 ++++++----- .../skills/generic_buyer/tests}/test_models.py | 5 +++-- 6 files changed, 20 insertions(+), 13 deletions(-) rename {tests/test_packages/test_skills/test_generic_buyer => packages/fetchai/skills/generic_buyer/tests}/__init__.py (100%) rename {tests/test_packages/test_skills/test_generic_buyer => packages/fetchai/skills/generic_buyer/tests}/test_behaviours.py (98%) rename {tests/test_packages/test_skills/test_generic_buyer => packages/fetchai/skills/generic_buyer/tests}/test_dialogues.py (98%) rename {tests/test_packages/test_skills/test_generic_buyer => packages/fetchai/skills/generic_buyer/tests}/test_handlers.py (99%) rename {tests/test_packages/test_skills/test_generic_buyer => packages/fetchai/skills/generic_buyer/tests}/test_models.py (98%) diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 9fb522d1e1..c150ffc6f4 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -12,6 +12,11 @@ fingerprint: dialogues.py: bafybeigyzu2uvp2dmj7wpjlcqlablr2wibnlkxhwyxzetizsaz5lifooea handlers.py: bafybeifdytrtxifnxuzcml4plgqttkuknwlavmskc6gyy3xt4vujwwxjg4 strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe + tests/__init__.py: bafybeid6od3orr5gjysmm4lbcn6xcul22n2dlc7qafppiqvkvcov2pftiu + tests/test_behaviours.py: bafybeicmdo2lscp3eyimvlz6r36oizdkifphzkjxs3d65hii6hcesybb5i + tests/test_dialogues.py: bafybeicw26dbb5bsdrhryymxr2lge2n3m6dmkeperkdd6imlxaclrfjpge + tests/test_handlers.py: bafybeicssmw63jx3rrni37egleirg2yratrfcbxmxlefhaenrqdzov2roi + tests/test_models.py: bafybeia3a3wtmmjxqn4qspbrluaypql262xne3n4t7qdyjsn3bkfsq4cxq fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je diff --git a/tests/test_packages/test_skills/test_generic_buyer/__init__.py b/packages/fetchai/skills/generic_buyer/tests/__init__.py similarity index 100% rename from tests/test_packages/test_skills/test_generic_buyer/__init__.py rename to packages/fetchai/skills/generic_buyer/tests/__init__.py diff --git a/tests/test_packages/test_skills/test_generic_buyer/test_behaviours.py b/packages/fetchai/skills/generic_buyer/tests/test_behaviours.py similarity index 98% rename from tests/test_packages/test_skills/test_generic_buyer/test_behaviours.py rename to packages/fetchai/skills/generic_buyer/tests/test_behaviours.py index e757482507..dbf83ff6ba 100644 --- a/tests/test_packages/test_skills/test_generic_buyer/test_behaviours.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_behaviours.py @@ -46,16 +46,15 @@ ) from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy -from tests.conftest import ROOT_DIR - FETCHAI = "fetchai" +PACKAGE_ROOT = Path(__file__).parent.parent class TestSearchBehaviour(BaseSkillTestCase): """Test Search behaviour of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): @@ -161,7 +160,7 @@ def test_teardown(self): class TestTransactionBehaviour(BaseSkillTestCase): """Test transaction behaviour of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): diff --git a/tests/test_packages/test_skills/test_generic_buyer/test_dialogues.py b/packages/fetchai/skills/generic_buyer/tests/test_dialogues.py similarity index 98% rename from tests/test_packages/test_skills/test_generic_buyer/test_dialogues.py rename to packages/fetchai/skills/generic_buyer/tests/test_dialogues.py index 922846bce3..355dd1ad5d 100644 --- a/tests/test_packages/test_skills/test_generic_buyer/test_dialogues.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_dialogues.py @@ -47,13 +47,14 @@ ) from packages.open_aea.protocols.signing.message import SigningMessage -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestDialogues(BaseSkillTestCase): """Test dialogue classes of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): diff --git a/tests/test_packages/test_skills/test_generic_buyer/test_handlers.py b/packages/fetchai/skills/generic_buyer/tests/test_handlers.py similarity index 99% rename from tests/test_packages/test_skills/test_generic_buyer/test_handlers.py rename to packages/fetchai/skills/generic_buyer/tests/test_handlers.py index 10d57b512e..751338877b 100644 --- a/tests/test_packages/test_skills/test_generic_buyer/test_handlers.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_handlers.py @@ -62,13 +62,14 @@ from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy from packages.open_aea.protocols.signing.message import SigningMessage -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestGenericFipaHandler(BaseSkillTestCase): """Test fipa handler of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): @@ -547,7 +548,7 @@ def test_teardown(self): class TestGenericOefSearchHandler(BaseSkillTestCase): """Test oef search handler of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT is_agent_to_agent_messages = False @classmethod @@ -804,7 +805,7 @@ def test_teardown(self): class TestGenericSigningHandler(BaseSkillTestCase): """Test signing handler of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT is_agent_to_agent_messages = False @classmethod @@ -1086,7 +1087,7 @@ def test_teardown(self): class TestGenericLedgerApiHandler(BaseSkillTestCase): """Test ledger_api handler of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT is_agent_to_agent_messages = False @classmethod diff --git a/tests/test_packages/test_skills/test_generic_buyer/test_models.py b/packages/fetchai/skills/generic_buyer/tests/test_models.py similarity index 98% rename from tests/test_packages/test_skills/test_generic_buyer/test_models.py rename to packages/fetchai/skills/generic_buyer/tests/test_models.py index 7095f38d98..ba88090321 100644 --- a/tests/test_packages/test_skills/test_generic_buyer/test_models.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_models.py @@ -31,13 +31,14 @@ SIMPLE_SERVICE_MODEL, ) -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestGenericStrategy(BaseSkillTestCase): """Test GenericStrategy of generic buyer.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_buyer") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): From 45172522e4ffd325204174076bce0eb10d1d8aff Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 06:47:15 +0000 Subject: [PATCH 45/93] feat: move generic_seller skill to package --- packages/fetchai/skills/generic_seller/skill.yaml | 5 +++++ .../fetchai/skills/generic_seller/tests}/__init__.py | 0 .../skills/generic_seller/tests}/test_behaviours.py | 5 +++-- .../skills/generic_seller/tests}/test_dialogues.py | 5 +++-- .../skills/generic_seller/tests}/test_handlers.py | 9 +++++---- .../fetchai/skills/generic_seller/tests}/test_models.py | 5 +++-- packages/hashes.csv | 6 +++--- 7 files changed, 22 insertions(+), 13 deletions(-) rename {tests/test_packages/test_skills/test_generic_seller => packages/fetchai/skills/generic_seller/tests}/__init__.py (100%) rename {tests/test_packages/test_skills/test_generic_seller => packages/fetchai/skills/generic_seller/tests}/test_behaviours.py (99%) rename {tests/test_packages/test_skills/test_generic_seller => packages/fetchai/skills/generic_seller/tests}/test_dialogues.py (98%) rename {tests/test_packages/test_skills/test_generic_seller => packages/fetchai/skills/generic_seller/tests}/test_handlers.py (99%) rename {tests/test_packages/test_skills/test_generic_seller => packages/fetchai/skills/generic_seller/tests}/test_models.py (98%) diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 5b9356a8bd..0cacaf3fde 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -13,6 +13,11 @@ fingerprint: dialogues.py: bafybeiddznyqdx5h7mzbmdgzs2w635hxhcjo3fcck2h5o4rpnl4rl3e6m4 handlers.py: bafybeigz7pthvel63y4o3xq77icym2thcw4jy53hcj4a7t56eebqzdbgay strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm + tests/__init__.py: bafybeihqxdniovyormfdxlfyxosmbstbriacfo4si7gofld5fx66jwmp5a + tests/test_behaviours.py: bafybeigyvkntknutwipnurwnxq2iiqcqhocvdpgvpaixoakqzxd4fckdxa + tests/test_dialogues.py: bafybeifcnehrjfzfrnu4lshzhocxzxvnummroiz7svwi7jjh7c32qbkzyi + tests/test_handlers.py: bafybeie6u2sfzm5hkneiapqlvelcokkb34vwiwhwmdzvmr6yjl6e7a37by + tests/test_models.py: bafybeicea7y22x23k77afs5qe4iokhxfnzw6fakhhlxcrvrbw2pnmrzimq fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je diff --git a/tests/test_packages/test_skills/test_generic_seller/__init__.py b/packages/fetchai/skills/generic_seller/tests/__init__.py similarity index 100% rename from tests/test_packages/test_skills/test_generic_seller/__init__.py rename to packages/fetchai/skills/generic_seller/tests/__init__.py diff --git a/tests/test_packages/test_skills/test_generic_seller/test_behaviours.py b/packages/fetchai/skills/generic_seller/tests/test_behaviours.py similarity index 99% rename from tests/test_packages/test_skills/test_generic_seller/test_behaviours.py rename to packages/fetchai/skills/generic_seller/tests/test_behaviours.py index 58db8acb7a..98ac505b61 100644 --- a/tests/test_packages/test_skills/test_generic_seller/test_behaviours.py +++ b/packages/fetchai/skills/generic_seller/tests/test_behaviours.py @@ -35,13 +35,14 @@ ) from packages.fetchai.skills.generic_seller.strategy import GenericStrategy -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestSkillBehaviour(BaseSkillTestCase): """Test behaviours of generic seller.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_seller") + path_to_skill = PACKAGE_ROOT is_agent_to_agent_messages = False @classmethod diff --git a/tests/test_packages/test_skills/test_generic_seller/test_dialogues.py b/packages/fetchai/skills/generic_seller/tests/test_dialogues.py similarity index 98% rename from tests/test_packages/test_skills/test_generic_seller/test_dialogues.py rename to packages/fetchai/skills/generic_seller/tests/test_dialogues.py index 1c350cff26..c8e3a041ca 100644 --- a/tests/test_packages/test_skills/test_generic_seller/test_dialogues.py +++ b/packages/fetchai/skills/generic_seller/tests/test_dialogues.py @@ -44,13 +44,14 @@ OefSearchDialogues, ) -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestDialogues(BaseSkillTestCase): """Test dialogue classes of generic seller.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_seller") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): diff --git a/tests/test_packages/test_skills/test_generic_seller/test_handlers.py b/packages/fetchai/skills/generic_seller/tests/test_handlers.py similarity index 99% rename from tests/test_packages/test_skills/test_generic_seller/test_handlers.py rename to packages/fetchai/skills/generic_seller/tests/test_handlers.py index 0f5253387d..15a5517a87 100644 --- a/tests/test_packages/test_skills/test_generic_seller/test_handlers.py +++ b/packages/fetchai/skills/generic_seller/tests/test_handlers.py @@ -54,13 +54,14 @@ ) from packages.fetchai.skills.generic_seller.strategy import GenericStrategy -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestGenericFipaHandler(BaseSkillTestCase): """Test fipa handler of generic seller.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_seller") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): @@ -546,7 +547,7 @@ def test_teardown(self): class TestGenericLedgerApiHandler(BaseSkillTestCase): """Test ledger_api handler of generic seller.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_seller") + path_to_skill = PACKAGE_ROOT is_agent_to_agent_messages = False @classmethod @@ -917,7 +918,7 @@ def test_teardown(self): class TestGenericOefSearchHandler(BaseSkillTestCase): """Test oef search handler of generic seller.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_seller") + path_to_skill = PACKAGE_ROOT is_agent_to_agent_messages = False @classmethod diff --git a/tests/test_packages/test_skills/test_generic_seller/test_models.py b/packages/fetchai/skills/generic_seller/tests/test_models.py similarity index 98% rename from tests/test_packages/test_skills/test_generic_seller/test_models.py rename to packages/fetchai/skills/generic_seller/tests/test_models.py index e27ddf4084..366f0764b6 100644 --- a/tests/test_packages/test_skills/test_generic_seller/test_models.py +++ b/packages/fetchai/skills/generic_seller/tests/test_models.py @@ -44,13 +44,14 @@ SIMPLE_SERVICE_MODEL, ) -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class TestGenericStrategy(BaseSkillTestCase): """Test GenericStrategy of generic seller.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "generic_seller") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): diff --git a/packages/hashes.csv b/packages/hashes.csv index da184ec486..8d83890eb8 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -19,12 +19,12 @@ fetchai/protocols/state_update,bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum6 fetchai/protocols/tac,bafybeicpyc26jkkw73nm23llmywiew32moztazzbz3smcdze2cmlkq4kee fetchai/skills/echo,bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre fetchai/skills/erc1155_client,bafybeifmialtp4qwzusa7ohhdcg62ai7l3b6l65posq2olw2bq6gnwgjly -fetchai/skills/erc1155_deploy,bafybeie2qc444lvzv5pfdva5y3luwbzckts3qu7gk4tfrmm3wkfkwjtbxm +fetchai/skills/erc1155_deploy,bafybeihgkstvulxrdrbqkdqq5e3jlhpyt45264q5jey7qgo6agohbvtmca fetchai/skills/error,bafybeidxuxq32xopdw73b2xr7ufgbytkjettfzknupgr5gt4fnd7lbarjy fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeialocgbh25dnwrmgo5xofc5kn5skxwzurfgepmklz6ze3mujddase -fetchai/skills/generic_buyer,bafybeihnv5h33bpvntnvxfbi77uix75zn355tty2b4loqjddyj35nm5noq -fetchai/skills/generic_seller,bafybeiej5igqv2kxwug7ykgzhi4k2kexy5q6jdjwih5f3ndop6mrng7mim +fetchai/skills/generic_buyer,bafybeicnclpmi2mstrbj4domzubjjukakzu4qplwrisbggi5ye5semylum +fetchai/skills/generic_seller,bafybeielnpl223fgch3vjpliu5xcvakmuk27ej7k473rzyzwhwaenkkf7a fetchai/skills/gym,bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm fetchai/skills/http_echo,bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble From 28b729ebfa6a270797435fd708ef397295ea5ce3 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 06:57:41 +0000 Subject: [PATCH 46/93] feat: move gym skill test to package --- packages/fetchai/agents/gym_aea/aea-config.yaml | 2 +- packages/fetchai/skills/gym/skill.yaml | 8 ++++++++ .../fetchai/skills/gym/tests}/__init__.py | 0 .../fetchai/skills/gym/tests}/helpers.py | 0 .../fetchai/skills/gym/tests}/intermediate_class.py | 5 +++-- .../fetchai/skills/gym/tests}/test_dialogues.py | 3 +-- .../fetchai/skills/gym/tests}/test_handlers.py | 3 +-- .../fetchai/skills/gym/tests}/test_helpers.py | 3 +-- .../fetchai/skills/gym/tests}/test_rl_agent.py | 3 +-- .../fetchai/skills/gym/tests}/test_task.py | 2 +- packages/hashes.csv | 6 +++--- packages/open_aea/agents/gym_aea/aea-config.yaml | 2 +- 12 files changed, 21 insertions(+), 16 deletions(-) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/__init__.py (100%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/helpers.py (100%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/intermediate_class.py (97%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/test_dialogues.py (96%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/test_handlers.py (99%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/test_helpers.py (99%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/test_rl_agent.py (98%) rename {tests/test_packages/test_skills/test_gym => packages/fetchai/skills/gym/tests}/test_task.py (97%) diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index f41f89ef76..8f21999e99 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm +- fetchai/gym:0.20.0:bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index d6960c1ac1..714428c950 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -13,6 +13,14 @@ fingerprint: helpers.py: bafybeiepac2mjvl4xnhzsthwen5nstzjoopzuv6fvoisw36frww2km4fpa rl_agent.py: bafybeignbkbhfiswcohlk7ode6uc76bekownpcnsmqjtasv5bm4bzsisfm tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm + tests/__init__.py: bafybeihojk75sixkhbsmwxbrzdaqwouq6dh2oo6u7zk2clqcgxqrhklhny + tests/helpers.py: bafybeifbvlf5ahttwz7uddixxp5ggw3uu3sby65ya4xr2gy3gfb5xouj5i + tests/intermediate_class.py: bafybeidvnxpidgj6kzd2kxwnexwh4tvxcgqvtoknruiw4jus5x6l4gxppy + tests/test_dialogues.py: bafybeibdkfgu2kx7rwppvhopy6idqvjhguzzfkedrzp7hpdj6lnhcc4bnq + tests/test_handlers.py: bafybeidri56t3alb4zivn6kqcf3aieeshbady4e3osunxw6u6gmpzjhx3i + tests/test_helpers.py: bafybeifi723zjei7bhlj3svkaj2uhz2labkf6esbaxpelluv4o3h6ch7gu + tests/test_rl_agent.py: bafybeiez422xh773yzym43raqurellfutra3ewdl4pjry7zkhnlv4ddjoi + tests/test_task.py: bafybeifwk6oi2ilsbm435ncjynli5iskvuwgwilivzugz67njryotz5kum fingerprint_ignore_patterns: [] connections: - fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 diff --git a/tests/test_packages/test_skills/test_gym/__init__.py b/packages/fetchai/skills/gym/tests/__init__.py similarity index 100% rename from tests/test_packages/test_skills/test_gym/__init__.py rename to packages/fetchai/skills/gym/tests/__init__.py diff --git a/tests/test_packages/test_skills/test_gym/helpers.py b/packages/fetchai/skills/gym/tests/helpers.py similarity index 100% rename from tests/test_packages/test_skills/test_gym/helpers.py rename to packages/fetchai/skills/gym/tests/helpers.py diff --git a/tests/test_packages/test_skills/test_gym/intermediate_class.py b/packages/fetchai/skills/gym/tests/intermediate_class.py similarity index 97% rename from tests/test_packages/test_skills/test_gym/intermediate_class.py rename to packages/fetchai/skills/gym/tests/intermediate_class.py index ecc6a08591..4549391406 100644 --- a/tests/test_packages/test_skills/test_gym/intermediate_class.py +++ b/packages/fetchai/skills/gym/tests/intermediate_class.py @@ -38,13 +38,14 @@ from packages.fetchai.skills.gym.rl_agent import GoodPriceModel, MyRLAgent, PriceBandit from packages.fetchai.skills.gym.tasks import GymTask -from tests.conftest import ROOT_DIR + +PACKAGE_ROOT = Path(__file__).parent.parent class GymTestCase(BaseSkillTestCase): """Sets the gym class up for testing.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "gym") + path_to_skill = PACKAGE_ROOT @classmethod def setup(cls): diff --git a/tests/test_packages/test_skills/test_gym/test_dialogues.py b/packages/fetchai/skills/gym/tests/test_dialogues.py similarity index 96% rename from tests/test_packages/test_skills/test_gym/test_dialogues.py rename to packages/fetchai/skills/gym/tests/test_dialogues.py index 4b9583638b..63efbe4888 100644 --- a/tests/test_packages/test_skills/test_gym/test_dialogues.py +++ b/packages/fetchai/skills/gym/tests/test_dialogues.py @@ -24,8 +24,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.gym.message import GymMessage from packages.fetchai.skills.gym.dialogues import DefaultDialogue, GymDialogue - -from tests.test_packages.test_skills.test_gym.intermediate_class import GymTestCase +from packages.fetchai.skills.gym.tests.intermediate_class import GymTestCase class TestDialogues(GymTestCase): diff --git a/tests/test_packages/test_skills/test_gym/test_handlers.py b/packages/fetchai/skills/gym/tests/test_handlers.py similarity index 99% rename from tests/test_packages/test_skills/test_gym/test_handlers.py rename to packages/fetchai/skills/gym/tests/test_handlers.py index 1fd29f4dad..2c73684d73 100644 --- a/tests/test_packages/test_skills/test_gym/test_handlers.py +++ b/packages/fetchai/skills/gym/tests/test_handlers.py @@ -26,8 +26,7 @@ from packages.fetchai.protocols.default.message import DefaultMessage from packages.fetchai.protocols.gym.message import GymMessage from packages.fetchai.skills.gym.dialogues import GymDialogue - -from tests.test_packages.test_skills.test_gym.intermediate_class import GymTestCase +from packages.fetchai.skills.gym.tests.intermediate_class import GymTestCase class TestGymHandler(GymTestCase): diff --git a/tests/test_packages/test_skills/test_gym/test_helpers.py b/packages/fetchai/skills/gym/tests/test_helpers.py similarity index 99% rename from tests/test_packages/test_skills/test_gym/test_helpers.py rename to packages/fetchai/skills/gym/tests/test_helpers.py index 10c360314b..f4236f5d88 100644 --- a/tests/test_packages/test_skills/test_gym/test_helpers.py +++ b/packages/fetchai/skills/gym/tests/test_helpers.py @@ -26,8 +26,7 @@ from packages.fetchai.protocols.gym.message import GymMessage from packages.fetchai.skills.gym.dialogues import GymDialogue - -from tests.test_packages.test_skills.test_gym.intermediate_class import GymTestCase +from packages.fetchai.skills.gym.tests.intermediate_class import GymTestCase class TestProxyEnv(GymTestCase): diff --git a/tests/test_packages/test_skills/test_gym/test_rl_agent.py b/packages/fetchai/skills/gym/tests/test_rl_agent.py similarity index 98% rename from tests/test_packages/test_skills/test_gym/test_rl_agent.py rename to packages/fetchai/skills/gym/tests/test_rl_agent.py index 766c8b4cfe..0b28ab204d 100644 --- a/tests/test_packages/test_skills/test_gym/test_rl_agent.py +++ b/packages/fetchai/skills/gym/tests/test_rl_agent.py @@ -24,8 +24,7 @@ from packages.fetchai.skills.gym.helpers import ProxyEnv from packages.fetchai.skills.gym.rl_agent import GoodPriceModel - -from tests.test_packages.test_skills.test_gym.intermediate_class import GymTestCase +from packages.fetchai.skills.gym.tests.intermediate_class import GymTestCase class TestPriceBandit(GymTestCase): diff --git a/tests/test_packages/test_skills/test_gym/test_task.py b/packages/fetchai/skills/gym/tests/test_task.py similarity index 97% rename from tests/test_packages/test_skills/test_gym/test_task.py rename to packages/fetchai/skills/gym/tests/test_task.py index 425959abc4..c102008ac5 100644 --- a/tests/test_packages/test_skills/test_gym/test_task.py +++ b/packages/fetchai/skills/gym/tests/test_task.py @@ -21,7 +21,7 @@ from unittest.mock import patch -from tests.test_packages.test_skills.test_gym.intermediate_class import GymTestCase +from packages.fetchai.skills.gym.tests.intermediate_class import GymTestCase class TestTask(GymTestCase): diff --git a/packages/hashes.csv b/packages/hashes.csv index 8d83890eb8..24bebf7c25 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,5 +1,5 @@ fetchai/agents/error_test,bafybeibaadvuqyyhgzvuvvdujahs4srchci5dguamslwgtohy74ik6uy7e -fetchai/agents/gym_aea,bafybeiehf7ogdbort7qigtuwezz5aewzgfgzfyke4v2spjkk23t637erpu +fetchai/agents/gym_aea,bafybeid4qhwnuhpk34jvrss6hzp2nbmespkgmey4z2hfr43uuj6w4sgufa fetchai/agents/my_first_aea,bafybeihqrio6rmj5dolw4agfo4jgkzkjcnx5qnecuiv3hvl67dlb2aqspm fetchai/connections/gym,bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 fetchai/connections/http_client,bafybeicb5ckt7xyyxk7djguraloe6qm4m7nayujjjjdpirivpcvdb3b6km @@ -25,10 +25,10 @@ fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6at fetchai/skills/fipa_dummy_buyer,bafybeialocgbh25dnwrmgo5xofc5kn5skxwzurfgepmklz6ze3mujddase fetchai/skills/generic_buyer,bafybeicnclpmi2mstrbj4domzubjjukakzu4qplwrisbggi5ye5semylum fetchai/skills/generic_seller,bafybeielnpl223fgch3vjpliu5xcvakmuk27ej7k473rzyzwhwaenkkf7a -fetchai/skills/gym,bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm +fetchai/skills/gym,bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba fetchai/skills/http_echo,bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeia3rtiche7ir3h5j4qnrekwrukvp4ysnsrtn6laaajm5pl5byyqie +open_aea/agents/gym_aea,bafybeigsiufi67imext4dejq76yloqvzpagcc2cp6eunsysgul4ugv2xk4 open_aea/agents/http_echo,bafybeib4hxhkee6vgbvmnwmk4fjql2fdqhmke6mz7mo3x54j6lht6duvze open_aea/agents/my_first_aea,bafybeic245xjddl3zyvpj5uuwtaqdmhsws6rasb2kdo6ip6e54fhnz2dvy open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 5ec6fb0a11..4b76defdce 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m - open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui skills: -- fetchai/gym:0.20.0:bafybeibu4onupkix5ag65vgd2o6yscgx3lxmreoga5zhvrgc5aukajmudm +- fetchai/gym:0.20.0:bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} From 5a38556afcda547d383d90c975c3b2db8157918f Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 07:00:44 +0000 Subject: [PATCH 47/93] feat: move http_echo skill tests to package --- packages/fetchai/skills/http_echo/skill.yaml | 3 +++ .../fetchai/skills/http_echo/tests}/__init__.py | 0 .../fetchai/skills/http_echo/tests}/test_dialogues.py | 5 +++-- .../fetchai/skills/http_echo/tests}/test_handlers.py | 5 +++-- 4 files changed, 9 insertions(+), 4 deletions(-) rename {tests/test_packages/test_skills/test_http_echo => packages/fetchai/skills/http_echo/tests}/__init__.py (100%) rename {tests/test_packages/test_skills/test_http_echo => packages/fetchai/skills/http_echo/tests}/test_dialogues.py (95%) rename {tests/test_packages/test_skills/test_http_echo => packages/fetchai/skills/http_echo/tests}/test_handlers.py (98%) diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 56b7134844..468d231390 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -11,6 +11,9 @@ fingerprint: __init__.py: bafybeigk7kbqmfrjjhyv6dvaacogp24qsv7czeb24zupvcgjqluxmlhlba dialogues.py: bafybeibdcgcmvl3g7gp7rvndrhih7fpj4qbeihdqodgqndjuaqsq3g27bm handlers.py: bafybeidxvskxngwlhdnxs2xwr54vch2wjks2l5gqtgr5t5bc2izpjfr3ti + tests/__init__.py: bafybeigqjv34vhfwcxmri75l5opezgu66jsyjj7metj7lgk2jbx4rqztyy + tests/test_dialogues.py: bafybeib4xlhm5wttmtysti4dl7alfzbu44yepckdvzlaymhqvbh33mphc4 + tests/test_handlers.py: bafybeih6js2bmvbv3pfnfpsf5bzayzje33gveti43nfsgdzqil46qazfkq fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/tests/test_packages/test_skills/test_http_echo/__init__.py b/packages/fetchai/skills/http_echo/tests/__init__.py similarity index 100% rename from tests/test_packages/test_skills/test_http_echo/__init__.py rename to packages/fetchai/skills/http_echo/tests/__init__.py diff --git a/tests/test_packages/test_skills/test_http_echo/test_dialogues.py b/packages/fetchai/skills/http_echo/tests/test_dialogues.py similarity index 95% rename from tests/test_packages/test_skills/test_http_echo/test_dialogues.py rename to packages/fetchai/skills/http_echo/tests/test_dialogues.py index f318c4ec67..2dff450ffc 100644 --- a/tests/test_packages/test_skills/test_http_echo/test_dialogues.py +++ b/packages/fetchai/skills/http_echo/tests/test_dialogues.py @@ -33,13 +33,14 @@ HttpDialogues, ) -from tests.conftest import ROOT_DIR + +PACKAGE_DIR = Path(__file__).parent.parent class TestDialogues(BaseSkillTestCase): """Test dialogue class of http_echo.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "http_echo") + path_to_skill = PACKAGE_DIR @classmethod def setup(cls): diff --git a/tests/test_packages/test_skills/test_http_echo/test_handlers.py b/packages/fetchai/skills/http_echo/tests/test_handlers.py similarity index 98% rename from tests/test_packages/test_skills/test_http_echo/test_handlers.py rename to packages/fetchai/skills/http_echo/tests/test_handlers.py index af84762d45..eac6eb21fb 100644 --- a/tests/test_packages/test_skills/test_http_echo/test_handlers.py +++ b/packages/fetchai/skills/http_echo/tests/test_handlers.py @@ -33,13 +33,14 @@ from packages.fetchai.skills.http_echo.dialogues import HttpDialogues from packages.fetchai.skills.http_echo.handlers import HttpHandler -from tests.conftest import ROOT_DIR + +PACKAGE_DIR = Path(__file__).parent.parent class TestHttpHandler(BaseSkillTestCase): """Test HttpHandler of http_echo.""" - path_to_skill = Path(ROOT_DIR, "packages", "fetchai", "skills", "http_echo") + path_to_skill = PACKAGE_DIR @classmethod def setup(cls): From 5d841fc9ee48ddbad23da38bdc96b3dd13ca00ee Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 07:03:26 +0000 Subject: [PATCH 48/93] feat: port signing protocol to package --- .../open_aea/protocols/signing/protocol.yaml | 1 + .../protocols/signing/tests}/test_signing.py | 0 tests/test_packages/test_skills/__init__.py | 20 ------------------- 3 files changed, 1 insertion(+), 20 deletions(-) rename {tests/test_packages/test_protocols => packages/open_aea/protocols/signing/tests}/test_signing.py (100%) delete mode 100644 tests/test_packages/test_skills/__init__.py diff --git a/packages/open_aea/protocols/signing/protocol.yaml b/packages/open_aea/protocols/signing/protocol.yaml index d8edddc3f8..974199a295 100644 --- a/packages/open_aea/protocols/signing/protocol.yaml +++ b/packages/open_aea/protocols/signing/protocol.yaml @@ -15,6 +15,7 @@ fingerprint: serialization.py: bafybeibxnsemtwyhyb4ztw453ojwzcwjrqth6ozvififmlszqrxsvui5i4 signing.proto: bafybeigbzr6x5wdmqzc7eanlz5xmvaoiwb4kwozgg3cugq63b7esicusra signing_pb2.py: bafybeihph4sio6j7s773dbzc46qrt7hyepxo6banh3c3arwuafoekuaddy + tests/test_signing.py: bafybeiaxcq4iftb3hnvbspcjorxzyfpexbzsel5xkszdhx3fdutqcuodh4 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/tests/test_packages/test_protocols/test_signing.py b/packages/open_aea/protocols/signing/tests/test_signing.py similarity index 100% rename from tests/test_packages/test_protocols/test_signing.py rename to packages/open_aea/protocols/signing/tests/test_signing.py diff --git a/tests/test_packages/test_skills/__init__.py b/tests/test_packages/test_skills/__init__.py deleted file mode 100644 index 2c04fb9d76..0000000000 --- a/tests/test_packages/test_skills/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""The tests module contains the tests of the packages/skills dir.""" From 5c2ac35cf0d520e48477b3985dff4c07b82cdbd3 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 07:05:58 +0000 Subject: [PATCH 49/93] feat: move tendermint protocol test to package --- packages/valory/protocols/tendermint/protocol.yaml | 1 + .../valory/protocols/tendermint/tests}/test_tendermint.py | 0 2 files changed, 1 insertion(+) rename {tests/test_packages/test_protocols => packages/valory/protocols/tendermint/tests}/test_tendermint.py (100%) diff --git a/packages/valory/protocols/tendermint/protocol.yaml b/packages/valory/protocols/tendermint/protocol.yaml index b37b1b0eb7..c63c17c0cd 100644 --- a/packages/valory/protocols/tendermint/protocol.yaml +++ b/packages/valory/protocols/tendermint/protocol.yaml @@ -16,6 +16,7 @@ fingerprint: serialization.py: bafybeiap76eao4kujtfwifyetk6kdfew2crh5mbiv6azhvzyvbchy7tyjm tendermint.proto: bafybeifl55fxdrmlawk5xss2eljvg7kt4vhcpg2mksssoxwdcva2mypwbm tendermint_pb2.py: bafybeichxhzyzms2g4j7kutnn6xgjqnryro6ywprdimfriazbm2igauh34 + tests/test_tendermint.py: bafybeidf622jpadmuo6o6gow6r7pbypvj5ji7gisognnufdjiljkfcv6qu fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/tests/test_packages/test_protocols/test_tendermint.py b/packages/valory/protocols/tendermint/tests/test_tendermint.py similarity index 100% rename from tests/test_packages/test_protocols/test_tendermint.py rename to packages/valory/protocols/tendermint/tests/test_tendermint.py From 9875533a1b53eab2fa31138608f12922e4ad7980 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 07:13:38 +0000 Subject: [PATCH 50/93] chore: remove ported protocol tests --- .../test_protocols/test_default.py | 212 ----- .../test_packages/test_protocols/test_fipa.py | 863 ------------------ .../test_packages/test_protocols/test_gym.py | 427 --------- .../test_packages/test_protocols/test_http.py | 327 ------- .../test_protocols/test_ledger_api.py | 674 -------------- .../test_protocols/test_oef_search.py | 495 ---------- .../test_protocols/test_state_update.py | 233 ----- .../test_packages/test_protocols/test_tac.py | 579 ------------ 8 files changed, 3810 deletions(-) delete mode 100644 tests/test_packages/test_protocols/test_default.py delete mode 100644 tests/test_packages/test_protocols/test_fipa.py delete mode 100644 tests/test_packages/test_protocols/test_gym.py delete mode 100644 tests/test_packages/test_protocols/test_http.py delete mode 100644 tests/test_packages/test_protocols/test_ledger_api.py delete mode 100644 tests/test_packages/test_protocols/test_oef_search.py delete mode 100644 tests/test_packages/test_protocols/test_state_update.py delete mode 100644 tests/test_packages/test_protocols/test_tac.py diff --git a/tests/test_packages/test_protocols/test_default.py b/tests/test_packages/test_protocols/test_default.py deleted file mode 100644 index faac2bd409..0000000000 --- a/tests/test_packages/test_protocols/test_default.py +++ /dev/null @@ -1,212 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the messages module.""" - -from typing import Type -from unittest import mock -from unittest.mock import patch - -import pytest - -from aea.common import Address -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -from packages.fetchai.protocols.default.dialogues import ( - DefaultDialogue as BaseDefaultDialogue, -) -from packages.fetchai.protocols.default.dialogues import ( - DefaultDialogues as BaseDefaultDialogues, -) -from packages.fetchai.protocols.default.message import DefaultMessage - - -def test_default_bytes_serialization(): - """Test that the serialization for the 'simple' protocol works for the BYTES message.""" - expected_msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - msg_bytes = DefaultMessage.serializer.encode(expected_msg) - actual_msg = DefaultMessage.serializer.decode(msg_bytes) - assert expected_msg == actual_msg - - -def test_default_error_serialization(): - """Test that the serialization for the 'simple' protocol works for the ERROR message.""" - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.ERROR, - error_code=DefaultMessage.ErrorCode.UNSUPPORTED_PROTOCOL, - error_msg="An error", - error_data={"error": b"Some error data"}, - ) - msg_bytes = DefaultMessage.serializer.encode(msg) - actual_msg = DefaultMessage.serializer.decode(msg_bytes) - expected_msg = msg - assert expected_msg == actual_msg - - -def test_default_end_serialization(): - """Test that the serialization for the 'simple' protocol works for the END message.""" - msg = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.END, - ) - msg_bytes = DefaultMessage.serializer.encode(msg) - actual_msg = DefaultMessage.serializer.decode(msg_bytes) - expected_msg = msg - assert expected_msg == actual_msg - - -def test_default_message_str_values(): - """Tests the returned string values of default Message.""" - assert ( - str(DefaultMessage.Performative.BYTES) == "bytes" - ), "DefaultMessage.Performative.BYTES must be bytes" - assert ( - str(DefaultMessage.Performative.ERROR) == "error" - ), "DefaultMessage.Performative.ERROR must be error" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = DefaultMessage( - performative=DefaultMessage.Performative.BYTES, content=b"hello" - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - DefaultMessage.Performative, "__eq__", return_value=False - ): - DefaultMessage.serializer.encode(msg) - - -def test_check_consistency_raises_exception_when_type_not_recognized(): - """Test that we raise exception when the type of the message is not recognized.""" - message = DefaultMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - # mock the __eq__ method such that any kind of matching is going to fail. - with mock.patch.object(DefaultMessage.Performative, "__eq__", return_value=False): - assert not message._is_consistent() - - -def test_default_valid_performatives(): - """Test 'valid_performatives' getter.""" - msg = DefaultMessage(DefaultMessage.Performative.BYTES, content=b"") - assert msg.valid_performatives == set( - map(lambda x: x.value, iter(DefaultMessage.Performative)) - ) - - -def test_serializer_performative_not_found(): - """Test the serializer when the performative is not found.""" - message = DefaultMessage( - message_id=1, - target=0, - performative=DefaultMessage.Performative.BYTES, - content=b"", - ) - message_bytes = message.serializer.encode(message) - with patch.object(DefaultMessage.Performative, "__eq__", return_value=False): - with pytest.raises(ValueError, match="Performative not valid: .*"): - message.serializer.decode(message_bytes) - - -def test_dialogues(): - """Test intiaontiation of dialogues.""" - default_dialogues = DefaultDialogues("agent_addr") - msg, dialogue = default_dialogues.create( - counterparty="abc", - performative=DefaultMessage.Performative.BYTES, - content=b"hello", - ) - assert dialogue is not None - - -class DefaultDialogue(BaseDefaultDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[DefaultMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - BaseDefaultDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class DefaultDialogues(BaseDefaultDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return DefaultDialogue.Role.AGENT - - BaseDefaultDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=DefaultDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_fipa.py b/tests/test_packages/test_protocols/test_fipa.py deleted file mode 100644 index 1ca1b4407f..0000000000 --- a/tests/test_packages/test_protocols/test_fipa.py +++ /dev/null @@ -1,863 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the fipa protocol package.""" - -import logging -import sys -from typing import Any, Optional, Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.helpers.search.models import Constraint, ConstraintType, Description, Query -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues -from packages.fetchai.protocols.fipa.message import FipaMessage -from packages.fetchai.protocols.fipa.message import ( - _default_logger as fipa_message_logger, -) - -from tests.conftest import ROOT_DIR - - -logger = logging.getLogger(__name__) -sys.path.append(ROOT_DIR) - - -def test_cfp_serialization(): - """Test that the serialization for the 'fipa' protocol works.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.CFP, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_propose_serialization(): - """Test that the serialization for the 'fipa' protocol works.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.PROPOSE, - proposal=Description({"foo1": 1, "bar1": 2}), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_accept_serialization(): - """Test that the serialization for the 'fipa' protocol works.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.ACCEPT, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_decline_serialization(): - """Test that the serialization for the 'fipa' protocol works.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.DECLINE, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_match_accept_serialization(): - """Test the serialization - deserialization of the match_accept performative.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.MATCH_ACCEPT, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_accept_with_inform_serialization(): - """Test the serialization - deserialization of the accept_with_address performative.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.ACCEPT_W_INFORM, - info={"address": "dummy_address"}, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_match_accept_with_inform_serialization(): - """Test the serialization - deserialization of the match_accept_with_address performative.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.MATCH_ACCEPT_W_INFORM, - info={"address": "dummy_address", "signature": "my_signature"}, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_inform_serialization(): - """Test the serialization-deserialization of the inform performative.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.INFORM, - info={"foo": "bar"}, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_end_serialization(): - """Test the serialization-deserialization of the end performative.""" - msg = FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.END, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = FipaMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_performative_string_value(): - """Test the string value of the performatives.""" - assert str(FipaMessage.Performative.CFP) == "cfp", "The str value must be cfp" - assert ( - str(FipaMessage.Performative.PROPOSE) == "propose" - ), "The str value must be propose" - assert ( - str(FipaMessage.Performative.DECLINE) == "decline" - ), "The str value must be decline" - assert ( - str(FipaMessage.Performative.ACCEPT) == "accept" - ), "The str value must be accept" - assert ( - str(FipaMessage.Performative.MATCH_ACCEPT) == "match_accept" - ), "The str value must be match_accept" - assert ( - str(FipaMessage.Performative.ACCEPT_W_INFORM) == "accept_w_inform" - ), "The str value must be accept_w_inform" - assert ( - str(FipaMessage.Performative.MATCH_ACCEPT_W_INFORM) == "match_accept_w_inform" - ), "The str value must be match_accept_w_inform" - assert ( - str(FipaMessage.Performative.INFORM) == "inform" - ), "The str value must be inform" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = FipaMessage( - performative=FipaMessage.Performative.ACCEPT, - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(FipaMessage.Performative, "__eq__", return_value=False): - FipaMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = FipaMessage( - performative=FipaMessage.Performative.ACCEPT, - ) - - encoded_msg = FipaMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(FipaMessage.Performative, "__eq__", return_value=False): - FipaMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.fipa.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the fipa message is incorrect.""" - with mock.patch.object(fipa_message_logger, "error") as mock_logger: - FipaMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=FipaMessage.Performative.ACCEPT, - ) - - mock_logger.assert_any_call("some error") - - -class TestDialogues: - """Tests fipa dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.buyer_addr = "buyer address" - cls.seller_addr = "seller address" - cls.buyer_dialogues = BuyerDialogues(cls.buyer_addr) - cls.seller_dialogues = SellerDialogues(cls.seller_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.buyer_dialogues._create_self_initiated( - dialogue_opponent_addr=self.seller_addr, - dialogue_reference=(str(0), ""), - role=FipaDialogue.Role.SELLER, - ) - assert isinstance(result, FipaDialogue) - assert result.role == FipaDialogue.Role.SELLER, "The role must be seller." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.buyer_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.seller_addr, - dialogue_reference=(str(0), ""), - role=FipaDialogue.Role.BUYER, - ) - assert isinstance(result, FipaDialogue) - assert result.role == FipaDialogue.Role.BUYER, "The role must be buyer." - - def test_dialogue_endstates(self): - """Test the end states of a dialogue.""" - assert self.buyer_dialogues.dialogue_stats is not None - self.buyer_dialogues.dialogue_stats.add_dialogue_endstate( - FipaDialogue.EndState.SUCCESSFUL, is_self_initiated=True - ) - self.buyer_dialogues.dialogue_stats.add_dialogue_endstate( - FipaDialogue.EndState.DECLINED_CFP, is_self_initiated=False - ) - assert self.buyer_dialogues.dialogue_stats.self_initiated == { - FipaDialogue.EndState.SUCCESSFUL: 1, - FipaDialogue.EndState.DECLINED_PROPOSE: 0, - FipaDialogue.EndState.DECLINED_ACCEPT: 0, - FipaDialogue.EndState.DECLINED_CFP: 0, - } - assert self.buyer_dialogues.dialogue_stats.other_initiated == { - FipaDialogue.EndState.SUCCESSFUL: 0, - FipaDialogue.EndState.DECLINED_PROPOSE: 0, - FipaDialogue.EndState.DECLINED_ACCEPT: 0, - FipaDialogue.EndState.DECLINED_CFP: 1, - } - - def test_dialogues_self_initiated(self): - """Test an end to end scenario of client-seller dialogue.""" - - # Create a message destined for the seller. - cfp_msg, buyer_dialogue = self.buyer_dialogues.create( - counterparty=self.seller_addr, - performative=FipaMessage.Performative.CFP, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - - # Checking that I can retrieve the dialogue. - retrieved_dialogue = self.buyer_dialogues.get_dialogue(cfp_msg) - assert ( - retrieved_dialogue == buyer_dialogue - ), "Should have found correct dialogue" - - assert ( - cfp_msg.dialogue_reference[0] != "" and cfp_msg.dialogue_reference[1] == "" - ), "The dialogue_reference is not set correctly." - - # MESSAGE BEING SENT BETWEEN AGENTS - - # Creates a new dialogue for the seller side based on the income message. - seller_dialogue = self.seller_dialogues.update(cfp_msg) - - # Check that both fields in the dialogue_reference are set. - last_msg = seller_dialogue.last_incoming_message - assert last_msg == cfp_msg, "The messages must be equal" - - # Generate a proposal message to send to the buyer. - proposal = Description({"foo1": 1, "bar1": 2}) - proposal_msg = seller_dialogue.reply( - target_message=cfp_msg, - performative=FipaMessage.Performative.PROPOSE, - proposal=proposal, - ) - - # MESSAGE BEING SENT BETWEEN AGENTS - - # Client received the message and we extend the incoming messages list. - buyer_dialogue = self.buyer_dialogues.update(proposal_msg) - - # Check that both fields in the dialogue_reference are set. - last_msg = buyer_dialogue.last_incoming_message - assert last_msg == proposal_msg, "The two messages must be equal." - - # Retrieve the dialogue based on the received message. - retrieved_dialogue = self.buyer_dialogues.get_dialogue(proposal_msg) - assert retrieved_dialogue == buyer_dialogue, "Should have found dialogue" - - # Create an accept_w_inform message to send seller. - accept_msg = buyer_dialogue.reply( - target_message=proposal_msg, - performative=FipaMessage.Performative.ACCEPT_W_INFORM, - info={"address": "dummy_address"}, - ) - # MESSAGE BEING SENT BETWEEN AGENTS - - # Adds the message to the seller incoming message list. - seller_dialogue = self.seller_dialogues.update(accept_msg) - - retrieved_dialogue = self.seller_dialogues.get_dialogue(accept_msg) - assert seller_dialogue == retrieved_dialogue, "Should have found dialogue" - - def test_update(self): - """Test the `update` functionality.""" - cfp_msg, buyer_dialogue = self.buyer_dialogues.create( - counterparty=self.seller_addr, - performative=FipaMessage.Performative.CFP, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - - assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing message." - assert len(buyer_dialogue._incoming_messages) == 0, "Some incoming messages." - assert ( - buyer_dialogue.last_outgoing_message == cfp_msg - ), "Wrong outgoing message." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[0] != "" - ), "Dialogue reference incorrect." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[1] == "" - ), "Dialogue reference incorrect." - dialogue_reference_left_part = buyer_dialogue.dialogue_label.dialogue_reference[ - 0 - ] - - # message arrives at counterparty - seller_dialogue = self.seller_dialogues.update(cfp_msg) - - assert len(seller_dialogue._outgoing_messages) == 0, "Some outgoing message." - assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." - assert ( - seller_dialogue.last_incoming_message == cfp_msg - ), "Wrong incoming message." - assert ( - seller_dialogue.dialogue_label.dialogue_reference[0] != "" - ), "Dialogue reference incorrect." - assert ( - seller_dialogue.dialogue_label.dialogue_reference[1] != "" - ), "Dialogue reference incorrect." - - # seller creates response message - proposal_msg = seller_dialogue.reply( - target_message=cfp_msg, - performative=FipaMessage.Performative.PROPOSE, - proposal=Description({"foo1": 1, "bar1": 2}), - ) - - assert len(seller_dialogue._outgoing_messages) == 1, "No outgoing messages." - assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." - assert ( - seller_dialogue.last_outgoing_message == proposal_msg - ), "Wrong outgoing message." - - # message arrives at counterparty - self.buyer_dialogues.update(proposal_msg) - - assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing messages." - assert len(buyer_dialogue._incoming_messages) == 1, "No incoming messages." - assert ( - buyer_dialogue.last_outgoing_message == cfp_msg - ), "Wrong outgoing message." - assert ( - buyer_dialogue.last_incoming_message == proposal_msg - ), "Wrong incoming message." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[0] != "" - ), "Dialogue reference incorrect." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[1] != "" - ), "Dialogue reference incorrect." - assert ( - dialogue_reference_left_part - == buyer_dialogue.dialogue_label.dialogue_reference[0] - ), "Dialogue refernce changed unexpectedly." - - def test_counter_proposing(self): - """Test that fipa supports counter proposing.""" - cfp_msg, buyer_dialogue = self.buyer_dialogues.create( - counterparty=self.seller_addr, - performative=FipaMessage.Performative.CFP, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - - assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing message." - assert len(buyer_dialogue._incoming_messages) == 0, "Some incoming messages." - assert ( - buyer_dialogue.last_outgoing_message == cfp_msg - ), "wrong outgoing message in buyer dialogue after sending cfp." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[0] != "" - ), "Dialogue reference incorrect." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[1] == "" - ), "Dialogue reference incorrect." - dialogue_reference_left_part = buyer_dialogue.dialogue_label.dialogue_reference[ - 0 - ] - - # cfp arrives at seller - - seller_dialogue = self.seller_dialogues.update(cfp_msg) - - assert len(seller_dialogue._outgoing_messages) == 0, "Some outgoing message." - assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." - assert ( - seller_dialogue.last_incoming_message == cfp_msg - ), "wrong incoming message in seller dialogue after receiving cfp." - assert ( - seller_dialogue.dialogue_label.dialogue_reference[0] != "" - ), "Dialogue reference incorrect." - assert ( - seller_dialogue.dialogue_label.dialogue_reference[1] != "" - ), "Dialogue reference incorrect." - - # seller creates proposal - proposal_msg = seller_dialogue.reply( - target_message=cfp_msg, - performative=FipaMessage.Performative.PROPOSE, - proposal=Description({"foo1": 1, "bar1": 2}), - ) - - assert len(seller_dialogue._outgoing_messages) == 1, "No outgoing messages." - assert len(seller_dialogue._incoming_messages) == 1, "No incoming messages." - assert ( - seller_dialogue.last_outgoing_message == proposal_msg - ), "wrong outgoing message in seller dialogue after sending proposal." - - # proposal arrives at buyer - - buyer_dialogue = self.buyer_dialogues.update(proposal_msg) - - assert len(buyer_dialogue._outgoing_messages) == 1, "No outgoing messages." - assert len(buyer_dialogue._incoming_messages) == 1, "No incoming messages." - assert ( - buyer_dialogue.last_incoming_message == proposal_msg - ), "wrong incoming message in buyer dialogue after receiving proposal." - assert ( - buyer_dialogue.last_incoming_message == proposal_msg - ), "Wrong incoming message." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[0] != "" - ), "Dialogue reference incorrect." - assert ( - buyer_dialogue.dialogue_label.dialogue_reference[1] != "" - ), "Dialogue reference incorrect." - assert ( - dialogue_reference_left_part - == buyer_dialogue.dialogue_label.dialogue_reference[0] - ), "Dialogue refernce changed unexpectedly." - - # buyer creates counter proposal 1 - counter_proposal_msg_1 = buyer_dialogue.reply( - target_message=proposal_msg, - performative=FipaMessage.Performative.PROPOSE, - proposal=Description({"foo1": 3, "bar1": 3}), - ) - - assert ( - len(buyer_dialogue._outgoing_messages) == 2 - ), "incorrect number of outgoing_messages in buyer dialogue after sending counter-proposal 1." - assert ( - len(buyer_dialogue._incoming_messages) == 1 - ), "incorrect number of incoming_messages in buyer dialogue after sending counter-proposal 1." - assert ( - buyer_dialogue.last_outgoing_message == counter_proposal_msg_1 - ), "wrong outgoing message in buyer dialogue after sending counter-proposal 1." - - # counter-proposal 1 arrives at seller - - seller_dialogue = self.seller_dialogues.update(counter_proposal_msg_1) - - assert ( - len(seller_dialogue._outgoing_messages) == 1 - ), "incorrect number of outgoing_messages in seller dialogue after receiving counter-proposal 1." - assert ( - len(seller_dialogue._incoming_messages) == 2 - ), "incorrect number of incoming_messages in seller dialogue after receiving counter-proposal 1." - assert ( - seller_dialogue.last_incoming_message == counter_proposal_msg_1 - ), "wrong incoming message in seller dialogue after receiving counter-proposal 1." - - # seller creates counter-proposal 2 - counter_proposal_msg_2 = seller_dialogue.reply( - target_message=counter_proposal_msg_1, - performative=FipaMessage.Performative.PROPOSE, - proposal=Description({"foo1": 2, "bar1": 2}), - ) - - assert ( - len(seller_dialogue._outgoing_messages) == 2 - ), "incorrect number of outgoing_messages in seller dialogue after sending counter-proposal 2." - assert ( - len(seller_dialogue._incoming_messages) == 2 - ), "incorrect number of incoming_messages in seller dialogue after sending counter-proposal 2." - assert ( - seller_dialogue.last_outgoing_message == counter_proposal_msg_2 - ), "wrong outgoing message in seller dialogue after sending counter-proposal 2." - - # counter-proposal 2 arrives at buyer - - buyer_dialogue = self.buyer_dialogues.update(counter_proposal_msg_2) - - assert ( - len(buyer_dialogue._outgoing_messages) == 2 - ), "incorrect number of outgoing_messages in buyer dialogue after receiving counter-proposal 2." - assert ( - len(buyer_dialogue._incoming_messages) == 2 - ), "incorrect number of incoming_messages in buyer dialogue after receiving counter-proposal 2." - assert ( - buyer_dialogue.last_incoming_message == counter_proposal_msg_2 - ), "wrong incoming message in buyer dialogue after receiving counter-proposal 2." - - -class BuyerDialogue(FipaDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[FipaMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - FipaDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class BuyerDialogues(FipaDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return FipaDialogue.Role.BUYER - - FipaDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=BuyerDialogue, - ) - - -class SellerDialogue(FipaDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - __slots__ = ("some_object",) - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[FipaMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - FipaDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - self.some_object = None # type: Optional[Any] - - -class SellerDialogues(FipaDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return FipaDialogue.Role.SELLER - - FipaDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=SellerDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_gym.py b/tests/test_packages/test_protocols/test_gym.py deleted file mode 100644 index a7a9379cf6..0000000000 --- a/tests/test_packages/test_protocols/test_gym.py +++ /dev/null @@ -1,427 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the gym protocol package.""" - -import sys -from typing import Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.gym.dialogues import GymDialogue, GymDialogues -from packages.fetchai.protocols.gym.message import GymMessage -from packages.fetchai.protocols.gym.message import _default_logger as gym_message_logger - -from tests.conftest import ROOT_DIR - - -sys.path.append(ROOT_DIR) - - -def test_act_serialization(): - """Test the serialization for 'act' speech-act works.""" - msg = GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.ACT, - action=GymMessage.AnyObject("some_action"), - step_id=1, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = GymMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_percept_serialization(): - """Test the serialization for 'percept' speech-act works.""" - msg = GymMessage( - message_id=2, - dialogue_reference=(str(0), ""), - target=1, - performative=GymMessage.Performative.PERCEPT, - step_id=1, - observation=GymMessage.AnyObject("some_observation"), - reward=10.0, - done=False, - info=GymMessage.AnyObject("some_info"), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = GymMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_status_serialization(): - """Test the serialization for 'status' speech-act works.""" - content_arg = { - "key_1": "value_1", - "key_2": "value_2", - } - msg = GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.STATUS, - content=content_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = GymMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_reset_serialization(): - """Test the serialization for 'reset' speech-act works.""" - msg = GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.RESET, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = GymMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_close_serialization(): - """Test the serialization for 'close' speech-act works.""" - msg = GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.CLOSE, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = GymMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_performative_string_value(): - """Test the string value of the performatives.""" - assert str(GymMessage.Performative.ACT) == "act", "The str value must be act" - assert ( - str(GymMessage.Performative.PERCEPT) == "percept" - ), "The str value must be percept" - assert ( - str(GymMessage.Performative.STATUS) == "status" - ), "The str value must be status" - assert str(GymMessage.Performative.RESET) == "reset", "The str value must be reset" - assert str(GymMessage.Performative.CLOSE) == "close", "The str value must be close" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.RESET, - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(GymMessage.Performative, "__eq__", return_value=False): - GymMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.RESET, - ) - - encoded_msg = GymMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(GymMessage.Performative, "__eq__", return_value=False): - GymMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.gym.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the message is incorrect.""" - with mock.patch.object(gym_message_logger, "error") as mock_logger: - GymMessage( - message_id=1, - dialogue_reference=(str(0), ""), - target=0, - performative=GymMessage.Performative.RESET, - ) - - mock_logger.assert_any_call("some error") - - -class TestDialogues: - """Tests gym dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.agent_addr = "agent address" - cls.env_addr = "env address" - cls.agent_dialogues = AgentDialogues(cls.agent_addr) - cls.env_dialogues = EnvironmentDialogues(cls.env_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.agent_dialogues._create_self_initiated( - dialogue_opponent_addr=self.env_addr, - dialogue_reference=(str(0), ""), - role=GymDialogue.Role.AGENT, - ) - assert isinstance(result, GymDialogue) - assert result.role == GymDialogue.Role.AGENT, "The role must be Agent." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.agent_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.env_addr, - dialogue_reference=(str(0), ""), - role=GymDialogue.Role.AGENT, - ) - assert isinstance(result, GymDialogue) - assert result.role == GymDialogue.Role.AGENT, "The role must be agent." - - -class AgentDialogue(GymDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[GymMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - GymDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class AgentDialogues(GymDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return GymDialogue.Role.AGENT - - GymDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=AgentDialogue, - ) - - -class EnvironmentDialogue(GymDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[GymMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - GymDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class EnvironmentDialogues(GymDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return GymDialogue.Role.ENVIRONMENT - - GymDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=EnvironmentDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_http.py b/tests/test_packages/test_protocols/test_http.py deleted file mode 100644 index 152b4a5d1a..0000000000 --- a/tests/test_packages/test_protocols/test_http.py +++ /dev/null @@ -1,327 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the http protocol package.""" - -import sys -from typing import Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues -from packages.fetchai.protocols.http.message import HttpMessage -from packages.fetchai.protocols.http.message import ( - _default_logger as http_message_logger, -) - -from tests.conftest import ROOT_DIR - - -sys.path.append(ROOT_DIR) - - -def test_request_serialization(): - """Test the serialization for 'request' speech-act works.""" - msg = HttpMessage( - performative=HttpMessage.Performative.REQUEST, - method="some_method", - url="url", - version="some_version", - headers="some_headers", - body=b"some_body", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = HttpMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_response_serialization(): - """Test the serialization for 'response' speech-act works.""" - msg = HttpMessage( - message_id=2, - target=1, - performative=HttpMessage.Performative.RESPONSE, - version="some_version", - status_code=1, - status_text="some_status_text", - headers="some_headers", - body=b"some_body", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = HttpMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_performative_string_value(): - """Test the string value of the performatives.""" - assert ( - str(HttpMessage.Performative.REQUEST) == "request" - ), "The str value must be request" - assert ( - str(HttpMessage.Performative.RESPONSE) == "response" - ), "The str value must be response" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = HttpMessage( - performative=HttpMessage.Performative.REQUEST, - method="some_method", - url="url", - version="some_version", - headers="some_headers", - body=b"some_body", - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(HttpMessage.Performative, "__eq__", return_value=False): - HttpMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = HttpMessage( - performative=HttpMessage.Performative.REQUEST, - method="some_method", - url="url", - version="some_version", - headers="some_headers", - body=b"some_body", - ) - - encoded_msg = HttpMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(HttpMessage.Performative, "__eq__", return_value=False): - HttpMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.http.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the message is incorrect.""" - with mock.patch.object(http_message_logger, "error") as mock_logger: - HttpMessage( - performative=HttpMessage.Performative.REQUEST, - method="some_method", - url="url", - version="some_version", - headers="some_headers", - body=b"some_body", - ) - - mock_logger.assert_any_call("some error") - - -class TestDialogues: - """Tests http dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.agent_addr = "agent address" - cls.server_addr = "server address" - cls.agent_dialogues = AgentDialogues(cls.agent_addr) - cls.server_dialogues = ServerDialogues(cls.server_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.agent_dialogues._create_self_initiated( - dialogue_opponent_addr=self.server_addr, - dialogue_reference=(str(0), ""), - role=HttpDialogue.Role.CLIENT, - ) - assert isinstance(result, HttpDialogue) - assert result.role == HttpDialogue.Role.CLIENT, "The role must be client." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.agent_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.server_addr, - dialogue_reference=(str(0), ""), - role=HttpDialogue.Role.CLIENT, - ) - assert isinstance(result, HttpDialogue) - assert result.role == HttpDialogue.Role.CLIENT, "The role must be client." - - -class AgentDialogue(HttpDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[HttpMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - HttpDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class AgentDialogues(HttpDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return HttpDialogue.Role.CLIENT - - HttpDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=AgentDialogue, - ) - - -class ServerDialogue(HttpDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[HttpMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - HttpDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class ServerDialogues(HttpDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return HttpDialogue.Role.SERVER - - HttpDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=ServerDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_ledger_api.py b/tests/test_packages/test_protocols/test_ledger_api.py deleted file mode 100644 index e49b4156ca..0000000000 --- a/tests/test_packages/test_protocols/test_ledger_api.py +++ /dev/null @@ -1,674 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the messages module.""" - -import sys -from typing import Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.helpers.transaction.base import State -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.ledger_api.custom_types import Kwargs -from packages.fetchai.protocols.ledger_api.dialogues import ( - LedgerApiDialogue, - LedgerApiDialogues, -) -from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage -from packages.fetchai.protocols.ledger_api.message import ( - _default_logger as ledger_api_message_logger, -) - -from tests.conftest import ROOT_DIR - - -sys.path.append(ROOT_DIR) - - -def test_get_balance_serialization(): - """Test the serialization for 'get_balance' speech-act works.""" - msg = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_BALANCE, - ledger_id="some_ledger_id", - address="some_address", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_get_state_serialization(): - """Test the serialization for 'get_state' speech-act works.""" - - args = ("arg1", "arg2") - kwargs = Kwargs({"key": "value"}) - - assert str(kwargs) == "Kwargs: body={'key': 'value'}" - - msg = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_STATE, - ledger_id="some_ledger_id", - callable="some_function", - args=args, - kwargs=kwargs, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_get_raw_transaction_serialization(): - """Test the serialization for 'get_raw_transaction' speech-act works.""" - terms_arg = LedgerApiMessage.Terms( - ledger_id="some_ledger_id", - sender_address="some_sender_address", - counterparty_address="some_counterparty_address", - amount_by_currency_id={"currency_id_1": 1}, - quantities_by_good_id={"good_id_1": -1, "good_id_2": -2}, - nonce="some_nonce", - is_sender_payable_tx_fee=False, - fee_by_currency_id={"currency_id_1": 1}, - is_strict=True, - ) - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.GET_RAW_TRANSACTION, - terms=terms_arg, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_send_signed_transaction_serialization(): - """Test the serialization for 'send_signed_transaction' speech-act works.""" - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION, - signed_transaction=LedgerApiMessage.SignedTransaction( - "some_ledger_id", {"body": "some_body"} - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_get_transaction_receipt_serialization(): - """Test the serialization for 'get_transaction_receipt' speech-act works.""" - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT, - transaction_digest=LedgerApiMessage.TransactionDigest( - "some_ledger_id", "some_body" - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_balance_serialization(): - """Test the serialization for 'balance' speech-act works.""" - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.BALANCE, - ledger_id="some_ledger_id", - balance=125, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_state_serialization(): - """Test the serialization for 'state' speech-act works.""" - - ledger_id = "some_ledger_id" - state = State(ledger_id, {"key": "some_state"}) - - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.STATE, - ledger_id=ledger_id, - state=state, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_raw_transaction_serialization(): - """Test the serialization for 'raw_transaction' speech-act works.""" - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.RAW_TRANSACTION, - raw_transaction=LedgerApiMessage.RawTransaction( - "some_ledger_id", {"body": "some_body"} - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_transaction_digest_serialization(): - """Test the serialization for 'transaction_digest' speech-act works.""" - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.TRANSACTION_DIGEST, - transaction_digest=LedgerApiMessage.TransactionDigest( - "some_ledger_id", "some_body" - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_transaction_receipt_serialization(): - """Test the serialization for 'transaction_receipt' speech-act works.""" - msg = LedgerApiMessage( - message_id=2, - target=1, - performative=LedgerApiMessage.Performative.TRANSACTION_RECEIPT, - transaction_receipt=LedgerApiMessage.TransactionReceipt( - "some_ledger_id", {"key": "some_receipt"}, {"key": "some_transaction"} - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_error_serialization(): - """Test the serialization for 'error' speech-act works.""" - msg = LedgerApiMessage( - performative=LedgerApiMessage.Performative.ERROR, - code=7, - message="some_error_message", - data=b"some_error_data", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = LedgerApiMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_performative_string_value(): - """Test the string value of the performatives.""" - assert ( - str(LedgerApiMessage.Performative.GET_BALANCE) == "get_balance" - ), "The str value must be get_balance" - assert ( - str(LedgerApiMessage.Performative.GET_RAW_TRANSACTION) == "get_raw_transaction" - ), "The str value must be get_raw_transaction" - assert ( - str(LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION) - == "send_signed_transaction" - ), "The str value must be send_signed_transaction" - assert ( - str(LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT) - == "get_transaction_receipt" - ), "The str value must be get_transaction_receipt" - assert ( - str(LedgerApiMessage.Performative.BALANCE) == "balance" - ), "The str value must be balance" - assert ( - str(LedgerApiMessage.Performative.RAW_TRANSACTION) == "raw_transaction" - ), "The str value must be raw_transaction" - assert ( - str(LedgerApiMessage.Performative.TRANSACTION_DIGEST) == "transaction_digest" - ), "The str value must be transaction_digest" - assert ( - str(LedgerApiMessage.Performative.TRANSACTION_RECEIPT) == "transaction_receipt" - ), "The str value must be transaction_receipt" - assert ( - str(LedgerApiMessage.Performative.ERROR) == "error" - ), "The str value must be error" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_BALANCE, - ledger_id="some_ledger_id", - address="some_address", - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - LedgerApiMessage.Performative, "__eq__", return_value=False - ): - LedgerApiMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_BALANCE, - ledger_id="some_ledger_id", - address="some_address", - ) - - encoded_msg = LedgerApiMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - LedgerApiMessage.Performative, "__eq__", return_value=False - ): - LedgerApiMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.ledger_api.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the message is incorrect.""" - with mock.patch.object(ledger_api_message_logger, "error") as mock_logger: - LedgerApiMessage( - performative=LedgerApiMessage.Performative.GET_BALANCE, - ledger_id="some_ledger_id", - address="some_address", - ) - - mock_logger.assert_any_call("some error") - - -class TestDialogues: - """Tests ledger_api dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.agent_addr = "agent address" - cls.ledger_addr = "ledger address" - cls.agent_dialogues = AgentDialogues(cls.agent_addr) - cls.ledger_dialogues = LedgerDialogues(cls.ledger_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.agent_dialogues._create_self_initiated( - dialogue_opponent_addr=self.ledger_addr, - dialogue_reference=(str(0), ""), - role=LedgerApiDialogue.Role.AGENT, - ) - assert isinstance(result, LedgerApiDialogue) - assert result.role == LedgerApiDialogue.Role.AGENT, "The role must be agent." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.agent_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.ledger_addr, - dialogue_reference=(str(0), ""), - role=LedgerApiDialogue.Role.AGENT, - ) - assert isinstance(result, LedgerApiDialogue) - assert result.role == LedgerApiDialogue.Role.AGENT, "The role must be agen t." - - -class AgentDialogue(LedgerApiDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[LedgerApiMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - LedgerApiDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class AgentDialogues(LedgerApiDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return LedgerApiDialogue.Role.AGENT - - LedgerApiDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=AgentDialogue, - ) - - -class LedgerDialogue(LedgerApiDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[LedgerApiMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - LedgerApiDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class LedgerDialogues(LedgerApiDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return LedgerApiDialogue.Role.LEDGER - - LedgerApiDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=LedgerDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_oef_search.py b/tests/test_packages/test_protocols/test_oef_search.py deleted file mode 100644 index 702f4769c2..0000000000 --- a/tests/test_packages/test_protocols/test_oef_search.py +++ /dev/null @@ -1,495 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the oef_search protocol package.""" - -import sys -from typing import Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.helpers.search.models import Constraint, ConstraintType, Description, Query -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.oef_search.dialogues import ( - OefSearchDialogue, - OefSearchDialogues, -) -from packages.fetchai.protocols.oef_search.message import OefSearchMessage -from packages.fetchai.protocols.oef_search.message import ( - _default_logger as oef_search_message_logger, -) - -from tests.conftest import ROOT_DIR - - -sys.path.append(ROOT_DIR) - - -def test_register_service_serialization(): - """Test the serialization for 'register_service' speech-act works.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=Description({"foo1": 1, "bar1": 2}), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_unregister_service_serialization(): - """Test the serialization for 'unregister_service' speech-act works.""" - msg = OefSearchMessage( - message_id=2, - target=1, - performative=OefSearchMessage.Performative.UNREGISTER_SERVICE, - service_description=Description({"foo1": 1, "bar1": 2}), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_search_services_serialization(): - """Test the serialization for 'search_services' speech-act works.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.SEARCH_SERVICES, - query=Query([Constraint("something", ConstraintType(">", 1))]), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_search_result_serialization(): - """Test the serialization for 'search_result' speech-act works.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.SEARCH_RESULT, - agents=("agent_1", "agent_2", "agent_3"), - agents_info=OefSearchMessage.AgentsInfo( - { - "key_1": {"key_1": b"value_1", "key_2": b"value_2"}, - "key_2": {"key_3": b"value_3", "key_4": b"value_4"}, - } - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_success_serialization(): - """Test the serialization for 'success' speech-act works.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.SUCCESS, - agents_info=OefSearchMessage.AgentsInfo( - { - "key_1": {"key_1": b"value_1", "key_2": b"value_2"}, - "key_2": {"key_3": b"value_3", "key_4": b"value_4"}, - } - ), - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_oef_error_serialization(): - """Test the serialization for 'oef_error' speech-act works.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.OEF_ERROR, - oef_error_operation=OefSearchMessage.OefErrorOperation.OTHER, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = OefSearchMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_oef_type_string_value(): - """Test the string value of the type.""" - assert ( - str(OefSearchMessage.Performative.REGISTER_SERVICE) == "register_service" - ), "The str value must be register_service" - assert ( - str(OefSearchMessage.Performative.UNREGISTER_SERVICE) == "unregister_service" - ), "The str value must be unregister_service" - assert ( - str(OefSearchMessage.Performative.SEARCH_SERVICES) == "search_services" - ), "The str value must be search_services" - assert ( - str(OefSearchMessage.Performative.OEF_ERROR) == "oef_error" - ), "The str value must be oef_error" - assert ( - str(OefSearchMessage.Performative.SEARCH_RESULT) == "search_result" - ), "The str value must be search_result" - - -def test_oef_error_operation(): - """Test the string value of the error operation.""" - assert ( - str(OefSearchMessage.OefErrorOperation.REGISTER_SERVICE) == "0" - ), "The str value must be 0" - assert ( - str(OefSearchMessage.OefErrorOperation.UNREGISTER_SERVICE) == "1" - ), "The str value must be 1" - assert ( - str(OefSearchMessage.OefErrorOperation.SEARCH_SERVICES) == "2" - ), "The str value must be 2" - assert ( - str(OefSearchMessage.OefErrorOperation.SEND_MESSAGE) == "3" - ), "The str value must be 3" - assert ( - str(OefSearchMessage.OefErrorOperation.OTHER) == "10000" - ), "The str value must be 10000" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=Description({"foo1": 1, "bar1": 2}), - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - OefSearchMessage.Performative, "__eq__", return_value=False - ): - OefSearchMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = OefSearchMessage( - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=Description({"foo1": 1, "bar1": 2}), - ) - - encoded_msg = OefSearchMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object( - OefSearchMessage.Performative, "__eq__", return_value=False - ): - OefSearchMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.oef_search.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the fipa message is incorrect.""" - with mock.patch.object(oef_search_message_logger, "error") as mock_logger: - OefSearchMessage( - performative=OefSearchMessage.Performative.REGISTER_SERVICE, - service_description=Description({"foo1": 1, "bar1": 2}), - ) - - mock_logger.assert_any_call("some error") - - -def test_agent_info(): - """Test the agent_info custom type.""" - agents_info = OefSearchMessage.AgentsInfo( - { - "agent_address_1": {"key_1": b"value_1", "key_2": b"value_2"}, - "agent_address_2": {"key_3": b"value_3", "key_4": b"value_4"}, - } - ) - assert agents_info.get_info_for_agent("agent_address_1") == { - "key_1": b"value_1", - "key_2": b"value_2", - } - - with pytest.raises(ValueError, match="body must not be None"): - OefSearchMessage.AgentsInfo(None) - - -class TestDialogues: - """Tests oef_search dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.agent_addr = "agent address" - cls.oef_node_addr = "oef_node address" - cls.agent_dialogues = BuyerDialogues(cls.agent_addr) - cls.oef_node_dialogues = OEFNodeDialogues(cls.oef_node_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.agent_dialogues._create_self_initiated( - dialogue_opponent_addr=self.oef_node_addr, - dialogue_reference=(str(0), ""), - role=OefSearchDialogue.Role.AGENT, - ) - assert isinstance(result, OefSearchDialogue) - assert result.role == OefSearchDialogue.Role.AGENT, "The role must be agent." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.agent_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.oef_node_addr, - dialogue_reference=(str(0), ""), - role=OefSearchDialogue.Role.AGENT, - ) - assert isinstance(result, OefSearchDialogue) - assert result.role == OefSearchDialogue.Role.AGENT, "The role must be agent." - - -class BuyerDialogue(OefSearchDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[OefSearchMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - OefSearchDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class BuyerDialogues(OefSearchDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return OefSearchDialogue.Role.AGENT - - OefSearchDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=BuyerDialogue, - ) - - -class OEFNodeDialogue(OefSearchDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[OefSearchMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - OefSearchDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class OEFNodeDialogues(OefSearchDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return OefSearchDialogue.Role.OEF_NODE - - OefSearchDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=OEFNodeDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_state_update.py b/tests/test_packages/test_protocols/test_state_update.py deleted file mode 100644 index a1a0f398d8..0000000000 --- a/tests/test_packages/test_protocols/test_state_update.py +++ /dev/null @@ -1,233 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains tests for transaction.""" -from typing import Type -from unittest.mock import patch - -import pytest - -from aea.common import Address -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -from packages.fetchai.protocols.state_update.dialogues import ( - StateUpdateDialogue as BaseStateUpdateDialogue, -) -from packages.fetchai.protocols.state_update.dialogues import ( - StateUpdateDialogues as BaseStateUpdateDialogues, -) -from packages.fetchai.protocols.state_update.message import StateUpdateMessage - - -class TestStateUpdateMessage: - """Test the StateUpdateMessage.""" - - def test_message_consistency(self): - """Test for an error in consistency of a message.""" - currency_endowment = {"FET": 100} - good_endowment = {"a_good": 2} - exchange_params = {"FET": 10.0} - utility_params = {"a_good": 20.0} - assert StateUpdateMessage( - performative=StateUpdateMessage.Performative.INITIALIZE, - amount_by_currency_id=currency_endowment, - quantities_by_good_id=good_endowment, - exchange_params_by_currency_id=exchange_params, - utility_params_by_good_id=utility_params, - ) - currency_change = {"FET": 10} - good_change = {"a_good": 1} - stum = StateUpdateMessage( - performative=StateUpdateMessage.Performative.APPLY, - amount_by_currency_id=currency_change, - quantities_by_good_id=good_change, - ) - assert stum._is_consistent() - assert len(stum.valid_performatives) == 3 - stum = StateUpdateMessage( - performative=StateUpdateMessage.Performative.END, - ) - assert stum._is_consistent() - - def test_message_inconsistency(self): - """Test for an error in consistency of a message.""" - currency_endowment = {"FET": 100} - good_endowment = {"a_good": 2} - exchange_params = {"UNKNOWN": 10.0} - utility_params = {"a_good": 20.0} - with pytest.raises(ValueError, match="Field .* is not supported"): - StateUpdateMessage( - performative=StateUpdateMessage.Performative.INITIALIZE, - amount_by_currency_id=currency_endowment, - quantities_by_good_id=good_endowment, - exchange_params_by_currency_id=exchange_params, - utility_params_by_good_id=utility_params, - non_exists_field="some value", - ) - - -class TestSerialization: - """Test state update message serialization.""" - - def test_serialization_initialize(self): - """Test serialization of initialize message.""" - currency_endowment = {"FET": 100} - good_endowment = {"a_good": 2} - exchange_params = {"FET": 10.0} - utility_params = {"a_good": 20.0} - msg = StateUpdateMessage( - performative=StateUpdateMessage.Performative.INITIALIZE, - amount_by_currency_id=currency_endowment, - quantities_by_good_id=good_endowment, - exchange_params_by_currency_id=exchange_params, - utility_params_by_good_id=utility_params, - ) - encoded_msg = msg.serializer.encode(msg) - decoded_msg = msg.serializer.decode(encoded_msg) - assert msg == decoded_msg - - def test_serialization_apply(self): - """Test serialization of apply message.""" - currency_change = {"FET": 10} - good_change = {"a_good": 1} - msg = StateUpdateMessage( - performative=StateUpdateMessage.Performative.APPLY, - amount_by_currency_id=currency_change, - quantities_by_good_id=good_change, - ) - assert msg._is_consistent() - assert len(msg.valid_performatives) == 3 - encoded_msg = msg.serializer.encode(msg) - decoded_msg = msg.serializer.decode(encoded_msg) - assert msg == decoded_msg - - def test_serialization_end(self): - """Test serialization of end message.""" - msg = StateUpdateMessage( - performative=StateUpdateMessage.Performative.END, - ) - assert msg._is_consistent() - assert len(msg.valid_performatives) == 3 - encoded_msg = msg.serializer.encode(msg) - decoded_msg = msg.serializer.decode(encoded_msg) - assert msg == decoded_msg - - -def test_serialization_negative(): - """Test serialization when performative is not recognized.""" - currency_change = {"FET": 10} - good_change = {"a_good": 1} - msg = StateUpdateMessage( - performative=StateUpdateMessage.Performative.APPLY, - amount_by_currency_id=currency_change, - quantities_by_good_id=good_change, - ) - - with patch.object(StateUpdateMessage.Performative, "__eq__", return_value=False): - with pytest.raises( - ValueError, match=f"Performative not valid: {msg.performative}" - ): - msg.serializer.encode(msg) - - encoded_tx_bytes = msg.serializer.encode(msg) - with patch.object(StateUpdateMessage.Performative, "__eq__", return_value=False): - with pytest.raises( - ValueError, match=f"Performative not valid: {msg.performative}" - ): - msg.serializer.decode(encoded_tx_bytes) - - -def test_performative_str(): - """Test performative __str__.""" - assert str(StateUpdateMessage.Performative.INITIALIZE) == "initialize" - assert str(StateUpdateMessage.Performative.APPLY) == "apply" - - -def test_dialogues(): - """Test intiaontiation of dialogues.""" - state_update_dialogues = StateUpdateDialogues("agent_addr") - msg, dialogue = state_update_dialogues.create( - counterparty="abc", - performative=StateUpdateMessage.Performative.INITIALIZE, - amount_by_currency_id={}, - quantities_by_good_id={}, - exchange_params_by_currency_id={}, - utility_params_by_good_id={}, - ) - assert dialogue is not None - - -class StateUpdateDialogue(BaseStateUpdateDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[StateUpdateMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - BaseStateUpdateDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class StateUpdateDialogues(BaseStateUpdateDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return StateUpdateDialogue.Role.SKILL - - BaseStateUpdateDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=StateUpdateDialogue, - ) diff --git a/tests/test_packages/test_protocols/test_tac.py b/tests/test_packages/test_protocols/test_tac.py deleted file mode 100644 index e626760f48..0000000000 --- a/tests/test_packages/test_protocols/test_tac.py +++ /dev/null @@ -1,579 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains the tests of the http protocol package.""" - -import sys -from typing import Type -from unittest import mock - -import pytest - -from aea.common import Address -from aea.exceptions import AEAEnforceError -from aea.mail.base import Envelope -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel - -import packages -from packages.fetchai.protocols.tac.dialogues import TacDialogue, TacDialogues -from packages.fetchai.protocols.tac.message import TacMessage -from packages.fetchai.protocols.tac.message import _default_logger as tac_message_logger - -from tests.conftest import ROOT_DIR - - -sys.path.append(ROOT_DIR) - - -def test_tac_message_instantiation(): - """Test instantiation of the tac message.""" - assert TacMessage( - performative=TacMessage.Performative.REGISTER, agent_name="some_name" - ) - assert TacMessage(performative=TacMessage.Performative.UNREGISTER) - assert TacMessage( - performative=TacMessage.Performative.TRANSACTION, - transaction_id="some_id", - ledger_id="some_ledger", - sender_address="some_address", - counterparty_address="some_other_address", - amount_by_currency_id={"FET": 10}, - fee_by_currency_id={"FET": 1}, - quantities_by_good_id={"123": 0, "1234": 10}, - nonce=1, - sender_signature="some_signature", - counterparty_signature="some_other_signature", - ) - assert TacMessage(performative=TacMessage.Performative.CANCELLED) - assert TacMessage( - performative=TacMessage.Performative.GAME_DATA, - amount_by_currency_id={"FET": 10}, - exchange_params_by_currency_id={"FET": 10.0}, - quantities_by_good_id={"123": 20, "1234": 15}, - utility_params_by_good_id={"123": 30.0, "1234": 50.0}, - fee_by_currency_id={"FET": 1}, - agent_addr_to_name={"agent_1": "Agent one", "agent_2": "Agent two"}, - currency_id_to_name={"FET": "currency_name"}, - good_id_to_name={"123": "First good", "1234": "Second good"}, - version_id="game_version_1", - ) - assert TacMessage( - performative=TacMessage.Performative.TRANSACTION_CONFIRMATION, - transaction_id="some_id", - amount_by_currency_id={"FET": 10}, - quantities_by_good_id={"123": 20, "1234": 15}, - ) - assert TacMessage( - performative=TacMessage.Performative.TAC_ERROR, - error_code=TacMessage.ErrorCode.GENERIC_ERROR, - info={"msg": "This is info msg."}, - ) - assert str(TacMessage.Performative.REGISTER) == "register" - - -def test_register_serialization(): - """Test the serialization for 'register' speech-act works.""" - msg = TacMessage( - performative=TacMessage.Performative.REGISTER, - agent_name="some_agent_name", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_unregister_serialization(): - """Test the serialization for 'unregister' speech-act works.""" - msg = TacMessage( - message_id=2, - target=1, - performative=TacMessage.Performative.UNREGISTER, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_transaction_serialization(): - """Test the serialization for 'transaction' speech-act works.""" - msg = TacMessage( - performative=TacMessage.Performative.TRANSACTION, - transaction_id="some_transaction_id", - ledger_id="some_ledger_id", - sender_address="some_sender_address", - counterparty_address="some_counterparty_address", - amount_by_currency_id={"key_1": 1, "key_2": 2}, - fee_by_currency_id={"key_1": 1, "key_2": 2}, - quantities_by_good_id={"key_1": 1, "key_2": 2}, - nonce="some_nonce", - sender_signature="some_sender_signature", - counterparty_signature="some_counterparty_signature", - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_cancelled_serialization(): - """Test the serialization for 'cancelled' speech-act works.""" - msg = TacMessage( - performative=TacMessage.Performative.CANCELLED, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_game_data_serialization(): - """Test the serialization for 'game_data' speech-act works.""" - msg = TacMessage( - performative=TacMessage.Performative.GAME_DATA, - amount_by_currency_id={"key_1": 1, "key_2": 2}, - exchange_params_by_currency_id={"key_1": 1.0, "key_2": 2.0}, - quantities_by_good_id={"key_1": 1, "key_2": 2}, - utility_params_by_good_id={"key_1": 1.0, "key_2": 2.0}, - fee_by_currency_id={"key_1": 1, "key_2": 2}, - agent_addr_to_name={"key_1": "value_1", "key_2": "value_2"}, - currency_id_to_name={"key_1": "value_1", "key_2": "value_2"}, - good_id_to_name={"key_1": "value_1", "key_2": "value_2"}, - version_id="some_version_id", - info={"key_1": "value_1", "key_2": "value_2"}, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_transaction_confirmation_serialization(): - """Test the serialization for 'transaction_confirmation' speech-act works.""" - msg = TacMessage( - performative=TacMessage.Performative.TRANSACTION_CONFIRMATION, - transaction_id="some_transaction_id", - amount_by_currency_id={"key_1": 1, "key_2": 2}, - quantities_by_good_id={"key_1": 1, "key_2": 2}, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_tac_error_serialization(): - """Test the serialization for 'tac_error' speech-act works.""" - msg = TacMessage( - performative=TacMessage.Performative.TAC_ERROR, - error_code=TacMessage.ErrorCode.GENERIC_ERROR, - info={"key_1": "value_1", "key_2": "value_2"}, - ) - msg.to = "receiver" - envelope = Envelope( - to=msg.to, - sender="sender", - message=msg, - ) - envelope_bytes = envelope.encode() - - actual_envelope = Envelope.decode(envelope_bytes) - expected_envelope = envelope - assert expected_envelope.to == actual_envelope.to - assert expected_envelope.sender == actual_envelope.sender - assert ( - expected_envelope.protocol_specification_id - == actual_envelope.protocol_specification_id - ) - assert expected_envelope.message != actual_envelope.message - - actual_msg = TacMessage.serializer.decode(actual_envelope.message) - actual_msg.to = actual_envelope.to - actual_msg.sender = actual_envelope.sender - expected_msg = msg - assert expected_msg == actual_msg - - -def test_oef_type_string_value(): - """Test the string value of the type.""" - assert ( - str(TacMessage.Performative.REGISTER) == "register" - ), "The str value must be register" - assert ( - str(TacMessage.Performative.UNREGISTER) == "unregister" - ), "The str value must be unregister" - assert ( - str(TacMessage.Performative.TRANSACTION) == "transaction" - ), "The str value must be transaction" - assert ( - str(TacMessage.Performative.CANCELLED) == "cancelled" - ), "The str value must be cancelled" - assert ( - str(TacMessage.Performative.GAME_DATA) == "game_data" - ), "The str value must be game_data" - assert ( - str(TacMessage.Performative.TRANSACTION_CONFIRMATION) - == "transaction_confirmation" - ), "The str value must be transaction_confirmation" - assert ( - str(TacMessage.Performative.TAC_ERROR) == "tac_error" - ), "The str value must be tac_error" - - -def test_error_code_to_msg(): - """Test the serialization for 'tac_error' speech-act works.""" - - assert ( - str(TacMessage.ErrorCode.to_msg(0)) == "Unexpected error." - ), 'The str value must be "Unexpected error."' - assert ( - str(TacMessage.ErrorCode.to_msg(1)) == "Request not recognized" - ), 'The str value must be "Request not recognized"' - assert ( - str(TacMessage.ErrorCode.to_msg(2)) == "Agent addr already registered." - ), 'The str value must be "Agent addr already registered."' - assert ( - str(TacMessage.ErrorCode.to_msg(3)) == "Agent name already registered." - ), 'The str value must be "Agent name already registered."' - assert ( - str(TacMessage.ErrorCode.to_msg(4)) == "Agent not registered." - ), 'The str value must be "Agent not registered."' - assert ( - str(TacMessage.ErrorCode.to_msg(5)) == "Error in checking transaction" - ), 'The str value must be "Error in checking transaction"' - assert ( - str(TacMessage.ErrorCode.to_msg(6)) - == "The transaction request does not match with a previous transaction request with the same id." - ), 'The str value must be "The transaction request does not match with a previous transaction request with the same id."' - assert ( - str(TacMessage.ErrorCode.to_msg(7)) == "Agent name not in whitelist." - ), 'The str value must be "Agent name not in whitelist."' - assert ( - str(TacMessage.ErrorCode.to_msg(8)) == "The competition is not running yet." - ), 'The str value must be "The competition is not running yet."' - assert ( - str(TacMessage.ErrorCode.to_msg(9)) - == "The message is inconsistent with the dialogue." - ), 'The str value must be "The message is inconsistent with the dialogue."' - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = TacMessage( - performative=TacMessage.Performative.CANCELLED, - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(TacMessage.Performative, "__eq__", return_value=False): - TacMessage.serializer.encode(msg) - - -def test_decoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during decoding.""" - msg = TacMessage( - performative=TacMessage.Performative.CANCELLED, - ) - - encoded_msg = TacMessage.serializer.encode(msg) - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(TacMessage.Performative, "__eq__", return_value=False): - TacMessage.serializer.decode(encoded_msg) - - -@mock.patch.object( - packages.fetchai.protocols.tac.message, - "enforce", - side_effect=AEAEnforceError("some error"), -) -def test_incorrect_message(mocked_enforce): - """Test that we raise an exception when the message is incorrect.""" - with mock.patch.object(tac_message_logger, "error") as mock_logger: - TacMessage( - performative=TacMessage.Performative.CANCELLED, - ) - - mock_logger.assert_any_call("some error") - - -class TestDialogues: - """Tests tac dialogues.""" - - @classmethod - def setup_class(cls): - """Set up the test.""" - cls.agent_addr = "agent address" - cls.controller_addr = "controller address" - cls.agent_dialogues = AgentDialogues(cls.agent_addr) - cls.controller_dialogues = ControllerDialogues(cls.controller_addr) - - def test_create_self_initiated(self): - """Test the self initialisation of a dialogue.""" - result = self.agent_dialogues._create_self_initiated( - dialogue_opponent_addr=self.controller_addr, - dialogue_reference=(str(0), ""), - role=TacDialogue.Role.PARTICIPANT, - ) - assert isinstance(result, TacDialogue) - assert ( - result.role == TacDialogue.Role.PARTICIPANT - ), "The role must be participant." - - def test_create_opponent_initiated(self): - """Test the opponent initialisation of a dialogue.""" - result = self.agent_dialogues._create_opponent_initiated( - dialogue_opponent_addr=self.controller_addr, - dialogue_reference=(str(0), ""), - role=TacDialogue.Role.PARTICIPANT, - ) - assert isinstance(result, TacDialogue) - assert ( - result.role == TacDialogue.Role.PARTICIPANT - ), "The role must be participant." - - -class AgentDialogue(TacDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[TacMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - TacDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class AgentDialogues(TacDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return TacDialogue.Role.PARTICIPANT - - TacDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=AgentDialogue, - ) - - -class ControllerDialogue(TacDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[TacMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - TacDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class ControllerDialogues(TacDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return TacDialogue.Role.CONTROLLER - - TacDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=ControllerDialogue, - ) From e267fd869c796c7ea3c1be41ff612403fe01b023 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 08:06:59 +0000 Subject: [PATCH 51/93] chore: address comments --- aea/cli/test.py | 2 -- aea/test_tools/docker_image.py | 18 +++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 8e95f943d6..0279b5cb54 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -180,8 +180,6 @@ def test_package_by_path( ) root_packages = aea_project_path if aea_project_path else packages_dir - os.environ["PACKAGES_DIR"] = str(root_packages) - package_path_finder = ( find_component_directory_from_component_id if aea_project_path diff --git a/aea/test_tools/docker_image.py b/aea/test_tools/docker_image.py index 8f7b513a67..78feabddea 100644 --- a/aea/test_tools/docker_image.py +++ b/aea/test_tools/docker_image.py @@ -193,12 +193,12 @@ def launch_image(image: DockerImage, timeout: float = 2.0, max_attempts: int = 1 container.stop() container.remove() pytest.fail(f"{image.tag} doesn't work. Exiting...") - else: - try: - logger.info("Done!") - time.sleep(timeout) - yield - finally: - logger.info(f"Stopping the image {image.tag}...") - container.stop() - container.remove() + + try: + logger.info("Done!") + time.sleep(timeout) + yield + finally: + logger.info(f"Stopping the image {image.tag}...") + container.stop() + container.remove() From 88717bfe3f805d7a8e9915f449214fa78ad16bad Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 13:43:39 +0200 Subject: [PATCH 52/93] chore: extract docker images into correct locations --- aea/test_tools/docker_image.py | 86 +++---------------- .../test_tools/docker_images.py} | 75 +--------------- .../test_tools/fixture_helpers.py | 3 +- plugins/aea-ledger-ethereum/tests/conftest.py | 3 +- scripts/whitelist.py | 1 - 5 files changed, 17 insertions(+), 151 deletions(-) rename plugins/aea-ledger-ethereum/{tests/docker_image.py => aea_ledger_ethereum/test_tools/docker_images.py} (58%) diff --git a/aea/test_tools/docker_image.py b/aea/test_tools/docker_image.py index 78feabddea..6a2e455a26 100644 --- a/aea/test_tools/docker_image.py +++ b/aea/test_tools/docker_image.py @@ -27,12 +27,17 @@ import tempfile import time from abc import ABC, abstractmethod -from typing import Dict, List, Optional +from typing import Any, Dict, List, Optional -import docker import pytest -from docker import DockerClient -from docker.models.containers import Container + + +try: + from docker import DockerClient + from docker.models.containers import Container +except ImportError: + DockerClient = Any + Container = Any from aea.exceptions import enforce from aea.helpers import http_requests as requests @@ -46,7 +51,7 @@ class DockerImage(ABC): MINIMUM_DOCKER_VERSION = (19, 0, 0) - def __init__(self, client: docker.DockerClient): + def __init__(self, client: DockerClient): """Initialize.""" self._client = client @@ -89,6 +94,8 @@ def tag(self) -> str: def stop_if_already_running(self) -> None: """Stop the running images with the same tag, if any.""" + import docker + client = docker.from_env() for container in client.containers.list(): if self.tag in container.image.tags: @@ -111,75 +118,6 @@ def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: return True -class GanacheDockerImage(DockerImage): - """Wrapper to Ganache Docker image.""" - - def __init__( - self, - client: DockerClient, - addr: str, - port: int, - config: Optional[Dict] = None, - gas_limit: str = "0x9184e72a000", # 10000000000000, - ): - """ - Initialize the Ganache Docker image. - - :param client: the Docker client. - :param addr: the address. - :param port: the port. - :param config: optional configuration to command line. - :param gas_limit: the gas limit for blocks. - """ - super().__init__(client) - self._addr = addr - self._port = port - self._config = config or {} - self._gas_limit = gas_limit - - @property - def tag(self) -> str: - """Get the image tag.""" - return "trufflesuite/ganache:beta" - - def _make_ports(self) -> Dict: - """Make ports dictionary for Docker.""" - return {f"{self._port}/tcp": ("0.0.0.0", self._port)} # nosec - - def _build_command(self) -> List[str]: - """Build command.""" - # cmd = ["--chain.hardfork=london"] # noqa: E800 - cmd = ["--miner.blockGasLimit=" + str(self._gas_limit)] - # cmd += ["--miner.callGasLimit=" + "0x1fffffffffffff"] # noqa: E800 - accounts_balances = self._config.get("accounts_balances", []) - for account, balance in accounts_balances: - cmd += [f"--wallet.accounts='{account},{balance}'"] - return cmd - - def create(self) -> Container: - """Create the container.""" - cmd = self._build_command() - container = self._client.containers.run( - self.tag, command=cmd, detach=True, ports=self._make_ports() - ) - return container - - def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: - """Wait until the image is up.""" - request = dict(jsonrpc=2.0, method="web3_clientVersion", params=[], id=1) - for i in range(max_attempts): - try: - response = requests.post(f"{self._addr}:{self._port}", json=request) - enforce(response.status_code == 200, "") - return True - except Exception: - logger.info( - "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate - ) - time.sleep(sleep_rate) - return False - - def launch_image(image: DockerImage, timeout: float = 2.0, max_attempts: int = 10): """Launch image.""" diff --git a/plugins/aea-ledger-ethereum/tests/docker_image.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py similarity index 58% rename from plugins/aea-ledger-ethereum/tests/docker_image.py rename to plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py index 9fe24298ae..55103f7cfe 100644 --- a/plugins/aea-ledger-ethereum/tests/docker_image.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2022 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +17,7 @@ # # ------------------------------------------------------------------------------ -"""This module contains testing utilities.""" +"""Constants.""" import logging import re import shutil @@ -39,76 +38,6 @@ logger = logging.getLogger(__name__) -class DockerImage(ABC): - """A class to wrap interatction with a Docker image.""" - - MINIMUM_DOCKER_VERSION = (19, 0, 0) - - def __init__(self, client: docker.DockerClient): - """Initialize.""" - self._client = client - - def check_skip(self): - """ - Check whether the test should be skipped. - - By default, nothing happens. - """ - self._check_docker_binary_available() - - def _check_docker_binary_available(self): - """Check the 'Docker' CLI tool is in the OS PATH.""" - result = shutil.which("docker") - if result is None: - pytest.skip("Docker not in the OS Path; skipping the test") - - result = subprocess.run( # nosec - ["docker", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE - ) - if result.returncode != 0: - pytest.skip("'docker --version' failed with exit code {result.returncode}") - - match = re.search( - r"Docker version ([0-9]+)\.([0-9]+)\.([0-9]+)", - result.stdout.decode("utf-8"), - ) - if match is None: - pytest.skip("cannot read version from the output of 'docker --version'") - version = (int(match.group(1)), int(match.group(2)), int(match.group(3))) - if version < self.MINIMUM_DOCKER_VERSION: - pytest.skip( - f"expected Docker version to be at least {'.'.join(self.MINIMUM_DOCKER_VERSION)}, found {'.'.join(version)}" - ) - - @property - @abstractmethod - def tag(self) -> str: - """Return the tag of the image.""" - - def stop_if_already_running(self): - """Stop the running images with the same tag, if any.""" - client = docker.from_env() - for container in client.containers.list(): - if self.tag in container.image.tags: - logger.info(f"Stopping image {self.tag}...") - container.stop() - - @abstractmethod - def create(self) -> Container: - """Instantiate the image in a container.""" - - @abstractmethod - def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: - """ - Wait until the image is running. - - :param max_attempts: max number of attempts. - :param sleep_rate: the amount of time to sleep between different requests. - :return: True if the wait was successful, False otherwise. - """ - return True - - class GanacheDockerImage(DockerImage): """Wrapper to Ganache Docker image.""" diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py index 3dff4887ad..02569cf201 100644 --- a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py @@ -32,8 +32,9 @@ FUNDED_ETH_PRIVATE_KEY_2, FUNDED_ETH_PRIVATE_KEY_3, ) +from aea_ledger_ethereum.test_tools.docker_images import GanacheDockerImage -from aea.test_tools.docker_image import GanacheDockerImage, launch_image +from aea.test_tools.docker_image import launch_image from aea.test_tools.network import LOCALHOST diff --git a/plugins/aea-ledger-ethereum/tests/conftest.py b/plugins/aea-ledger-ethereum/tests/conftest.py index 1b6c632aa3..721b51f37d 100644 --- a/plugins/aea-ledger-ethereum/tests/conftest.py +++ b/plugins/aea-ledger-ethereum/tests/conftest.py @@ -38,11 +38,10 @@ DEFAULT_EIP1559_STRATEGY_POLYGON, DEFAULT_GAS_STATION_STRATEGY, ) +from aea_ledger_ethereum.test_tools.docker_images import DockerImage, GanacheDockerImage from aea.configurations.constants import PRIVATE_KEY_PATH_SCHEMA -from tests.docker_image import DockerImage, GanacheDockerImage - CUR_PATH = os.path.dirname(inspect.getfile(inspect.currentframe())) # type: ignore ROOT_DIR = os.path.join(CUR_PATH, "..") diff --git a/scripts/whitelist.py b/scripts/whitelist.py index c39faa62f3..5a646fbda5 100644 --- a/scripts/whitelist.py +++ b/scripts/whitelist.py @@ -306,5 +306,4 @@ to_v1_string # unused function (aea/cli/ipfs_hash.py:382) BTC_ENCODING # unused variable (aea/helpers/cid.py:32) is_cid # unused method (aea/helpers/cid.py:200) -GanacheDockerImage # unused class (aea/test_tools/docker_image.py:114) launch_image # unused function (aea/test_tools/docker_image.py:183) From 76ce4679c5d2e5bc4b7dcb9141b30d896c7d6d10 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 15:02:41 +0200 Subject: [PATCH 53/93] chore: fix dependency arrangement --- aea/cli/test.py | 4 +- aea/test_tools/click_testing.py | 2 +- aea/test_tools/docker_image.py | 23 +- aea/test_tools/mocks.py | 6 +- aea/test_tools/network.py | 4 +- aea/test_tools/utils.py | 8 +- .../fetchai/connections/gym/tests/test_gym.py | 3 + .../http_client/tests/test_http_client.py | 3 + .../http_server/tests/test_http_server.py | 3 + .../connections/ledger/tests/conftest.py | 3 +- .../ledger/tests/test_ledger_api.py | 22 +- .../connections/local/tests/test_misc.py | 4 + .../local/tests/test_search_services.py | 3 + .../connections/stub/tests/test_stub.py | 3 + .../contracts/erc1155/tests/test_contract.py | 2 + .../fetchai/protocols/http/tests/test_http.py | 1 - .../ledger_api/tests/test_ledger_api.py | 1 - .../oef_search/tests/test_oef_search.py | 1 - .../fetchai/protocols/tac/tests/test_tac.py | 1 - .../test_tools/docker_images.py | 20 +- .../test_tools/fixture_helpers.py | 4 +- plugins/aea-ledger-ethereum/tests/conftest.py | 3 +- .../test_tools/docker_images.py | 137 +++++++++ scripts/whitelist.py | 10 + tests/common/docker_image.py | 275 ------------------ tests/common/mocks.py | 68 ----- tests/conftest.py | 9 +- 27 files changed, 228 insertions(+), 395 deletions(-) create mode 100644 plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py delete mode 100644 tests/common/docker_image.py delete mode 100644 tests/common/mocks.py diff --git a/aea/cli/test.py b/aea/cli/test.py index 0279b5cb54..50c53ed3fb 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -19,7 +19,6 @@ # ------------------------------------------------------------------------------ """Implementation of the 'aea test' command.""" -import os import sys from pathlib import Path from typing import Callable, Optional, Sequence, Set, cast @@ -40,7 +39,6 @@ AEA_TEST_DIRNAME, CONNECTION, CONTRACT, - PACKAGES, PROTOCOL, SKILL, ) @@ -197,6 +195,8 @@ def test_package_by_path( ) if package_type != PackageType.AGENT: + if root_packages is None: + raise ValueError("Packages dir not set!") component_type = ComponentType(package_type.value) configuration = load_component_configuration(component_type, package_dir) configuration.directory = package_dir diff --git a/aea/test_tools/click_testing.py b/aea/test_tools/click_testing.py index eec1c5a8ea..77cebd2d06 100644 --- a/aea/test_tools/click_testing.py +++ b/aea/test_tools/click_testing.py @@ -104,6 +104,6 @@ def invoke( # type: ignore stderr_bytes=stderr, # type: ignore exit_code=exit_code, exception=exception, - exc_info=exc_info, + exc_info=exc_info, # type: ignore return_value=None, ) diff --git a/aea/test_tools/docker_image.py b/aea/test_tools/docker_image.py index 6a2e455a26..ea1ec402a2 100644 --- a/aea/test_tools/docker_image.py +++ b/aea/test_tools/docker_image.py @@ -20,14 +20,12 @@ """This module contains testing utilities.""" import logging -import os import re import shutil import subprocess # nosec -import tempfile import time from abc import ABC, abstractmethod -from typing import Any, Dict, List, Optional +from typing import Any, Generator import pytest @@ -39,9 +37,6 @@ DockerClient = Any Container = Any -from aea.exceptions import enforce -from aea.helpers import http_requests as requests - logger = logging.getLogger(__name__) @@ -69,22 +64,24 @@ def _check_docker_binary_available(self) -> None: if result is None: pytest.skip("Docker not in the OS Path; skipping the test") - result = subprocess.run( # nosec + proc_result = subprocess.run( # nosec ["docker", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE ) - if result.returncode != 0: - pytest.skip(f"'docker --version' failed with exit code {result.returncode}") + if proc_result.returncode != 0: + pytest.skip( + f"'docker --version' failed with exit code {proc_result.returncode}" + ) match = re.search( r"Docker version ([0-9]+)\.([0-9]+)\.([0-9]+)", - result.stdout.decode("utf-8"), + proc_result.stdout.decode("utf-8"), ) if match is None: pytest.skip("cannot read version from the output of 'docker --version'") version = (int(match.group(1)), int(match.group(2)), int(match.group(3))) if version < self.MINIMUM_DOCKER_VERSION: pytest.skip( - f"expected Docker version to be at least {'.'.join(self.MINIMUM_DOCKER_VERSION)}, found {'.'.join(version)}" + f"expected Docker version to be at least {'.'.join([str(item) for item in self.MINIMUM_DOCKER_VERSION])}, found {'.'.join([str(item) for item in version])}" ) @property @@ -118,7 +115,9 @@ def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: return True -def launch_image(image: DockerImage, timeout: float = 2.0, max_attempts: int = 10): +def launch_image( + image: DockerImage, timeout: float = 2.0, max_attempts: int = 10 +) -> Generator: """Launch image.""" image.check_skip() diff --git a/aea/test_tools/mocks.py b/aea/test_tools/mocks.py index e85e4ec1c9..50edcbb2f7 100644 --- a/aea/test_tools/mocks.py +++ b/aea/test_tools/mocks.py @@ -22,7 +22,7 @@ import re import unittest from contextlib import contextmanager -from typing import Generator +from typing import Any, Generator from unittest.mock import MagicMock @@ -33,7 +33,7 @@ class AnyStringWith(str): It will use string inclusion as equality comparator. """ - def __eq__(self, other): + def __eq__(self, other: Any) -> bool: """Check equality.""" return self in other @@ -45,7 +45,7 @@ class RegexComparator(str): It will use regex matching as equality comparator. """ - def __eq__(self, other): + def __eq__(self, other: Any) -> bool: """Check equality.""" regex = re.compile(str(self), re.MULTILINE | re.DOTALL) s = str(other) diff --git a/aea/test_tools/network.py b/aea/test_tools/network.py index 1763f70885..d2c768887e 100644 --- a/aea/test_tools/network.py +++ b/aea/test_tools/network.py @@ -26,7 +26,7 @@ LOCALHOST = urlparse("http://127.0.0.1") -def get_unused_tcp_port(): +def get_unused_tcp_port() -> int: """Get an unused TCP port.""" s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.bind((LOCALHOST.hostname, 0)) @@ -36,7 +36,7 @@ def get_unused_tcp_port(): return port -def get_host(): +def get_host() -> str: """Get the host.""" s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) try: diff --git a/aea/test_tools/utils.py b/aea/test_tools/utils.py index 3777c08e2e..96b2d5e350 100644 --- a/aea/test_tools/utils.py +++ b/aea/test_tools/utils.py @@ -20,9 +20,15 @@ """Helpful utilities.""" import time +from typing import Callable -def wait_for_condition(condition_checker, timeout=2, error_msg="Timeout", period=0.001): +def wait_for_condition( + condition_checker: Callable, + timeout: int = 2, + error_msg: str = "Timeout", + period: float = 0.001, +) -> None: """Wait for condition to occur in selected timeout.""" start_time = time.time() diff --git a/packages/fetchai/connections/gym/tests/test_gym.py b/packages/fetchai/connections/gym/tests/test_gym.py index a4155de178..bff97c158c 100644 --- a/packages/fetchai/connections/gym/tests/test_gym.py +++ b/packages/fetchai/connections/gym/tests/test_gym.py @@ -18,6 +18,9 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the gym connection module.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import asyncio import logging from typing import cast diff --git a/packages/fetchai/connections/http_client/tests/test_http_client.py b/packages/fetchai/connections/http_client/tests/test_http_client.py index 2b74ceff3e..9c1359315c 100644 --- a/packages/fetchai/connections/http_client/tests/test_http_client.py +++ b/packages/fetchai/connections/http_client/tests/test_http_client.py @@ -18,6 +18,9 @@ # # ------------------------------------------------------------------------------ """Tests for the HTTP Client connection and channel.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import asyncio import logging from asyncio import CancelledError diff --git a/packages/fetchai/connections/http_server/tests/test_http_server.py b/packages/fetchai/connections/http_server/tests/test_http_server.py index d5a7759337..ff7c406cdb 100644 --- a/packages/fetchai/connections/http_server/tests/test_http_server.py +++ b/packages/fetchai/connections/http_server/tests/test_http_server.py @@ -18,6 +18,9 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the HTTP Server connection module.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import asyncio import logging import os diff --git a/packages/fetchai/connections/ledger/tests/conftest.py b/packages/fetchai/connections/ledger/tests/conftest.py index f1e5075446..ddb5ca5359 100644 --- a/packages/fetchai/connections/ledger/tests/conftest.py +++ b/packages/fetchai/connections/ledger/tests/conftest.py @@ -29,7 +29,6 @@ DEFAULT_GANACHE_ADDR, DEFAULT_GANACHE_CHAIN_ID, DEFAULT_GANACHE_PORT, - ganache, ) from aea.configurations.constants import DEFAULT_LEDGER @@ -38,7 +37,7 @@ DEFAULT_LEDGER_CONFIGS, ETHEREUM_DEFAULT_CURRENCY_DENOM, ) -from aea.crypto.registries import ledger_apis_registry, make_crypto, make_ledger_api +from aea.crypto.registries import make_crypto from aea.crypto.wallet import CryptoStore from aea.identity.base import Identity diff --git a/packages/fetchai/connections/ledger/tests/test_ledger_api.py b/packages/fetchai/connections/ledger/tests/test_ledger_api.py index c5bef9a853..91a4c37959 100644 --- a/packages/fetchai/connections/ledger/tests/test_ledger_api.py +++ b/packages/fetchai/connections/ledger/tests/test_ledger_api.py @@ -18,8 +18,10 @@ # # ------------------------------------------------------------------------------ - """This module contains the tests of the ledger API connection module.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import asyncio import logging from typing import cast @@ -59,7 +61,9 @@ from packages.fetchai.connections.ledger.ledger_dispatcher import ( LedgerApiRequestDispatcher, ) -from packages.fetchai.connections.ledger.tests.conftest import ledger_apis_connection +from packages.fetchai.connections.ledger.tests.conftest import ( # noqa: F401 + ledger_apis_connection, +) from packages.fetchai.protocols.ledger_api.custom_types import Kwargs from packages.fetchai.protocols.ledger_api.dialogues import LedgerApiDialogue from packages.fetchai.protocols.ledger_api.dialogues import ( @@ -139,7 +143,7 @@ def role_from_first_message( # pylint: disable=unused-argument async def test_get_balance( ledger_id, address, - ledger_apis_connection: Connection, + ledger_apis_connection: Connection, # noqa: F811 update_default_ethereum_ledger_api, ethereum_testnet_config, ganache, @@ -188,7 +192,7 @@ async def test_get_balance( async def test_get_state( ledger_id, address, - ledger_apis_connection: Connection, + ledger_apis_connection: Connection, # noqa: F811 update_default_ethereum_ledger_api, ethereum_testnet_config, ganache, @@ -249,7 +253,7 @@ async def test_get_state( @gas_strategies async def test_send_signed_transaction_ethereum( gas_strategies, - ledger_apis_connection: Connection, + ledger_apis_connection: Connection, # noqa: F811 update_default_ethereum_ledger_api, ganache, ): @@ -382,7 +386,9 @@ async def test_send_signed_transaction_ethereum( @pytest.mark.asyncio -async def test_unsupported_protocol(ledger_apis_connection: LedgerConnection): +async def test_unsupported_protocol( + ledger_apis_connection: LedgerConnection, # noqa: F811 +): """Test fail on protocol not supported.""" envelope = Envelope( to=str(ledger_apis_connection.connection_id), @@ -395,7 +401,9 @@ async def test_unsupported_protocol(ledger_apis_connection: LedgerConnection): @pytest.mark.asyncio -async def test_new_message_wait_flag(ledger_apis_connection: LedgerConnection): +async def test_new_message_wait_flag( + ledger_apis_connection: LedgerConnection, # noqa: F811 +): """Test wait for new message.""" task = asyncio.ensure_future(ledger_apis_connection.receive()) await asyncio.sleep(0.1) diff --git a/packages/fetchai/connections/local/tests/test_misc.py b/packages/fetchai/connections/local/tests/test_misc.py index 12aefe208d..e15807faeb 100644 --- a/packages/fetchai/connections/local/tests/test_misc.py +++ b/packages/fetchai/connections/local/tests/test_misc.py @@ -19,6 +19,9 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the local OEF node implementation.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import asyncio import unittest.mock @@ -44,6 +47,7 @@ def make_local_connection( restricted_to_protocols=None, excluded_protocols=None, ) -> Connection: + """Create a local connection.""" configuration = ConnectionConfig( restricted_to_protocols=restricted_to_protocols, excluded_protocols=excluded_protocols, diff --git a/packages/fetchai/connections/local/tests/test_search_services.py b/packages/fetchai/connections/local/tests/test_search_services.py index 2fb56fc1a6..4cff4b9c3d 100644 --- a/packages/fetchai/connections/local/tests/test_search_services.py +++ b/packages/fetchai/connections/local/tests/test_search_services.py @@ -18,6 +18,9 @@ # # ------------------------------------------------------------------------------ """This module contains the tests for the search feature of the local OEF node.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import unittest.mock from typing import cast diff --git a/packages/fetchai/connections/stub/tests/test_stub.py b/packages/fetchai/connections/stub/tests/test_stub.py index 4e7a6ed582..8967ffbcf2 100644 --- a/packages/fetchai/connections/stub/tests/test_stub.py +++ b/packages/fetchai/connections/stub/tests/test_stub.py @@ -18,6 +18,9 @@ # # ------------------------------------------------------------------------------ """This test module contains the tests for the stub connection.""" +# type: ignore # noqa: E800 +# pylint: skip-file + import asyncio import base64 import os diff --git a/packages/fetchai/contracts/erc1155/tests/test_contract.py b/packages/fetchai/contracts/erc1155/tests/test_contract.py index fa147c9873..30f7fffc7c 100644 --- a/packages/fetchai/contracts/erc1155/tests/test_contract.py +++ b/packages/fetchai/contracts/erc1155/tests/test_contract.py @@ -19,6 +19,8 @@ # ------------------------------------------------------------------------------ """The tests module contains the tests of the packages/contracts/erc1155 dir.""" +# type: ignore # noqa: E800 +# pylint: skip-file import re import time diff --git a/packages/fetchai/protocols/http/tests/test_http.py b/packages/fetchai/protocols/http/tests/test_http.py index 18077d7435..c2f499d1b8 100644 --- a/packages/fetchai/protocols/http/tests/test_http.py +++ b/packages/fetchai/protocols/http/tests/test_http.py @@ -20,7 +20,6 @@ """This module contains the tests of the http protocol package.""" -import sys from typing import Type from unittest import mock diff --git a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py index 8879782bf6..d50d92339c 100644 --- a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py +++ b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py @@ -20,7 +20,6 @@ """This module contains the tests of the messages module.""" -import sys from typing import Type from unittest import mock diff --git a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py index 3cdd85be52..5189c73a3e 100644 --- a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py +++ b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py @@ -20,7 +20,6 @@ """This module contains the tests of the oef_search protocol package.""" -import sys from typing import Type from unittest import mock diff --git a/packages/fetchai/protocols/tac/tests/test_tac.py b/packages/fetchai/protocols/tac/tests/test_tac.py index c8319460b7..d84a4245ba 100644 --- a/packages/fetchai/protocols/tac/tests/test_tac.py +++ b/packages/fetchai/protocols/tac/tests/test_tac.py @@ -20,7 +20,6 @@ """This module contains the tests of the http protocol package.""" -import sys from typing import Type from unittest import mock diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py index 55103f7cfe..1ec49317ea 100644 --- a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py @@ -19,18 +19,20 @@ """Constants.""" import logging -import re -import shutil -import subprocess import time -from abc import ABC, abstractmethod -from typing import Dict, List, Optional +from typing import Any, Dict, List, Optional -import docker -import pytest import requests -from docker import DockerClient -from docker.models.containers import Container + +from aea.test_tools.docker_image import DockerImage + + +try: + from docker import DockerClient + from docker.models.containers import Container +except ImportError: + DockerClient = Any + Container = Any from aea.exceptions import enforce diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py index 02569cf201..7d575ae137 100644 --- a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py @@ -22,9 +22,7 @@ from contextlib import contextmanager from pathlib import Path from typing import Dict -from urllib.parse import urlparse -import docker import pytest from aea_ledger_ethereum.test_tools.constants import ( ETHEREUM_PRIVATE_KEY_PATH, @@ -61,6 +59,8 @@ def _ganache_context( timeout: float = 2.0, max_attempts: int = 10, ): + import docker + client = docker.from_env() image = GanacheDockerImage( client, ganache_addr, ganache_port, config=ganache_configuration diff --git a/plugins/aea-ledger-ethereum/tests/conftest.py b/plugins/aea-ledger-ethereum/tests/conftest.py index 721b51f37d..540fcf3d6c 100644 --- a/plugins/aea-ledger-ethereum/tests/conftest.py +++ b/plugins/aea-ledger-ethereum/tests/conftest.py @@ -30,7 +30,6 @@ from pathlib import Path from typing import Callable, Generator -import docker import pytest from aea_ledger_ethereum import EthereumCrypto from aea_ledger_ethereum.ethereum import ( @@ -236,6 +235,8 @@ def ganache( max_attempts: int = 10, ): """Launch the Ganache image.""" + import docker + client = docker.from_env() image = GanacheDockerImage( client, "http://127.0.0.1", 8545, config=ganache_configuration diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py new file mode 100644 index 0000000000..2569851d90 --- /dev/null +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py @@ -0,0 +1,137 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# Copyright 2018-2019 Fetch.AI Limited +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains testing utilities.""" +import logging +import os +import tempfile +import time +from typing import Any, Dict, Optional + + +try: + from docker import DockerClient + from docker.models.containers import Container +except ImportError: + DockerClient = Any + Container = Any + + +from aea.exceptions import enforce +from aea.helpers import http_requests as requests +from aea.test_tools.docker_image import DockerImage + + +logger = logging.getLogger(__name__) + + +class FetchLedgerDockerImage(DockerImage): + """Wrapper to Fetch ledger Docker image.""" + + PORTS = {1317: 1317, 26657: 26657} + + def __init__( + self, + client: DockerClient, + addr: str, + port: int, + tag: str, + config: Optional[Dict] = None, + ): + """ + Initialize the Fetch ledger Docker image. + + :param client: the Docker client. + :param addr: the address. + :param port: the port. + :param config: optional configuration to command line. + """ + super().__init__(client) + self._addr = addr + self._port = port + self._image_tag = tag + self._config = config or {} + + @property + def tag(self) -> str: + """Get the image tag.""" + return self._image_tag + + def _make_entrypoint_file(self, tmpdirname) -> None: + """Make a temporary entrypoint file to setup and run the test ledger node""" + run_node_lines = ( + "#!/usr/bin/env bash", + # variables + f'export VALIDATOR_KEY_NAME={self._config["genesis_account"]}', + f'export VALIDATOR_MNEMONIC="{self._config["mnemonic"]}"', + 'export PASSWORD="12345678"', + f'export CHAIN_ID={self._config["chain_id"]}', + f'export MONIKER={self._config["moniker"]}', + f'export DENOM={self._config["denom"]}', + # Add key + '( echo "$VALIDATOR_MNEMONIC"; echo "$PASSWORD"; echo "$PASSWORD"; ) |fetchd keys add $VALIDATOR_KEY_NAME --recover', + # Configure node + "fetchd init --chain-id=$CHAIN_ID $MONIKER", + 'echo "$PASSWORD" |fetchd add-genesis-account $(fetchd keys show $VALIDATOR_KEY_NAME -a) 100000000000000000000000$DENOM', + 'echo "$PASSWORD" |fetchd gentx $VALIDATOR_KEY_NAME 10000000000000000000000$DENOM --chain-id $CHAIN_ID', + "fetchd collect-gentxs", + # Enable rest-api + 'sed -i "s/stake/atestfet/" ~/.fetchd/config/genesis.json', + 'sed -i "s/enable = false/enable = true/" ~/.fetchd/config/app.toml', + 'sed -i "s/swagger = false/swagger = true/" ~/.fetchd/config/app.toml', + "fetchd start", + ) + + entrypoint_file = os.path.join(tmpdirname, "run-node.sh") + with open(entrypoint_file, "w") as file: + file.writelines(line + "\n" for line in run_node_lines) + os.chmod(entrypoint_file, 300) # nosec + + def create(self) -> Container: + """Create the container.""" + with tempfile.TemporaryDirectory() as tmpdirname: + self._make_entrypoint_file(tmpdirname) + mount_path = "/mnt" + volumes = {tmpdirname: {"bind": mount_path, "mode": "rw"}} + entrypoint = os.path.join(mount_path, "run-node.sh") + container = self._client.containers.run( + self.tag, + detach=True, + network="host", + volumes=volumes, + entrypoint=str(entrypoint), + ports=self.PORTS, + ) + return container + + def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: + """Wait until the image is up.""" + for i in range(max_attempts): + try: + url = f"{self._addr}:{self._port}/net_info?" + response = requests.get(url) + enforce(response.status_code == 200, "") + return True + except Exception: + logger.info( + "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate + ) + time.sleep(sleep_rate) + return False diff --git a/scripts/whitelist.py b/scripts/whitelist.py index 5a646fbda5..7b19cea47c 100644 --- a/scripts/whitelist.py +++ b/scripts/whitelist.py @@ -307,3 +307,13 @@ BTC_ENCODING # unused variable (aea/helpers/cid.py:32) is_cid # unused method (aea/helpers/cid.py:200) launch_image # unused function (aea/test_tools/docker_image.py:183) +UNKNOWN_PROTOCOL_PUBLIC_ID # unused variable (aea/test_tools/constants.py:28) +UNKNOWN_CONNECTION_PUBLIC_ID # unused variable (aea/test_tools/constants.py:29) +_client # unused attribute (aea/test_tools/docker_image.py:51) +sleep_rate # unused variable (aea/test_tools/docker_image.py:107) +AnyStringWith # unused class (aea/test_tools/mocks.py:29) +RegexComparator # unused class (aea/test_tools/mocks.py:41) +ctx_mock_Popen # unused function (aea/test_tools/mocks.py:55) +get_unused_tcp_port # unused function (aea/test_tools/network.py:29) +get_host # unused function (aea/test_tools/network.py:39) +wait_for_condition # unused function (aea/test_tools/utils.py:26) diff --git a/tests/common/docker_image.py b/tests/common/docker_image.py deleted file mode 100644 index ce6e6226f1..0000000000 --- a/tests/common/docker_image.py +++ /dev/null @@ -1,275 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021 Valory AG -# Copyright 2018-2019 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains testing utilities.""" -import logging -import os -import re -import shutil -import subprocess # nosec -import tempfile -import time -from abc import ABC, abstractmethod -from typing import Dict, List, Optional - -import docker -import pytest -from docker import DockerClient -from docker.models.containers import Container - -from aea.exceptions import enforce -from aea.helpers import http_requests as requests - - -logger = logging.getLogger(__name__) - - -class DockerImage(ABC): - """A class to wrap interatction with a Docker image.""" - - MINIMUM_DOCKER_VERSION = (19, 0, 0) - - def __init__(self, client: docker.DockerClient): - """Initialize.""" - self._client = client - - def check_skip(self): - """ - Check whether the test should be skipped. - - By default, nothing happens. - """ - self._check_docker_binary_available() - - def _check_docker_binary_available(self): - """Check the 'Docker' CLI tool is in the OS PATH.""" - result = shutil.which("docker") - if result is None: - pytest.skip("Docker not in the OS Path; skipping the test") - - result = subprocess.run( # nosec - ["docker", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE - ) - if result.returncode != 0: - pytest.skip(f"'docker --version' failed with exit code {result.returncode}") - - match = re.search( - r"Docker version ([0-9]+)\.([0-9]+)\.([0-9]+)", - result.stdout.decode("utf-8"), - ) - if match is None: - pytest.skip("cannot read version from the output of 'docker --version'") - version = (int(match.group(1)), int(match.group(2)), int(match.group(3))) - if version < self.MINIMUM_DOCKER_VERSION: - pytest.skip( - f"expected Docker version to be at least {'.'.join(self.MINIMUM_DOCKER_VERSION)}, found {'.'.join(version)}" - ) - - @property - @abstractmethod - def tag(self) -> str: - """Return the tag of the image.""" - - def stop_if_already_running(self): - """Stop the running images with the same tag, if any.""" - client = docker.from_env() - for container in client.containers.list(): - if self.tag in container.image.tags: - logger.info(f"Stopping image {self.tag}...") - container.stop() - - @abstractmethod - def create(self) -> Container: - """Instantiate the image in a container.""" - - @abstractmethod - def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: - """ - Wait until the image is running. - - :param max_attempts: max number of attempts. - :param sleep_rate: the amount of time to sleep between different requests. - :return: True if the wait was successful, False otherwise. - """ - return True - - -class GanacheDockerImage(DockerImage): - """Wrapper to Ganache Docker image.""" - - def __init__( - self, - client: DockerClient, - addr: str, - port: int, - config: Optional[Dict] = None, - gas_limit: str = "0x9184e72a000", # 10000000000000, - ): - """ - Initialize the Ganache Docker image. - - :param client: the Docker client. - :param addr: the address. - :param port: the port. - :param config: optional configuration to command line. - :param gas_limit: the gas limit for blocks. - """ - super().__init__(client) - self._addr = addr - self._port = port - self._config = config or {} - self._gas_limit = gas_limit - - @property - def tag(self) -> str: - """Get the image tag.""" - return "trufflesuite/ganache:beta" - - def _make_ports(self) -> Dict: - """Make ports dictionary for Docker.""" - return {f"{self._port}/tcp": ("0.0.0.0", self._port)} # nosec - - def _build_command(self) -> List[str]: - """Build command.""" - # cmd = ["--chain.hardfork=london"] # noqa: E800 - cmd = ["--miner.blockGasLimit=" + str(self._gas_limit)] - # cmd += ["--miner.callGasLimit=" + "0x1fffffffffffff"] # noqa: E800 - accounts_balances = self._config.get("accounts_balances", []) - for account, balance in accounts_balances: - cmd += [f"--wallet.accounts='{account},{balance}'"] - return cmd - - def create(self) -> Container: - """Create the container.""" - cmd = self._build_command() - container = self._client.containers.run( - self.tag, command=cmd, detach=True, ports=self._make_ports() - ) - return container - - def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: - """Wait until the image is up.""" - request = dict(jsonrpc=2.0, method="web3_clientVersion", params=[], id=1) - for i in range(max_attempts): - try: - response = requests.post(f"{self._addr}:{self._port}", json=request) - enforce(response.status_code == 200, "") - return True - except Exception: - logger.info( - "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate - ) - time.sleep(sleep_rate) - return False - - -class FetchLedgerDockerImage(DockerImage): - """Wrapper to Fetch ledger Docker image.""" - - PORTS = {1317: 1317, 26657: 26657} - - def __init__( - self, - client: DockerClient, - addr: str, - port: int, - tag: str, - config: Optional[Dict] = None, - ): - """ - Initialize the Fetch ledger Docker image. - - :param client: the Docker client. - :param addr: the address. - :param port: the port. - :param config: optional configuration to command line. - """ - super().__init__(client) - self._addr = addr - self._port = port - self._image_tag = tag - self._config = config or {} - - @property - def tag(self) -> str: - """Get the image tag.""" - return self._image_tag - - def _make_entrypoint_file(self, tmpdirname) -> None: - """Make a temporary entrypoint file to setup and run the test ledger node""" - run_node_lines = ( - "#!/usr/bin/env bash", - # variables - f'export VALIDATOR_KEY_NAME={self._config["genesis_account"]}', - f'export VALIDATOR_MNEMONIC="{self._config["mnemonic"]}"', - 'export PASSWORD="12345678"', - f'export CHAIN_ID={self._config["chain_id"]}', - f'export MONIKER={self._config["moniker"]}', - f'export DENOM={self._config["denom"]}', - # Add key - '( echo "$VALIDATOR_MNEMONIC"; echo "$PASSWORD"; echo "$PASSWORD"; ) |fetchd keys add $VALIDATOR_KEY_NAME --recover', - # Configure node - "fetchd init --chain-id=$CHAIN_ID $MONIKER", - 'echo "$PASSWORD" |fetchd add-genesis-account $(fetchd keys show $VALIDATOR_KEY_NAME -a) 100000000000000000000000$DENOM', - 'echo "$PASSWORD" |fetchd gentx $VALIDATOR_KEY_NAME 10000000000000000000000$DENOM --chain-id $CHAIN_ID', - "fetchd collect-gentxs", - # Enable rest-api - 'sed -i "s/stake/atestfet/" ~/.fetchd/config/genesis.json', - 'sed -i "s/enable = false/enable = true/" ~/.fetchd/config/app.toml', - 'sed -i "s/swagger = false/swagger = true/" ~/.fetchd/config/app.toml', - "fetchd start", - ) - - entrypoint_file = os.path.join(tmpdirname, "run-node.sh") - with open(entrypoint_file, "w") as file: - file.writelines(line + "\n" for line in run_node_lines) - os.chmod(entrypoint_file, 300) # nosec - - def create(self) -> Container: - """Create the container.""" - with tempfile.TemporaryDirectory() as tmpdirname: - self._make_entrypoint_file(tmpdirname) - mount_path = "/mnt" - volumes = {tmpdirname: {"bind": mount_path, "mode": "rw"}} - entrypoint = os.path.join(mount_path, "run-node.sh") - container = self._client.containers.run( - self.tag, - detach=True, - network="host", - volumes=volumes, - entrypoint=str(entrypoint), - ports=self.PORTS, - ) - return container - - def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: - """Wait until the image is up.""" - for i in range(max_attempts): - try: - url = f"{self._addr}:{self._port}/net_info?" - response = requests.get(url) - enforce(response.status_code == 200, "") - return True - except Exception: - logger.info( - "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate - ) - time.sleep(sleep_rate) - return False diff --git a/tests/common/mocks.py b/tests/common/mocks.py deleted file mode 100644 index e85e4ec1c9..0000000000 --- a/tests/common/mocks.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2022 Valory AG -# Copyright 2018-2021 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - -"""This module contains mocking utils testing purposes.""" -import re -import unittest -from contextlib import contextmanager -from typing import Generator -from unittest.mock import MagicMock - - -class AnyStringWith(str): - """ - Helper class to assert calls of mocked method with string arguments. - - It will use string inclusion as equality comparator. - """ - - def __eq__(self, other): - """Check equality.""" - return self in other - - -class RegexComparator(str): - """ - Helper class to assert calls of mocked method with string arguments. - - It will use regex matching as equality comparator. - """ - - def __eq__(self, other): - """Check equality.""" - regex = re.compile(str(self), re.MULTILINE | re.DOTALL) - s = str(other) - return bool(regex.search(s)) - - -@contextmanager -def ctx_mock_Popen() -> Generator: - """ - Mock subprocess.Popen. - - Act as context manager. - - :return: mock object. - """ - return_value = MagicMock() - return_value.communicate.return_value = (MagicMock(), MagicMock()) - - with unittest.mock.patch("subprocess.Popen", return_value=return_value) as mocked: - yield mocked diff --git a/tests/conftest.py b/tests/conftest.py index 2bcd3bb4a5..ad33026d52 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -38,7 +38,6 @@ from pathlib import Path from typing import Callable, Dict, Generator, List, Optional, Tuple, cast from unittest.mock import MagicMock, patch -from urllib.parse import urlparse import docker as docker import gym @@ -55,6 +54,7 @@ FUNDED_ETH_PRIVATE_KEY_2, FUNDED_ETH_PRIVATE_KEY_3, ) +from aea_ledger_ethereum.test_tools.docker_images import GanacheDockerImage from aea_ledger_fetchai import FetchAIApi, FetchAICrypto, FetchAIFaucetApi from aea_ledger_fetchai.test_tools.constants import ( FETCHAI_P2P_ADDRESS, @@ -63,6 +63,7 @@ FUNDED_FETCHAI_ADDRESS_TWO, FUNDED_FETCHAI_PRIVATE_KEY_1, ) +from aea_ledger_fetchai.test_tools.docker_images import FetchLedgerDockerImage from cosmpy.aerial.client import LedgerClient, NetworkConfig from cosmpy.aerial.wallet import LocalWallet from cosmpy.crypto.address import Address as CosmpyAddress @@ -96,17 +97,13 @@ from aea.identity.base import Identity from aea.test_tools.click_testing import CliRunner as ImportedCliRunner from aea.test_tools.constants import DEFAULT_AUTHOR +from aea.test_tools.docker_image import DockerImage from aea.test_tools.network import LOCALHOST from aea.test_tools.test_cases import BaseAEATestCase from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection from packages.fetchai.connections.stub.connection import StubConnection -from tests.common.docker_image import ( - DockerImage, - FetchLedgerDockerImage, - GanacheDockerImage, -) from tests.data.dummy_connection.connection import DummyConnection # type: ignore From d0d1458eb771ad3ea3276dc69aad665450dd4315 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 14:43:37 +0000 Subject: [PATCH 54/93] test: fix package imports --- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/gym_aea/aea-config.yaml | 8 +-- .../agents/my_first_aea/aea-config.yaml | 4 +- .../fetchai/connections/gym/connection.yaml | 2 +- .../connections/http_client/connection.yaml | 2 +- .../connections/http_server/connection.yaml | 2 +- .../connections/ledger/connection.yaml | 4 +- .../fetchai/connections/local/connection.yaml | 4 +- .../fetchai/connections/stub/connection.yaml | 2 +- .../protocols/contract_api/protocol.yaml | 2 +- .../contract_api/tests/test_contract_api.py | 4 +- packages/fetchai/protocols/fipa/protocol.yaml | 2 +- .../fetchai/protocols/fipa/tests/test_fipa.py | 8 +-- packages/fetchai/protocols/gym/protocol.yaml | 2 +- .../fetchai/protocols/gym/tests/test_gym.py | 4 +- packages/fetchai/protocols/http/protocol.yaml | 2 +- .../fetchai/protocols/http/tests/test_http.py | 5 +- .../protocols/ledger_api/protocol.yaml | 2 +- .../ledger_api/tests/test_ledger_api.py | 5 +- .../protocols/oef_search/protocol.yaml | 2 +- .../oef_search/tests/test_oef_search.py | 5 +- .../fetchai/skills/erc1155_client/skill.yaml | 12 ++--- .../fetchai/skills/erc1155_deploy/skill.yaml | 12 ++--- .../skills/fipa_dummy_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 10 ++-- .../fetchai/skills/generic_seller/skill.yaml | 8 +-- packages/fetchai/skills/gym/skill.yaml | 4 +- packages/fetchai/skills/http_echo/skill.yaml | 4 +- packages/hashes.csv | 54 +++++++++---------- .../open_aea/agents/gym_aea/aea-config.yaml | 8 +-- .../open_aea/agents/http_echo/aea-config.yaml | 8 +-- .../agents/my_first_aea/aea-config.yaml | 4 +- 32 files changed, 96 insertions(+), 103 deletions(-) diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 96c63b24e9..76cdeefd36 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +- fetchai/stub:0.21.0:bafybeifng4ks6c4itpu5jolij3q72valp3hbhvutnbnu3vvwbggfbbpajy contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 8f21999e99..dc632d2a63 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +- fetchai/gym:0.19.0:bafybeihg2sxumbq4cdihopj2y7v3rfadnnoygnvdywzqgquivtw625dy7q contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/gym:1.0.0:bafybeicuwoic4ubxjmap7g25k3zld3pzwgvbi3yfwbkv6xclrlcmitcsha - fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: -- fetchai/gym:0.20.0:bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba +- fetchai/gym:0.20.0:bafybeidwwdgu2ohsrj6lls4qpdgmrdnvtz257petjhgkvxwejwyijoumbu default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 304edb5ad3..cd5af8690d 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,12 +8,12 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +- fetchai/stub:0.21.0:bafybeifng4ks6c4itpu5jolij3q72valp3hbhvutnbnu3vvwbggfbbpajy contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy - fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: - fetchai/echo:0.19.0:bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre default_connection: fetchai/stub:0.21.0 diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 77a8fe97f3..21a3b14a0b 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/gym:1.0.0:bafybeicuwoic4ubxjmap7g25k3zld3pzwgvbi3yfwbkv6xclrlcmitcsha class_name: GymConnection config: env: '' diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index 905568d13e..2c7321fb21 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -15,7 +15,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +- fetchai/http:1.0.0:bafybeifwvshtgjo2lol4h7en2xggefko5p2wjikotopjwf7rqzi5szx5na class_name: HTTPClientConnection config: host: 127.0.0.1 diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index 5d14d630f6..b68ab8961f 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -19,7 +19,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +- fetchai/http:1.0.0:bafybeifwvshtgjo2lol4h7en2xggefko5p2wjikotopjwf7rqzi5szx5na class_name: HTTPServerConnection config: api_spec_path: null diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index 805b2a7501..ad8eadba15 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -18,8 +18,8 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +- fetchai/contract_api:1.0.0:bafybeifdu4tshh3xfqpgbmfuu6zmpqugwpcqizmauhowybssygebafrjey +- fetchai/ledger_api:1.0.0:bafybeiaqpqwx575lwjat6z2puxliqhl2l2u52mpgwcwhg555dz6fu7qwhe class_name: LedgerConnection config: ledger_apis: diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index f044dfb512..9ecf117296 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -16,8 +16,8 @@ fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +- fetchai/fipa:1.0.0:bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y +- fetchai/oef_search:1.0.0:bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 class_name: OEFLocalConnection config: {} excluded_protocols: [] diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index d4054f9397..60f6a28fe2 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -17,7 +17,7 @@ fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +- fetchai/oef_search:1.0.0:bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml index fae96ba596..360b438cc4 100644 --- a/packages/fetchai/protocols/contract_api/protocol.yaml +++ b/packages/fetchai/protocols/contract_api/protocol.yaml @@ -16,7 +16,7 @@ fingerprint: message.py: bafybeigftvzbo5xf42rxvyjqj3f3sladfpm3dikjymasasu73uo3emfrn4 serialization.py: bafybeif7ij4l5e6mx7gfuwggdlarohqblpluik6hkfq4s2ha7nubwwiwyy tests/__init__.py: bafybeiebqiklu6bfyzb6x6q7yby632h3nfncwzi3i7mjvombiq2eugpcym - tests/test_contract_api.py: bafybeifpn4c7wvzl3d4d7nreoxabflsvj72h7styq7wc7vmkkrhcqkgnfq + tests/test_contract_api.py: bafybeihz2qe6zrygs2vzfhtr7bykxrckpy42dtieebpcuw3kro42gibajq fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py index 2d0ebc3522..62891b5955 100644 --- a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py +++ b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py @@ -32,7 +32,7 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -import packages +from packages.fetchai.protocols.contract_api import message from packages.fetchai.protocols.contract_api.dialogues import ( ContractApiDialogue, ContractApiDialogues, @@ -400,7 +400,7 @@ def test_decoding_unknown_performative(): @mock.patch.object( - packages.fetchai.protocols.contract_api.message, + message, "enforce", side_effect=AEAEnforceError("some error"), ) diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml index 85d4c4f081..c743c90add 100644 --- a/packages/fetchai/protocols/fipa/protocol.yaml +++ b/packages/fetchai/protocols/fipa/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: fipa_pb2.py: bafybeicgs4xb5aggw7pv5szdcp7jjdvii3hec3savyt2amsjkfjkd4ywja message.py: bafybeib2wjkf5ku5oomvti2mxved4qceqsw4e2p3hb4vlafz6zvfvgseou serialization.py: bafybeift53kcwwj77jkpk2tqfqg3wkwyo7ok3ceywrevg76mpbstxq4gpi - tests/test_fipa.py: bafybeicnbveyjrewnlczb4t5o3eqzjl7k54qt4pwucewkzxanw5m5ulfl4 + tests/test_fipa.py: bafybeie3k4g2ye7esrom7kdjbsmsnyvbklrzqnqr3eqpemsz7k6uqm3lta fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/fipa/tests/test_fipa.py b/packages/fetchai/protocols/fipa/tests/test_fipa.py index 1ca1b4407f..98f94ea1a5 100644 --- a/packages/fetchai/protocols/fipa/tests/test_fipa.py +++ b/packages/fetchai/protocols/fipa/tests/test_fipa.py @@ -21,7 +21,6 @@ """This module contains the tests of the fipa protocol package.""" import logging -import sys from typing import Any, Optional, Type from unittest import mock @@ -35,18 +34,15 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -import packages +from packages.fetchai.protocols.fipa import message from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues from packages.fetchai.protocols.fipa.message import FipaMessage from packages.fetchai.protocols.fipa.message import ( _default_logger as fipa_message_logger, ) -from tests.conftest import ROOT_DIR - logger = logging.getLogger(__name__) -sys.path.append(ROOT_DIR) def test_cfp_serialization(): @@ -401,7 +397,7 @@ def test_decoding_unknown_performative(): @mock.patch.object( - packages.fetchai.protocols.fipa.message, + message, "enforce", side_effect=AEAEnforceError("some error"), ) diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml index 5ec483f1b9..2df23f5165 100644 --- a/packages/fetchai/protocols/gym/protocol.yaml +++ b/packages/fetchai/protocols/gym/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: gym_pb2.py: bafybeihpz5o5kus64bsz7rextgizhqhaqidtxgnq7ijhhta5hnyfvlh6re message.py: bafybeidutr4rssoui26znxgbhkxsjpqx7mrdiryvjpnbm7ls6vtrbz3jim serialization.py: bafybeiabjo2b3y7jy6jlo4qt7fhhnkz2ge7bjvej4mfapxgfyehjp6pera - tests/test_gym.py: bafybeibxerpuzjkjbba7yxmypxvu2z3gxfbanake27okc3qyz6d57exowi + tests/test_gym.py: bafybeigwlendyojfsvonuzfbvz2ju2yihx2svl3k7r7yvsoascdfp7qw4q fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/gym/tests/test_gym.py b/packages/fetchai/protocols/gym/tests/test_gym.py index 31bb8062d7..9e462dbc92 100644 --- a/packages/fetchai/protocols/gym/tests/test_gym.py +++ b/packages/fetchai/protocols/gym/tests/test_gym.py @@ -32,7 +32,7 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -import packages +from packages.fetchai.protocols.gym import message from packages.fetchai.protocols.gym.dialogues import GymDialogue, GymDialogues from packages.fetchai.protocols.gym.message import GymMessage from packages.fetchai.protocols.gym.message import _default_logger as gym_message_logger @@ -258,7 +258,7 @@ def test_decoding_unknown_performative(): @mock.patch.object( - packages.fetchai.protocols.gym.message, + message, "enforce", side_effect=AEAEnforceError("some error"), ) diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml index 8ebc2d641c..bfa3767169 100644 --- a/packages/fetchai/protocols/http/protocol.yaml +++ b/packages/fetchai/protocols/http/protocol.yaml @@ -14,7 +14,7 @@ fingerprint: http_pb2.py: bafybeihox5yofjmegpwlbh4gmk5hb5bw6btjgdtvzuthio4km4j2axpbd4 message.py: bafybeicinzlrgvhjb3wjegef2nars2dtlqlts3zg4jgk443dsm5jlhjz5q serialization.py: bafybeiekyjreps7iqgmsxzgvlf55kqnhgzt3pvh7qtytmi2o2sui2ulrum - tests/test_http.py: bafybeie57rfgtytqttcsmyaq2iqfo2ao4iu6ixkdf5gc447v2pszx6jjvi + tests/test_http.py: bafybeiccgrh674xc2usv2jjrz574owfhp7egj4ddyxrlzu3hpkxql7ouh4 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/http/tests/test_http.py b/packages/fetchai/protocols/http/tests/test_http.py index 18077d7435..d67f833d65 100644 --- a/packages/fetchai/protocols/http/tests/test_http.py +++ b/packages/fetchai/protocols/http/tests/test_http.py @@ -20,7 +20,6 @@ """This module contains the tests of the http protocol package.""" -import sys from typing import Type from unittest import mock @@ -33,7 +32,7 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -import packages +from packages.fetchai.protocols.http import message from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues from packages.fetchai.protocols.http.message import HttpMessage from packages.fetchai.protocols.http.message import ( @@ -157,7 +156,7 @@ def test_decoding_unknown_performative(): @mock.patch.object( - packages.fetchai.protocols.http.message, + message, "enforce", side_effect=AEAEnforceError("some error"), ) diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml index 8603157f23..4d0f71feb5 100644 --- a/packages/fetchai/protocols/ledger_api/protocol.yaml +++ b/packages/fetchai/protocols/ledger_api/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: ledger_api_pb2.py: bafybeigshvrwgmug3c6dhqxzxkuzyaxjizaogvb7zo2nzqfqiw4mgvq6by message.py: bafybeicl3lsm2c7o4yxvm3k3jhi6nksjr3b7kvrrdpp2hbndxh5rxebjyq serialization.py: bafybeicwffv5vih2hzs5d6vws5j6egofycidmi4gos2brnmgn3ohydaxvq - tests/test_ledger_api.py: bafybeibxi4sjvscaxnve22nv775snhtr35kwz7jjszoer7rsjuzkb2dcfe + tests/test_ledger_api.py: bafybeianpyemsw6ra2sp7gdgpl557lxgncsdi4kv3lliuozdlpwszz5364 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py index 8879782bf6..eae209fe37 100644 --- a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py +++ b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py @@ -20,7 +20,6 @@ """This module contains the tests of the messages module.""" -import sys from typing import Type from unittest import mock @@ -34,7 +33,7 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -import packages +from packages.fetchai.protocols.ledger_api import message from packages.fetchai.protocols.ledger_api.custom_types import Kwargs from packages.fetchai.protocols.ledger_api.dialogues import ( LedgerApiDialogue, @@ -507,7 +506,7 @@ def test_decoding_unknown_performative(): @mock.patch.object( - packages.fetchai.protocols.ledger_api.message, + message, "enforce", side_effect=AEAEnforceError("some error"), ) diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml index 02643c9672..3835febb6f 100644 --- a/packages/fetchai/protocols/oef_search/protocol.yaml +++ b/packages/fetchai/protocols/oef_search/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: oef_search.proto: bafybeifvmxnxg4cuxkj64iqeifyv7jl4ihxgsope7p4j74yotedboai7jm oef_search_pb2.py: bafybeibzoqlyihqvgvvpz2bbjekf547n6j677ufw3hy2eqlyhedcuqqbjm serialization.py: bafybeiavvusik7aycfaqsuign5hpqfq5bgw5vwimpeqxtgymbuokvdd5f4 - tests/test_oef_search.py: bafybeifwsm3dct5p7m7zesmfvcxkph4jt2vmjtjg2zfv4mjwb4qf65vbje + tests/test_oef_search.py: bafybeidarcqwoaut5mkbemlkchia4ox6quccejknht7m5asgcegl2k5kze fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py index 3cdd85be52..977f0876dd 100644 --- a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py +++ b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py @@ -20,7 +20,6 @@ """This module contains the tests of the oef_search protocol package.""" -import sys from typing import Type from unittest import mock @@ -34,7 +33,7 @@ from aea.protocols.dialogue.base import Dialogue as BaseDialogue from aea.protocols.dialogue.base import DialogueLabel -import packages +from packages.fetchai.protocols.oef_search import message from packages.fetchai.protocols.oef_search.dialogues import ( OefSearchDialogue, OefSearchDialogues, @@ -312,7 +311,7 @@ def test_decoding_unknown_performative(): @mock.patch.object( - packages.fetchai.protocols.oef_search.message, + message, "enforce", side_effect=AEAEnforceError("some error"), ) diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index d321226ccd..c3ab8607f5 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -21,16 +21,16 @@ fingerprint: tests/test_strategy.py: bafybeic3zyvuaaqtfpdsgkfqlkyn2ftzlkmxs2cgfw5ub4qylnbguk7rbq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeig36ducctgofrrhd56l24u2uhimkbp5xn74pxoazflypeez5smwrq contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: -- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +- fetchai/contract_api:1.0.0:bafybeifdu4tshh3xfqpgbmfuu6zmpqugwpcqizmauhowybssygebafrjey - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/fipa:1.0.0:bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y +- fetchai/ledger_api:1.0.0:bafybeiaqpqwx575lwjat6z2puxliqhl2l2u52mpgwcwhg555dz6fu7qwhe +- fetchai/oef_search:1.0.0:bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: [] behaviours: search: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 1ac6abae34..446b55bbcd 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -21,16 +21,16 @@ fingerprint: tests/test_strategy.py: bafybeihjb32d5x7qzilodj6coe7x3hox2bmzh5zcmhanwxpvsn44vf6nu4 fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeig36ducctgofrrhd56l24u2uhimkbp5xn74pxoazflypeez5smwrq contracts: - fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu protocols: -- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +- fetchai/contract_api:1.0.0:bafybeifdu4tshh3xfqpgbmfuu6zmpqugwpcqizmauhowybssygebafrjey - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/fipa:1.0.0:bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y +- fetchai/ledger_api:1.0.0:bafybeiaqpqwx575lwjat6z2puxliqhl2l2u52mpgwcwhg555dz6fu7qwhe +- fetchai/oef_search:1.0.0:bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml index 35f992f64b..a97267a88f 100644 --- a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml +++ b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml @@ -15,7 +15,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/fipa:1.0.0:bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y skills: [] behaviours: initializer: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index c150ffc6f4..b3718cf994 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -19,14 +19,14 @@ fingerprint: tests/test_models.py: bafybeia3a3wtmmjxqn4qspbrluaypql262xne3n4t7qdyjsn3bkfsq4cxq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeig36ducctgofrrhd56l24u2uhimkbp5xn74pxoazflypeez5smwrq contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/fipa:1.0.0:bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y +- fetchai/ledger_api:1.0.0:bafybeiaqpqwx575lwjat6z2puxliqhl2l2u52mpgwcwhg555dz6fu7qwhe +- fetchai/oef_search:1.0.0:bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: [] behaviours: search: diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 0cacaf3fde..79dd056a6b 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -20,13 +20,13 @@ fingerprint: tests/test_models.py: bafybeicea7y22x23k77afs5qe4iokhxfnzw6fakhhlxcrvrbw2pnmrzimq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeig36ducctgofrrhd56l24u2uhimkbp5xn74pxoazflypeez5smwrq contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +- fetchai/fipa:1.0.0:bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y +- fetchai/ledger_api:1.0.0:bafybeiaqpqwx575lwjat6z2puxliqhl2l2u52mpgwcwhg555dz6fu7qwhe +- fetchai/oef_search:1.0.0:bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 714428c950..942650cb4a 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -23,11 +23,11 @@ fingerprint: tests/test_task.py: bafybeifwk6oi2ilsbm435ncjynli5iskvuwgwilivzugz67njryotz5kum fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +- fetchai/gym:0.19.0:bafybeihg2sxumbq4cdihopj2y7v3rfadnnoygnvdywzqgquivtw625dy7q contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/gym:1.0.0:bafybeicuwoic4ubxjmap7g25k3zld3pzwgvbi3yfwbkv6xclrlcmitcsha skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 468d231390..13262ed37b 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -13,13 +13,13 @@ fingerprint: handlers.py: bafybeidxvskxngwlhdnxs2xwr54vch2wjks2l5gqtgr5t5bc2izpjfr3ti tests/__init__.py: bafybeigqjv34vhfwcxmri75l5opezgu66jsyjj7metj7lgk2jbx4rqztyy tests/test_dialogues.py: bafybeib4xlhm5wttmtysti4dl7alfzbu44yepckdvzlaymhqvbh33mphc4 - tests/test_handlers.py: bafybeih6js2bmvbv3pfnfpsf5bzayzje33gveti43nfsgdzqil46qazfkq + tests/test_handlers.py: bafybeiczxf7u22cqzghdpw3uttl3h5g2n3hp4pbv5oien6kxhduoqnm3bi fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +- fetchai/http:1.0.0:bafybeifwvshtgjo2lol4h7en2xggefko5p2wjikotopjwf7rqzi5szx5na skills: [] behaviours: {} handlers: diff --git a/packages/hashes.csv b/packages/hashes.csv index 24bebf7c25..06ae7da521 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,43 +1,43 @@ -fetchai/agents/error_test,bafybeibaadvuqyyhgzvuvvdujahs4srchci5dguamslwgtohy74ik6uy7e -fetchai/agents/gym_aea,bafybeid4qhwnuhpk34jvrss6hzp2nbmespkgmey4z2hfr43uuj6w4sgufa -fetchai/agents/my_first_aea,bafybeihqrio6rmj5dolw4agfo4jgkzkjcnx5qnecuiv3hvl67dlb2aqspm -fetchai/connections/gym,bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 -fetchai/connections/http_client,bafybeicb5ckt7xyyxk7djguraloe6qm4m7nayujjjjdpirivpcvdb3b6km -fetchai/connections/http_server,bafybeib2xtqle4gjxik27xsrvotv2t6iqqwrgbspjlbbntwee3nssb5wyy -fetchai/connections/ledger,bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je -fetchai/connections/local,bafybeibnwhom4vyb47z6msnnh336cydvzta5xifbgi7vllbv5ccrjkhnju -fetchai/connections/stub,bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +fetchai/agents/error_test,bafybeia26bgdposzc3ogzeftdc6l5szdux3jg34gkiirfa5rade7xfe7wy +fetchai/agents/gym_aea,bafybeiabjkebtkpptwwssez2kg75kocfplr2khexudmxcscm3w7eq5pzia +fetchai/agents/my_first_aea,bafybeidjhpjyw66tbzpe4azh24wqc7rhdrpxsvf4l7qqeoqwk6pxlnj7yi +fetchai/connections/gym,bafybeihg2sxumbq4cdihopj2y7v3rfadnnoygnvdywzqgquivtw625dy7q +fetchai/connections/http_client,bafybeifysihyyuujp4qtyhr6ce6aqmgwn3ruycm5yhihcjkfr4olqkg2tm +fetchai/connections/http_server,bafybeichdfkvuwwl6ub2utqpwvie76akevvyjcydep4cbn3f27lboswpei +fetchai/connections/ledger,bafybeig36ducctgofrrhd56l24u2uhimkbp5xn74pxoazflypeez5smwrq +fetchai/connections/local,bafybeietxvtyw4rau4vzbxlvtodmqg5ubtni7vzy6egcmfz63xvkzfiwfa +fetchai/connections/stub,bafybeifng4ks6c4itpu5jolij3q72valp3hbhvutnbnu3vvwbggfbbpajy fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu -fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +fetchai/protocols/contract_api,bafybeifdu4tshh3xfqpgbmfuu6zmpqugwpcqizmauhowybssygebafrjey fetchai/protocols/default,bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -fetchai/protocols/fipa,bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -fetchai/protocols/gym,bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a -fetchai/protocols/http,bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky -fetchai/protocols/ledger_api,bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -fetchai/protocols/oef_search,bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +fetchai/protocols/fipa,bafybeiel7a374f3wzub6rdwh6r7z7zbz4ubvoagybxqlts2d5e4z7qdo5y +fetchai/protocols/gym,bafybeicuwoic4ubxjmap7g25k3zld3pzwgvbi3yfwbkv6xclrlcmitcsha +fetchai/protocols/http,bafybeifwvshtgjo2lol4h7en2xggefko5p2wjikotopjwf7rqzi5szx5na +fetchai/protocols/ledger_api,bafybeiaqpqwx575lwjat6z2puxliqhl2l2u52mpgwcwhg555dz6fu7qwhe +fetchai/protocols/oef_search,bafybeibx572iczmr26bp3zqzorytl5ixu5dnsvbnxgsadzz6jbo346v354 fetchai/protocols/state_update,bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m fetchai/protocols/tac,bafybeicpyc26jkkw73nm23llmywiew32moztazzbz3smcdze2cmlkq4kee fetchai/skills/echo,bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre -fetchai/skills/erc1155_client,bafybeifmialtp4qwzusa7ohhdcg62ai7l3b6l65posq2olw2bq6gnwgjly -fetchai/skills/erc1155_deploy,bafybeihgkstvulxrdrbqkdqq5e3jlhpyt45264q5jey7qgo6agohbvtmca +fetchai/skills/erc1155_client,bafybeies2dca5f6kiclaizuvsvixhafela6af6i76cayjffyr4vtkenqlq +fetchai/skills/erc1155_deploy,bafybeiemhqtxervns7yxbexih57tv2sgw2lshntbu2mkq5ylmtgx7zy4sm fetchai/skills/error,bafybeidxuxq32xopdw73b2xr7ufgbytkjettfzknupgr5gt4fnd7lbarjy fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu -fetchai/skills/fipa_dummy_buyer,bafybeialocgbh25dnwrmgo5xofc5kn5skxwzurfgepmklz6ze3mujddase -fetchai/skills/generic_buyer,bafybeicnclpmi2mstrbj4domzubjjukakzu4qplwrisbggi5ye5semylum -fetchai/skills/generic_seller,bafybeielnpl223fgch3vjpliu5xcvakmuk27ej7k473rzyzwhwaenkkf7a -fetchai/skills/gym,bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba -fetchai/skills/http_echo,bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim +fetchai/skills/fipa_dummy_buyer,bafybeigq5mkdkmu3ojiyinnpfecgooaq4bg4egnkk6minuj644t4odwhs4 +fetchai/skills/generic_buyer,bafybeibixpxf55kwt4zqzhzlwugyulav6iaegqsnlrbim4zpru2ikms5ge +fetchai/skills/generic_seller,bafybeidmfakccvccq5l7tdafevtb44yefp2zr5l5oetqtxuof3eyvchjyy +fetchai/skills/gym,bafybeidwwdgu2ohsrj6lls4qpdgmrdnvtz257petjhgkvxwejwyijoumbu +fetchai/skills/http_echo,bafybeib3kufvbrhxoksc3moaeo5mngfapnohz6v7yweinhozc4h53yta4u fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeigsiufi67imext4dejq76yloqvzpagcc2cp6eunsysgul4ugv2xk4 -open_aea/agents/http_echo,bafybeib4hxhkee6vgbvmnwmk4fjql2fdqhmke6mz7mo3x54j6lht6duvze -open_aea/agents/my_first_aea,bafybeic245xjddl3zyvpj5uuwtaqdmhsws6rasb2kdo6ip6e54fhnz2dvy +open_aea/agents/gym_aea,bafybeihgchcjb5iywxesd5h64bvyiuhttiwtcczfnhaau2nd2o74lh4xmy +open_aea/agents/http_echo,bafybeihd7hrqba7vjl33yqisrdiit7txlnamidaawksw3k4ytxaz5kerxe +open_aea/agents/my_first_aea,bafybeibjut2pmfvjbi4vqepkytjdpyfyuwzki5lb6dwxroi7zrttmtvuiq open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze -open_aea/protocols/signing,bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +open_aea/protocols/signing,bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi open_aea/skills/scaffold,bafybeih3h7yia76rrbittnoeotpraiuho5rdqsnksuvncinaa3akgmnbaa valory/connections/p2p_libp2p,bafybeigmjwjggrxsjjl6mekzds2lmgi6dpj32hwa5giz6fub5vh7ukuvsu valory/connections/p2p_libp2p_client,bafybeif7plocy4y6bvhtb3bob3onsyt6lycyjzcdfk5ze72qa2xwqb4yji valory/connections/p2p_libp2p_mailbox,bafybeie6mbdudc6iryro6pxjxsbkx2xnmexvthb7rwkum2pt6tv4n26aey valory/protocols/acn,bafybeif7dt6cwbixufftupr2srfuzg2w2vgevtqdxwq3z25yab3ptpkyqq -valory/protocols/tendermint,bafybeiacnsydypoa2kxxdcbqdxyfafqtwrg7mzkzcu7is4b7weqb6qilge +valory/protocols/tendermint,bafybeidbdvqgrr2lbstyqbyb24kxhen6xnv65e3zqg7xj6fwrogrzms2ty diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 4b76defdce..bff8046f9a 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +- fetchai/gym:0.19.0:bafybeihg2sxumbq4cdihopj2y7v3rfadnnoygnvdywzqgquivtw625dy7q contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/gym:1.0.0:bafybeicuwoic4ubxjmap7g25k3zld3pzwgvbi3yfwbkv6xclrlcmitcsha - fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: -- fetchai/gym:0.20.0:bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba +- fetchai/gym:0.20.0:bafybeidwwdgu2ohsrj6lls4qpdgmrdnvtz257petjhgkvxwejwyijoumbu default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index 5aef0a4f83..dc80f15407 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeib2xtqle4gjxik27xsrvotv2t6iqqwrgbspjlbbntwee3nssb5wyy +- fetchai/http_server:0.22.0:bafybeichdfkvuwwl6ub2utqpwvie76akevvyjcydep4cbn3f27lboswpei contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/http:1.0.0:bafybeifwvshtgjo2lol4h7en2xggefko5p2wjikotopjwf7rqzi5szx5na +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: -- fetchai/http_echo:0.20.0:bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim +- fetchai/http_echo:0.20.0:bafybeib3kufvbrhxoksc3moaeo5mngfapnohz6v7yweinhozc4h53yta4u default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 2d09a7cb43..3bd9afb4d6 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,12 +8,12 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +- fetchai/stub:0.21.0:bafybeifng4ks6c4itpu5jolij3q72valp3hbhvutnbnu3vvwbggfbbpajy contracts: [] protocols: - fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy - fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- open_aea/signing:1.0.0:bafybeigubfrcyxrg3x6iohndfmiynhhx44qj6nhogv5uzkhmjgljnbguyi skills: - fetchai/echo:0.19.0:bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre default_connection: fetchai/stub:0.21.0 From 092fd87ae7bad0c61733d1ecaed44c63389ea4d9 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Thu, 1 Sep 2022 15:04:24 +0000 Subject: [PATCH 55/93] feat: add support for testing a collection of packages with aea test command --- aea/cli/test.py | 179 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 158 insertions(+), 21 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 0279b5cb54..50e54608a1 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -21,11 +21,14 @@ """Implementation of the 'aea test' command.""" import os import sys +import tempfile +import time from pathlib import Path from typing import Callable, Optional, Sequence, Set, cast import click import pytest +from coverage.cmdline import main as coverage from aea.cli.utils.click_utils import ( PublicIdParameter, @@ -40,7 +43,6 @@ AEA_TEST_DIRNAME, CONNECTION, CONTRACT, - PACKAGES, PROTOCOL, SKILL, ) @@ -54,14 +56,35 @@ from aea.configurations.manager import find_component_directory_from_component_id from aea.exceptions import enforce from aea.helpers.base import cd +from aea.helpers.dependency_tree import DependencyTree + + +COVERAGERC_FILE = ".coveragerc" +COVERAGERC_CONFIG = """[run] +omit = + */tests/* + +[html] +directory = {root_dir}/htmlcov + +[xml] +output = {root_dir}/coverage.xml +""" @click.group(invoke_without_command=True) @click.pass_context +@click.option( + "--cov", + is_flag=True, + default=False, + help="Use this flag to enable code coverage checks.", +) @pytest_args -def test(click_context: click.Context, args: Sequence[str]) -> None: +def test(click_context: click.Context, cov: bool, args: Sequence[str]) -> None: """Run tests of an AEA project.""" ctx = cast(Context, click_context.obj) + ctx.config["cov"] = cov if click_context.invoked_subcommand is None: test_aea_project(click_context, Path(ctx.cwd), args) @@ -118,7 +141,82 @@ def by_path( """Executes a test suite of a package specified by a path.""" click.echo(f"Executing tests of package at {path}'...") full_path = Path(ctx.cwd) / Path(path) - test_package_by_path(full_path, args, packages_dir=Path(ctx.registry_path)) + test_package_by_path( + full_path, + args, + packages_dir=Path(ctx.registry_path), + cov=ctx.config.get("cov", False), + ) + + +@test.command() +@pytest_args +@pass_ctx +def packages( + ctx: Context, + args: Sequence[str], +) -> None: + """Executes a test suite of a package specified by a path.""" + packages_dir = Path(ctx.registry_path) + available_packages = DependencyTree.find_packages_in_a_local_repository( + packages_dir + ) + + coverage_data = [] + failures = [] + start_time = time.perf_counter() + + with tempfile.TemporaryDirectory() as temp_dir: + covrc_file = Path(temp_dir, COVERAGERC_FILE) + covrc_file.write_text( + COVERAGERC_CONFIG.format(root_dir=str(packages_dir.parent)) + ) + for package_type, package_dir in available_packages[:20]: + if package_type == PackageType.AGENT.value: + continue + + test_dir = package_dir / AEA_TEST_DIRNAME + if not test_dir.exists(): + continue + + load_package(package_dir, packages_dir=packages_dir) + with cd(package_dir): + click.echo( + f"Running tests for {package_dir.name} of type {package_type}" + ) + exit_code = pytest.main( + [ + package_dir / AEA_TEST_DIRNAME, + f"--cov={package_dir.absolute()}", + f"--doctest-modules", + str(package_dir.absolute()), + f"--cov-config={covrc_file}", + "--cov-report=term", + ] + ) + if exit_code: + click.echo( + f"Running tests for for {package_dir.name} of type {package_type} failed" + ) + failures.append( + (exit_code, os.path.sep.join(package_dir.parts[-3:])) + ) + coverage_data.append(str(package_dir / ".coverage")) + total_time = (time.perf_counter() - start_time) // 60 + + click.echo(f"Time : {total_time}") + click.echo("Generating coverage reports.") + + coverage(argv=["combine", f"--rcfile={covrc_file}", *coverage_data]) + coverage(argv=["html", f"--rcfile={covrc_file}"]) + coverage(argv=["xml", f"--rcfile={covrc_file}"]) + + if len(failures): + click.echo("Failed tests") + click.echo("Exit Code\tPackage") + for exit_code, package in failures: + click.echo(f"{exit_code} \t{package}") + sys.exit(1) def test_item( @@ -156,24 +254,19 @@ def test_item( # for a package in an AEA project, the "packages" dir is the AEA project dir aea_project_path = Path(ctx.cwd) test_package_by_path( - package_dirpath, pytest_arguments, aea_project_path=aea_project_path + package_dirpath, + pytest_arguments, + aea_project_path=aea_project_path, + cov=ctx.config.get("cov", False), ) -def test_package_by_path( +def load_package( package_dir: Path, - pytest_arguments: Sequence[str], aea_project_path: Optional[Path] = None, packages_dir: Optional[Path] = None, ) -> None: - """ - Fingerprint package placed in package_dir. - - :param package_dir: directory of the package - :param pytest_arguments: arguments to forward to Pytest - :param aea_project_path: directory to the AEA project - :param packages_dir: directory of the packages to import from - """ + """Load packages into cache.""" enforce( (aea_project_path is None) != (packages_dir is None), "one of either aea_project_path or packages_dir must be specified", @@ -189,6 +282,12 @@ def test_package_by_path( # check the path points to a valid AEA package package_type = determine_package_type_for_directory(package_dir) + if package_type != PackageType.AGENT: + component_type = ComponentType(package_type.value) + configuration = load_component_configuration(component_type, package_dir) + configuration.directory = package_dir + load_aea_packages_recursively(configuration, package_path_finder, root_packages) + test_package_dir = package_dir / AEA_TEST_DIRNAME enforce( test_package_dir.exists(), @@ -196,15 +295,53 @@ def test_package_by_path( click.ClickException, ) - if package_type != PackageType.AGENT: - component_type = ComponentType(package_type.value) - configuration = load_component_configuration(component_type, package_dir) - configuration.directory = package_dir - load_aea_packages_recursively(configuration, package_path_finder, root_packages) + +def test_package_by_path( + package_dir: Path, + pytest_arguments: Sequence[str], + aea_project_path: Optional[Path] = None, + packages_dir: Optional[Path] = None, + cov: bool = False, +) -> None: + """ + Fingerprint package placed in package_dir. + + :param package_dir: directory of the package + :param pytest_arguments: arguments to forward to Pytest + :param aea_project_path: directory to the AEA project + :param packages_dir: directory of the packages to import from + """ + + load_package(package_dir, aea_project_path, packages_dir) + exit_code = run_pytest(package_dir, pytest_arguments=pytest_arguments, cov=cov) + sys.exit(exit_code) + + +def run_pytest( + package_dir: Path, + pytest_arguments: Sequence[str], + cov: bool = False, +) -> int: + """Run pytest.""" + + runtime_args = [ + AEA_TEST_DIRNAME, + *pytest_arguments, + ] + + if cov: + runtime_args.extend( + [ + f"--cov={package_dir.absolute()}", + f"--doctest-modules", + str(package_dir.absolute()), + "--cov-report=term", + "--cov-report=term-missing", + ] + ) with cd(package_dir): - exit_code = pytest.main([AEA_TEST_DIRNAME] + list(pytest_arguments)) - sys.exit(exit_code) + return pytest.main(runtime_args) @check_aea_project From d0ab3c71e248fbaf8294177ce87f85d1a0c25f6b Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 17:09:50 +0200 Subject: [PATCH 56/93] chore: fix many linters --- aea/cli/test.py | 2 +- aea/test_tools/docker_image.py | 5 +- aea/test_tools/mocks.py | 2 +- aea/test_tools/network.py | 2 +- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/gym_aea/aea-config.yaml | 12 ++-- .../agents/my_first_aea/aea-config.yaml | 10 +-- .../fetchai/connections/gym/connection.yaml | 4 +- .../connections/http_client/connection.yaml | 4 +- .../http_client/tests/test_http_client.py | 4 +- .../connections/http_server/connection.yaml | 4 +- .../http_server/tests/test_http_server.py | 8 +-- .../connections/ledger/connection.yaml | 6 +- .../connections/ledger/tests/conftest.py | 12 +++- .../ledger/tests/test_ledger_api.py | 4 +- .../fetchai/connections/local/connection.yaml | 10 +-- .../connections/local/tests/test_misc.py | 1 - .../local/tests/test_search_services.py | 4 +- .../fetchai/connections/stub/connection.yaml | 6 +- .../fetchai/contracts/erc1155/contract.yaml | 2 +- .../fetchai/protocols/default/protocol.yaml | 2 +- .../protocols/default/tests/test_default.py | 5 +- packages/fetchai/protocols/fipa/protocol.yaml | 2 +- .../fetchai/protocols/fipa/tests/test_fipa.py | 10 ++- packages/fetchai/protocols/gym/protocol.yaml | 2 +- .../fetchai/protocols/gym/tests/test_gym.py | 10 ++- packages/fetchai/protocols/http/protocol.yaml | 2 +- .../fetchai/protocols/http/tests/test_http.py | 10 ++- .../protocols/ledger_api/protocol.yaml | 2 +- .../ledger_api/tests/test_ledger_api.py | 10 ++- .../protocols/oef_search/protocol.yaml | 2 +- .../oef_search/tests/test_oef_search.py | 10 ++- .../protocols/state_update/protocol.yaml | 2 +- .../state_update/tests/test_state_update.py | 5 +- packages/fetchai/protocols/tac/protocol.yaml | 2 +- .../fetchai/protocols/tac/tests/test_tac.py | 10 ++- packages/fetchai/skills/echo/skill.yaml | 2 +- .../fetchai/skills/erc1155_client/skill.yaml | 14 ++-- .../fetchai/skills/erc1155_deploy/skill.yaml | 14 ++-- packages/fetchai/skills/error/skill.yaml | 2 +- .../skills/fipa_dummy_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 12 ++-- .../fetchai/skills/generic_seller/skill.yaml | 10 +-- packages/fetchai/skills/gym/skill.yaml | 6 +- packages/fetchai/skills/http_echo/skill.yaml | 6 +- packages/hashes.csv | 64 +++++++++---------- .../open_aea/agents/gym_aea/aea-config.yaml | 12 ++-- .../open_aea/agents/http_echo/aea-config.yaml | 10 +-- .../agents/my_first_aea/aea-config.yaml | 10 +-- .../open_aea/protocols/signing/protocol.yaml | 2 +- .../protocols/signing/tests/test_signing.py | 5 +- .../test_tools/docker_images.py | 1 + scripts/whitelist.py | 2 +- setup.cfg | 3 + tests/test_aea.py | 10 +-- tests/test_aea_builder.py | 2 +- tests/test_cli/test_add_key.py | 12 +--- tests/test_cli/test_generate_key.py | 9 +-- tests/test_cli/test_issue_certificates.py | 4 +- tests/test_cli/test_run.py | 10 +-- tests/test_cli/test_test.py | 4 +- tests/test_contracts/test_base.py | 3 +- tests/test_crypto/test_helpers.py | 13 ++-- tests/test_crypto/test_ledger_apis.py | 4 +- .../test_registry/test_ledger_api_registry.py | 11 ++-- tests/test_crypto/test_wallet.py | 8 +-- tests/test_decision_maker/test_default.py | 8 ++- tests/test_multiplexer.py | 6 +- .../test_ledger/test_contract_api.py | 3 +- .../test_communication.py | 2 +- tests/test_protocols/test_base.py | 3 +- tests/test_runner.py | 2 +- tests/test_skills/test_base.py | 10 +-- 73 files changed, 235 insertions(+), 256 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 50c53ed3fb..fcfdd9b855 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -236,7 +236,7 @@ def load_aea_packages_recursively( """ already_loaded = already_loaded if already_loaded else set() for dependency_id in config.package_dependencies: - # TODO: load packages in topological order? Should not matter as at the moment we are not + # TODO: load packages in topological order? Should not matter as at the moment we are not # pylint: disable=fixme # actually running the modules, just populating sys.modules dependency_path = package_path_finder(root_packages, dependency_id) dependency_configuration = load_component_configuration( diff --git a/aea/test_tools/docker_image.py b/aea/test_tools/docker_image.py index ea1ec402a2..32ee7a5d93 100644 --- a/aea/test_tools/docker_image.py +++ b/aea/test_tools/docker_image.py @@ -64,7 +64,7 @@ def _check_docker_binary_available(self) -> None: if result is None: pytest.skip("Docker not in the OS Path; skipping the test") - proc_result = subprocess.run( # nosec + proc_result = subprocess.run( # pylint: disable=subprocess-run-check # nosec ["docker", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE ) if proc_result.returncode != 0: @@ -78,6 +78,7 @@ def _check_docker_binary_available(self) -> None: ) if match is None: pytest.skip("cannot read version from the output of 'docker --version'") + return version = (int(match.group(1)), int(match.group(2)), int(match.group(3))) if version < self.MINIMUM_DOCKER_VERSION: pytest.skip( @@ -91,7 +92,7 @@ def tag(self) -> str: def stop_if_already_running(self) -> None: """Stop the running images with the same tag, if any.""" - import docker + import docker # pylint: disable=import-outside-toplevel,import-error client = docker.from_env() for container in client.containers.list(): diff --git a/aea/test_tools/mocks.py b/aea/test_tools/mocks.py index 50edcbb2f7..cfcb9c2784 100644 --- a/aea/test_tools/mocks.py +++ b/aea/test_tools/mocks.py @@ -59,7 +59,7 @@ def ctx_mock_Popen() -> Generator: Act as context manager. - :return: mock object. + :yield: mock generator. """ return_value = MagicMock() return_value.communicate.return_value = (MagicMock(), MagicMock()) diff --git a/aea/test_tools/network.py b/aea/test_tools/network.py index d2c768887e..fbb808b39a 100644 --- a/aea/test_tools/network.py +++ b/aea/test_tools/network.py @@ -43,7 +43,7 @@ def get_host() -> str: # doesn't even have to be reachable s.connect(("10.255.255.255", 1)) IP = s.getsockname()[0] - except Exception: + except Exception: # pylint: disable=broad-except IP = LOCALHOST.hostname finally: s.close() diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 96c63b24e9..1c588f5bcd 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +- fetchai/stub:0.21.0:bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 8f21999e99..620ff83e38 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +- fetchai/gym:0.19.0:bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a -- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/gym:1.0.0:bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi +- fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: -- fetchai/gym:0.20.0:bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba +- fetchai/gym:0.20.0:bafybeibendxox7npijbsfqju74ptfl6y5b6s3ieufhiqzo44etveb6f5fq default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 304edb5ad3..4c23e5e7b3 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +- fetchai/stub:0.21.0:bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: -- fetchai/echo:0.19.0:bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre +- fetchai/echo:0.19.0:bafybeia6sgw3ppjl4y5hg5ha6mfqlo3hkvq7vkhonr3s4oubs2fow5ccyi default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 77a8fe97f3..95ccccea05 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -10,11 +10,11 @@ fingerprint: __init__.py: bafybeiacpcxqwod5ppgwckp36jj3ax2ymzkrv4tlalzcatxrx4tblbvfvq connection.py: bafybeiacf4utttdtrp2zb5wjrksatswb7dtlgnzafxiofuvzxot53oqdd4 tests/__init__.py: bafybeielwxjlvbzufqr3wgv4jrzbi6kquzelxbczla4cvpoiuz2no5eqp4 - tests/test_gym.py: bafybeihbednroqhfubwok367pbttg6wo6o22jpwocdmfsvo7lsf363ke2u + tests/test_gym.py: bafybeigyry6mxho2kww5ih5hat5e2ppfqmkgqky4xfdsmu2sxeowarg6si fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/gym:1.0.0:bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi class_name: GymConnection config: env: '' diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index 905568d13e..eac2f05868 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -11,11 +11,11 @@ fingerprint: __init__.py: bafybeiateb3vma46yihntj5gbai3eqcy3fkx55lkrwye6tbr4cuo5xktdm connection.py: bafybeihlwvleotrr5cgzokgcia7wek36c7pcflbuaminiqgvdrt2iuihoe tests/__init__.py: bafybeic5mqiqjs46dbrhwepcsgm6wkq5az5lzzi2gtavcyskn4cbe2yuvi - tests/test_http_client.py: bafybeiclx3iqqx3fo54puqaen22avlpofwzprqeebbza2pgjpvddexvppm + tests/test_http_client.py: bafybeid5zspv56oacfrxqlint5jkkendg7az2t7ohxzfien2yqy2rjif6i fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +- fetchai/http:1.0.0:bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq class_name: HTTPClientConnection config: host: 127.0.0.1 diff --git a/packages/fetchai/connections/http_client/tests/test_http_client.py b/packages/fetchai/connections/http_client/tests/test_http_client.py index 9c1359315c..d3f6e51271 100644 --- a/packages/fetchai/connections/http_client/tests/test_http_client.py +++ b/packages/fetchai/connections/http_client/tests/test_http_client.py @@ -18,7 +18,6 @@ # # ------------------------------------------------------------------------------ """Tests for the HTTP Client connection and channel.""" -# type: ignore # noqa: E800 # pylint: skip-file import asyncio @@ -71,7 +70,8 @@ def __init__(self, self_address: Address, **kwargs) -> None: """ Initialize dialogues. - :return: None + :param self_address: self address + :param kwargs: keyword arguments """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index 5d14d630f6..c9abcfd495 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -15,11 +15,11 @@ fingerprint: tests/data/certs/server.csr: bafybeicvp7xdl5w3o4bzikkudpduitss3bpp6xqfwlxbw6kabdangohy5u tests/data/certs/server.key: bafybeiabvpkpqr4fctrbssfal6pviv5otgmu32qyrfpyhcql5wgmlzjtoe tests/data/petstore_sim.yaml: bafybeiaekkfxljlv57uviz4ug6isdqbzsnuxpsgy3dvhzh22daql3xh2i4 - tests/test_http_server.py: bafybeibe6zpjeh3qkhnmlbmoctda42azujoiibxjunfjejridvk2wa4yni + tests/test_http_server.py: bafybeicvrmyqeywuc6qparw5yui2mkvhybrch6zpnhjgouhf6bj2zvk2me fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +- fetchai/http:1.0.0:bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq class_name: HTTPServerConnection config: api_spec_path: null diff --git a/packages/fetchai/connections/http_server/tests/test_http_server.py b/packages/fetchai/connections/http_server/tests/test_http_server.py index ff7c406cdb..ee8c07c6ee 100644 --- a/packages/fetchai/connections/http_server/tests/test_http_server.py +++ b/packages/fetchai/connections/http_server/tests/test_http_server.py @@ -18,7 +18,6 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the HTTP Server connection module.""" -# type: ignore # noqa: E800 # pylint: skip-file import asyncio @@ -64,7 +63,8 @@ def __init__(self, self_address: Address, **kwargs) -> None: """ Initialize dialogues. - :return: None + :param self_address: self address + :param kwargs: keyword arguments """ def role_from_first_message( # pylint: disable=unused-argument @@ -95,7 +95,7 @@ async def request(self, method: str, path: str, **kwargs) -> ClientResponse: :param method: HTTP method: GET, POST etc :param path: path to request on server. full url constructed automatically - + :param kwargs: keyword arguments :return: http response """ try: @@ -504,7 +504,7 @@ async def request(self, method: str, path: str, **kwargs) -> ClientResponse: :param method: HTTP method: GET, POST etc :param path: path to request on server. full url constructed automatically - + :param kwargs: keyword arguments :return: http response """ try: diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index 805b2a7501..b1799c1b0f 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -13,13 +13,13 @@ fingerprint: contract_dispatcher.py: bafybeigpzih7porhorupuu5zlrg7ho6fswf4qc65xq22wypgqzwxowqlay ledger_dispatcher.py: bafybeicrjfb2f4ngb3lvwgfbxf3r3ukk7pgm3oaour4htmnuqqn44ltmku tests/__init__.py: bafybeibx5zdcpx3u6sglbpp7yflnr7uaz557e6wqltawtzclubhhvaiw5e - tests/conftest.py: bafybeihisqmg4u2akda7fxba4tsq7zde53ygvaarayynkgdzyvc75l2ygu - tests/test_ledger_api.py: bafybeic75mc5rfp3wkr3o27yivzfuwata3vhvoksghqr35zuvhslcbmsky + tests/conftest.py: bafybeib4xwpgabqpzrm64v2mbjuexr7rzvvjpe7tdlp44cxe2zfqqezhuu + tests/test_ledger_api.py: bafybeieqnd6z5wtmne5wtvj4jsuyg2g5iyr5ppawhiy7smjiq3b52msyfe fingerprint_ignore_patterns: [] connections: [] protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u +- fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 class_name: LedgerConnection config: ledger_apis: diff --git a/packages/fetchai/connections/ledger/tests/conftest.py b/packages/fetchai/connections/ledger/tests/conftest.py index ddb5ca5359..b89484651f 100644 --- a/packages/fetchai/connections/ledger/tests/conftest.py +++ b/packages/fetchai/connections/ledger/tests/conftest.py @@ -66,7 +66,9 @@ def ethereum_testnet_config(): @pytest.fixture(scope="function") -def update_default_ethereum_ledger_api(ethereum_testnet_config): +def update_default_ethereum_ledger_api( + ethereum_testnet_config, +): # pylint: disable=redefined-outer-name """Change temporarily default Ethereum ledger api configurations to interact with local Ganache.""" old_config = DEFAULT_LEDGER_CONFIGS.pop(EthereumCrypto.identifier, None) DEFAULT_LEDGER_CONFIGS[EthereumCrypto.identifier] = ethereum_testnet_config @@ -76,7 +78,9 @@ def update_default_ethereum_ledger_api(ethereum_testnet_config): @pytest.fixture() -async def ledger_apis_connection(request, ethereum_testnet_config): +async def ledger_apis_connection( + request, ethereum_testnet_config +): # pylint: disable=redefined-outer-name,unused-argument """Make a connection.""" crypto = make_crypto(DEFAULT_LEDGER) identity = Identity("name", crypto.address, crypto.public_key) @@ -85,7 +89,9 @@ async def ledger_apis_connection(request, ethereum_testnet_config): PACKAGE_DIR, data_dir=MagicMock(), identity=identity, crypto_store=crypto_store ) connection = cast(Connection, connection) - connection._logger = logging.getLogger("aea.packages.fetchai.connections.ledger") + connection._logger = logging.getLogger( + "aea.packages.fetchai.connections.ledger" + ) # pylint: disable=protected-access # use testnet config connection.configuration.config.get("ledger_apis", {})[ diff --git a/packages/fetchai/connections/ledger/tests/test_ledger_api.py b/packages/fetchai/connections/ledger/tests/test_ledger_api.py index 91a4c37959..0f9d94bc24 100644 --- a/packages/fetchai/connections/ledger/tests/test_ledger_api.py +++ b/packages/fetchai/connections/ledger/tests/test_ledger_api.py @@ -19,7 +19,6 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the ledger API connection module.""" -# type: ignore # noqa: E800 # pylint: skip-file import asyncio @@ -115,7 +114,8 @@ def __init__(self, self_address: Address, **kwargs) -> None: """ Initialize dialogues. - :return: None + :param self_address: self address + :param kwargs: keyword arguments """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index f044dfb512..9cbdcc3eeb 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -10,14 +10,14 @@ fingerprint: __init__.py: bafybeibojyrqpiw5xkemsnrdie572mixa5ud4sxdtmpgfutl253kj4zjga connection.py: bafybeielwpaxz4nvhbrhmg3eyp55qq42drfyicfmbfbfty45bnzat7pvwm tests/__init__.py: bafybeihwthgb4qi2py7i5kuc4rn6n3lgxb756pxo7c7wru2ek6m2mon4ua - tests/test_misc.py: bafybeigncqgszcn5jcy4mpvk2ecjeaa2hnk5kgc2wenvssj7v34jxmftne - tests/test_search_services.py: bafybeigf4ykvxwxjjkjtqnwfzggzdux547ivfyy54mmrdv3ftpjh7f3wva + tests/test_misc.py: bafybeifctqrq55fa6swalswkhe7bokxizvidy354e4naywcamkwckbgi54 + tests/test_search_services.py: bafybeibcgnt5db5ms2zbshlxthzralqvmudyzy3llxurqkjg5cm7xhx56m fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca +- fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq class_name: OEFLocalConnection config: {} excluded_protocols: [] diff --git a/packages/fetchai/connections/local/tests/test_misc.py b/packages/fetchai/connections/local/tests/test_misc.py index e15807faeb..566bcb9180 100644 --- a/packages/fetchai/connections/local/tests/test_misc.py +++ b/packages/fetchai/connections/local/tests/test_misc.py @@ -19,7 +19,6 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the local OEF node implementation.""" -# type: ignore # noqa: E800 # pylint: skip-file import asyncio diff --git a/packages/fetchai/connections/local/tests/test_search_services.py b/packages/fetchai/connections/local/tests/test_search_services.py index 4cff4b9c3d..6b036e0d14 100644 --- a/packages/fetchai/connections/local/tests/test_search_services.py +++ b/packages/fetchai/connections/local/tests/test_search_services.py @@ -18,7 +18,6 @@ # # ------------------------------------------------------------------------------ """This module contains the tests for the search feature of the local OEF node.""" -# type: ignore # noqa: E800 # pylint: skip-file import unittest.mock @@ -68,7 +67,8 @@ def __init__(self, self_address: Address, **kwargs) -> None: """ Initialize dialogues. - :return: None + :param self_address: self address + :param kwargs: keyword arguments """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index d4054f9397..1c2fd21559 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -12,12 +12,12 @@ fingerprint: connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 input_file: bafybeiftu27piztiu5bfxbvhqsbppgtseykyfot6wtlrrzeuzya6zrgpky tests/__init__.py: bafybeihodqbifehez7r4zalztsn5ildne4rxc6rvdhykl7vscghxi4v45i - tests/test_stub.py: bafybeickhyxxbaygqa234xk4afjqklj46455rgghyhfcnbfb76e6lm3hpe + tests/test_stub.py: bafybeihu2smaadptjzzbrkrv4bae2l4bmd6ozidetlwrmnas2az7tgbqy4 fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index 316c79c9d0..ef8530a489 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -17,7 +17,7 @@ fingerprint: migrations/1_initial_migration.js: bafybeigzg7dadlq7sepncquzoo5hgs7q2pwvbhzilolgkjkr3jacb2owvy migrations/2_deploy_contracts.js: bafybeihnzburnurq4gvp4rj36b57uzrlgif5y73ggyu3rfc3iot4e5zppy tests/__init__.py: bafybeidgqgy32gwubf3eu7ijc7ddq4bm675oxyfqevm5j2ew2zcu4p6tm4 - tests/test_contract.py: bafybeidclhiufk2cuqaqtabis3c6picwqsj5qumwfdh26a3jl65qi5ki3m + tests/test_contract.py: bafybeifpwwwzr6tomoubi7f5dvfzbwdnn4jught26uda2i4mexqkpqplwm fingerprint_ignore_patterns: [] class_name: ERC1155Contract contract_interface_paths: diff --git a/packages/fetchai/protocols/default/protocol.yaml b/packages/fetchai/protocols/default/protocol.yaml index cbc269a779..7faa68968c 100644 --- a/packages/fetchai/protocols/default/protocol.yaml +++ b/packages/fetchai/protocols/default/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: dialogues.py: bafybeihzqqwczdvfzskslup72mpmzumic7irvgz274olbuqbdjm3hdnj4q message.py: bafybeigryznjuxefo5htam6xrrn7e6hfkki7h2sbaaxg22omcp4mhb7bf4 serialization.py: bafybeiefqupq73s7eczkga2t5yd622owcm6elj7fa4fm5hq236j3avwhpy - tests/test_default.py: bafybeifczqdqn6zj5qci2dv4oukkoaak5cxux6jvo73td3tcnxnprjw4ry + tests/test_default.py: bafybeifs7l25vsssonkusml5eveuihxbxrbm3t6boidyny33tyvf2q4kky fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/default/tests/test_default.py b/packages/fetchai/protocols/default/tests/test_default.py index faac2bd409..df327d71a0 100644 --- a/packages/fetchai/protocols/default/tests/test_default.py +++ b/packages/fetchai/protocols/default/tests/test_default.py @@ -171,8 +171,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ BaseDefaultDialogue.__init__( self, @@ -190,7 +189,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml index 85d4c4f081..762d800f19 100644 --- a/packages/fetchai/protocols/fipa/protocol.yaml +++ b/packages/fetchai/protocols/fipa/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: fipa_pb2.py: bafybeicgs4xb5aggw7pv5szdcp7jjdvii3hec3savyt2amsjkfjkd4ywja message.py: bafybeib2wjkf5ku5oomvti2mxved4qceqsw4e2p3hb4vlafz6zvfvgseou serialization.py: bafybeift53kcwwj77jkpk2tqfqg3wkwyo7ok3ceywrevg76mpbstxq4gpi - tests/test_fipa.py: bafybeicnbveyjrewnlczb4t5o3eqzjl7k54qt4pwucewkzxanw5m5ulfl4 + tests/test_fipa.py: bafybeid2gffgppkxmttvruejcksfixmcpzdvr7m2j2ee2xyb5h7x6priv4 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/fipa/tests/test_fipa.py b/packages/fetchai/protocols/fipa/tests/test_fipa.py index 1ca1b4407f..6a9aeb249a 100644 --- a/packages/fetchai/protocols/fipa/tests/test_fipa.py +++ b/packages/fetchai/protocols/fipa/tests/test_fipa.py @@ -762,8 +762,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ FipaDialogue.__init__( self, @@ -781,7 +780,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument @@ -821,8 +820,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ FipaDialogue.__init__( self, @@ -841,7 +839,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml index 5ec483f1b9..794dd2c8d7 100644 --- a/packages/fetchai/protocols/gym/protocol.yaml +++ b/packages/fetchai/protocols/gym/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: gym_pb2.py: bafybeihpz5o5kus64bsz7rextgizhqhaqidtxgnq7ijhhta5hnyfvlh6re message.py: bafybeidutr4rssoui26znxgbhkxsjpqx7mrdiryvjpnbm7ls6vtrbz3jim serialization.py: bafybeiabjo2b3y7jy6jlo4qt7fhhnkz2ge7bjvej4mfapxgfyehjp6pera - tests/test_gym.py: bafybeibxerpuzjkjbba7yxmypxvu2z3gxfbanake27okc3qyz6d57exowi + tests/test_gym.py: bafybeievexfgco6qehodpkx5xmrpt2dhvqye6eybr2uro54erwkmj4lshe fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/gym/tests/test_gym.py b/packages/fetchai/protocols/gym/tests/test_gym.py index 31bb8062d7..aaf4226c22 100644 --- a/packages/fetchai/protocols/gym/tests/test_gym.py +++ b/packages/fetchai/protocols/gym/tests/test_gym.py @@ -323,8 +323,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ GymDialogue.__init__( self, @@ -342,7 +341,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument @@ -380,8 +379,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ GymDialogue.__init__( self, @@ -399,7 +397,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml index 8ebc2d641c..5d727fde4c 100644 --- a/packages/fetchai/protocols/http/protocol.yaml +++ b/packages/fetchai/protocols/http/protocol.yaml @@ -14,7 +14,7 @@ fingerprint: http_pb2.py: bafybeihox5yofjmegpwlbh4gmk5hb5bw6btjgdtvzuthio4km4j2axpbd4 message.py: bafybeicinzlrgvhjb3wjegef2nars2dtlqlts3zg4jgk443dsm5jlhjz5q serialization.py: bafybeiekyjreps7iqgmsxzgvlf55kqnhgzt3pvh7qtytmi2o2sui2ulrum - tests/test_http.py: bafybeie57rfgtytqttcsmyaq2iqfo2ao4iu6ixkdf5gc447v2pszx6jjvi + tests/test_http.py: bafybeibhrcnrlr44znjxol7hcwzha2q3bz2yftwq2hjfencxzcmnr3wxe4 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/http/tests/test_http.py b/packages/fetchai/protocols/http/tests/test_http.py index c2f499d1b8..7134cff0ab 100644 --- a/packages/fetchai/protocols/http/tests/test_http.py +++ b/packages/fetchai/protocols/http/tests/test_http.py @@ -223,8 +223,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ HttpDialogue.__init__( self, @@ -242,7 +241,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument @@ -280,8 +279,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ HttpDialogue.__init__( self, @@ -299,7 +297,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml index 8603157f23..ce334a058f 100644 --- a/packages/fetchai/protocols/ledger_api/protocol.yaml +++ b/packages/fetchai/protocols/ledger_api/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: ledger_api_pb2.py: bafybeigshvrwgmug3c6dhqxzxkuzyaxjizaogvb7zo2nzqfqiw4mgvq6by message.py: bafybeicl3lsm2c7o4yxvm3k3jhi6nksjr3b7kvrrdpp2hbndxh5rxebjyq serialization.py: bafybeicwffv5vih2hzs5d6vws5j6egofycidmi4gos2brnmgn3ohydaxvq - tests/test_ledger_api.py: bafybeibxi4sjvscaxnve22nv775snhtr35kwz7jjszoer7rsjuzkb2dcfe + tests/test_ledger_api.py: bafybeicdsjkd3skppypbfe3dacsihregyd2al7s2vclnfpxhkawzoky6zm fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py index d50d92339c..899e9a6232 100644 --- a/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py +++ b/packages/fetchai/protocols/ledger_api/tests/test_ledger_api.py @@ -570,8 +570,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ LedgerApiDialogue.__init__( self, @@ -589,7 +588,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument @@ -627,8 +626,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ LedgerApiDialogue.__init__( self, @@ -646,7 +644,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml index 02643c9672..6d56df3e2e 100644 --- a/packages/fetchai/protocols/oef_search/protocol.yaml +++ b/packages/fetchai/protocols/oef_search/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: oef_search.proto: bafybeifvmxnxg4cuxkj64iqeifyv7jl4ihxgsope7p4j74yotedboai7jm oef_search_pb2.py: bafybeibzoqlyihqvgvvpz2bbjekf547n6j677ufw3hy2eqlyhedcuqqbjm serialization.py: bafybeiavvusik7aycfaqsuign5hpqfq5bgw5vwimpeqxtgymbuokvdd5f4 - tests/test_oef_search.py: bafybeifwsm3dct5p7m7zesmfvcxkph4jt2vmjtjg2zfv4mjwb4qf65vbje + tests/test_oef_search.py: bafybeiamsakwbk3ktp3yg4tjarrklv2d54tfizul4v3qeytyglmr5xbq5y fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py index 5189c73a3e..651bedfc87 100644 --- a/packages/fetchai/protocols/oef_search/tests/test_oef_search.py +++ b/packages/fetchai/protocols/oef_search/tests/test_oef_search.py @@ -391,8 +391,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ OefSearchDialogue.__init__( self, @@ -410,7 +409,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument @@ -448,8 +447,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ OefSearchDialogue.__init__( self, @@ -467,7 +465,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogue is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/state_update/protocol.yaml b/packages/fetchai/protocols/state_update/protocol.yaml index afdf7c9ed9..b98f336768 100644 --- a/packages/fetchai/protocols/state_update/protocol.yaml +++ b/packages/fetchai/protocols/state_update/protocol.yaml @@ -14,7 +14,7 @@ fingerprint: serialization.py: bafybeiffesod4s4s6hxrgrh4ylbo7jxos752ix5khlzodwujahk34ouaem state_update.proto: bafybeiawlpcxmdojiwekzptaonfkubyxlwpblcgvkrzgle4lihs5ykmnvm state_update_pb2.py: bafybeihehsm5uvve3i63igdk5efg3t6aao65jftllrgm5l5gdkr7sj34ce - tests/test_state_update.py: bafybeiedtd4d5jzxeavhq733dhds3dskb2ojgbjjmmjsf7hzs5v7grqpki + tests/test_state_update.py: bafybeidyzncjdg6br3765cl4b4svgdt4hja7vlbtoqj4b6j7tjvlqyzaxy fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/state_update/tests/test_state_update.py b/packages/fetchai/protocols/state_update/tests/test_state_update.py index a1a0f398d8..6e5b73396c 100644 --- a/packages/fetchai/protocols/state_update/tests/test_state_update.py +++ b/packages/fetchai/protocols/state_update/tests/test_state_update.py @@ -192,8 +192,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ BaseStateUpdateDialogue.__init__( self, @@ -211,7 +210,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: self address """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml index 1a63d1a1da..8c01469cf6 100644 --- a/packages/fetchai/protocols/tac/protocol.yaml +++ b/packages/fetchai/protocols/tac/protocol.yaml @@ -16,7 +16,7 @@ fingerprint: serialization.py: bafybeifv24cywhafg5db6mmqxc3fz3jmt7bjg4jsaioeivqkvv2ra7rimq tac.proto: bafybeicqiktmsp2ud7zbddsovubo4cd6jtgqwdpm3dwegvf7xhlc3culmq tac_pb2.py: bafybeiduhujxst63ocjj4nh2pddbxqyqbpibmcvrx2xkqubo3dj247gqoa - tests/test_tac.py: bafybeiaagu3dlqdm57zp7uzuw2abg4qwb42g2nlpqip5lq2o2tndswi37u + tests/test_tac.py: bafybeiggwid7zlqwo53aefsdnddyqvdcia7ndtcuapqpxtssvbor7fnou4 fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/tac/tests/test_tac.py b/packages/fetchai/protocols/tac/tests/test_tac.py index d84a4245ba..97fec595e0 100644 --- a/packages/fetchai/protocols/tac/tests/test_tac.py +++ b/packages/fetchai/protocols/tac/tests/test_tac.py @@ -475,8 +475,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ TacDialogue.__init__( self, @@ -494,7 +493,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues """ def role_from_first_message( # pylint: disable=unused-argument @@ -532,8 +531,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ TacDialogue.__init__( self, @@ -551,7 +549,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index d310a9badf..334a756388 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy skills: [] behaviours: echo: diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index d321226ccd..544c4a8fd1 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -21,16 +21,16 @@ fingerprint: tests/test_strategy.py: bafybeic3zyvuaaqtfpdsgkfqlkyn2ftzlkmxs2cgfw5ub4qylnbguk7rbq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu contracts: -- fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu +- fetchai/erc1155:0.22.0:bafybeihdibjr5tthaamqlmgjnslshcy4nhjp7oonjfbi6dwzc2oj5qkguy protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca +- fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 +- fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: [] behaviours: search: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 1ac6abae34..4460319352 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -21,16 +21,16 @@ fingerprint: tests/test_strategy.py: bafybeihjb32d5x7qzilodj6coe7x3hox2bmzh5zcmhanwxpvsn44vf6nu4 fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu contracts: -- fetchai/erc1155:0.22.0:bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu +- fetchai/erc1155:0.22.0:bafybeihdibjr5tthaamqlmgjnslshcy4nhjp7oonjfbi6dwzc2oj5qkguy protocols: - fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca +- fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 +- fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/error/skill.yaml b/packages/fetchai/skills/error/skill.yaml index 8ddeeb8412..34367769e1 100644 --- a/packages/fetchai/skills/error/skill.yaml +++ b/packages/fetchai/skills/error/skill.yaml @@ -13,7 +13,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml index 35f992f64b..e1a28dce0a 100644 --- a/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml +++ b/packages/fetchai/skills/fipa_dummy_buyer/skill.yaml @@ -15,7 +15,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i +- fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca skills: [] behaviours: initializer: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index c150ffc6f4..109084008f 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -19,14 +19,14 @@ fingerprint: tests/test_models.py: bafybeia3a3wtmmjxqn4qspbrluaypql262xne3n4t7qdyjsn3bkfsq4cxq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca +- fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 +- fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: [] behaviours: search: diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 0cacaf3fde..4adf6f86d1 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -20,13 +20,13 @@ fingerprint: tests/test_models.py: bafybeicea7y22x23k77afs5qe4iokhxfnzw6fakhhlxcrvrbw2pnmrzimq fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je +- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/fipa:1.0.0:bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -- fetchai/ledger_api:1.0.0:bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -- fetchai/oef_search:1.0.0:bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca +- fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 +- fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 714428c950..3789472943 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -23,11 +23,11 @@ fingerprint: tests/test_task.py: bafybeifwk6oi2ilsbm435ncjynli5iskvuwgwilivzugz67njryotz5kum fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +- fetchai/gym:0.19.0:bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/gym:1.0.0:bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi skills: [] behaviours: {} handlers: diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 468d231390..cb7dceecf0 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -13,13 +13,13 @@ fingerprint: handlers.py: bafybeidxvskxngwlhdnxs2xwr54vch2wjks2l5gqtgr5t5bc2izpjfr3ti tests/__init__.py: bafybeigqjv34vhfwcxmri75l5opezgu66jsyjj7metj7lgk2jbx4rqztyy tests/test_dialogues.py: bafybeib4xlhm5wttmtysti4dl7alfzbu44yepckdvzlaymhqvbh33mphc4 - tests/test_handlers.py: bafybeih6js2bmvbv3pfnfpsf5bzayzje33gveti43nfsgdzqil46qazfkq + tests/test_handlers.py: bafybeiczxf7u22cqzghdpw3uttl3h5g2n3hp4pbv5oien6kxhduoqnm3bi fingerprint_ignore_patterns: [] connections: [] contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/http:1.0.0:bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq skills: [] behaviours: {} handlers: diff --git a/packages/hashes.csv b/packages/hashes.csv index 24bebf7c25..eb1be14e1e 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,43 +1,43 @@ -fetchai/agents/error_test,bafybeibaadvuqyyhgzvuvvdujahs4srchci5dguamslwgtohy74ik6uy7e -fetchai/agents/gym_aea,bafybeid4qhwnuhpk34jvrss6hzp2nbmespkgmey4z2hfr43uuj6w4sgufa -fetchai/agents/my_first_aea,bafybeihqrio6rmj5dolw4agfo4jgkzkjcnx5qnecuiv3hvl67dlb2aqspm -fetchai/connections/gym,bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 -fetchai/connections/http_client,bafybeicb5ckt7xyyxk7djguraloe6qm4m7nayujjjjdpirivpcvdb3b6km -fetchai/connections/http_server,bafybeib2xtqle4gjxik27xsrvotv2t6iqqwrgbspjlbbntwee3nssb5wyy -fetchai/connections/ledger,bafybeihomyc2roojykk7gycdiws66kxoltgw33qehamagonhy2bcln32je -fetchai/connections/local,bafybeibnwhom4vyb47z6msnnh336cydvzta5xifbgi7vllbv5ccrjkhnju -fetchai/connections/stub,bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy -fetchai/contracts/erc1155,bafybeidd7ynxij7husk7klenprf37mgdq34sfuuhujhof3bnkm7vflkaeu +fetchai/agents/error_test,bafybeid7bscl55pa23hxashd5w63k7bmuqs2bbwrrwxzpqj4qhtcdnvjxy +fetchai/agents/gym_aea,bafybeicj6mhhpa2w4pgxv4d5z7sh3ioqnfgzhmflhjhkd5hllduplhhnqm +fetchai/agents/my_first_aea,bafybeicgzz4qikxgwmfpsbkikkfj4wtuvofsabgtyygbn3ysjazvgek2ma +fetchai/connections/gym,bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq +fetchai/connections/http_client,bafybeie54wumi37bnfrw2r56k47clgqxzld2utd25u64ttdutcur66aanm +fetchai/connections/http_server,bafybeic75e2m2sjczfleblza52qah5f6qrwsxtgn3jhxet7xhrf5qzx73i +fetchai/connections/ledger,bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu +fetchai/connections/local,bafybeifbypog54zkoaie6n4wjqpof4tc6trrf4uqvdmnpuyplzslarknpe +fetchai/connections/stub,bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 +fetchai/contracts/erc1155,bafybeihdibjr5tthaamqlmgjnslshcy4nhjp7oonjfbi6dwzc2oj5qkguy fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 -fetchai/protocols/default,bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -fetchai/protocols/fipa,bafybeifgvm2qimqhf2hf7x2adfv77jdsxuwonenylo7i32go3jajvjul3i -fetchai/protocols/gym,bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a -fetchai/protocols/http,bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky -fetchai/protocols/ledger_api,bafybeihn3eyguhzg6do56yuphnvd5s3c2w6i7hpucoief4gbiktthhof2u -fetchai/protocols/oef_search,bafybeiejahlo2jekhz4wqppag6wzawq54bpc3wjumlzz4rmuri4aga7cjy -fetchai/protocols/state_update,bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -fetchai/protocols/tac,bafybeicpyc26jkkw73nm23llmywiew32moztazzbz3smcdze2cmlkq4kee -fetchai/skills/echo,bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre -fetchai/skills/erc1155_client,bafybeifmialtp4qwzusa7ohhdcg62ai7l3b6l65posq2olw2bq6gnwgjly -fetchai/skills/erc1155_deploy,bafybeihgkstvulxrdrbqkdqq5e3jlhpyt45264q5jey7qgo6agohbvtmca -fetchai/skills/error,bafybeidxuxq32xopdw73b2xr7ufgbytkjettfzknupgr5gt4fnd7lbarjy +fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +fetchai/protocols/fipa,bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca +fetchai/protocols/gym,bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi +fetchai/protocols/http,bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq +fetchai/protocols/ledger_api,bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 +fetchai/protocols/oef_search,bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq +fetchai/protocols/state_update,bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu +fetchai/protocols/tac,bafybeiawv2dhrr4yao5z3nonw6a2qcnygdulzocbpxy63tykpzdy547iiy +fetchai/skills/echo,bafybeia6sgw3ppjl4y5hg5ha6mfqlo3hkvq7vkhonr3s4oubs2fow5ccyi +fetchai/skills/erc1155_client,bafybeihvy4vntio77pombeykzk3spgfkrqtuvk3mhavu3bfyxhoxfvcdji +fetchai/skills/erc1155_deploy,bafybeif3gfxopwvblrcjkvisacbaqkfpu56ujtyk2zybslyllktc2aj5fe +fetchai/skills/error,bafybeiakq3bepacafpzmalnec3cdb6r4tchaocfjk54sg5q7t3qu2ggcbu fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu -fetchai/skills/fipa_dummy_buyer,bafybeialocgbh25dnwrmgo5xofc5kn5skxwzurfgepmklz6ze3mujddase -fetchai/skills/generic_buyer,bafybeicnclpmi2mstrbj4domzubjjukakzu4qplwrisbggi5ye5semylum -fetchai/skills/generic_seller,bafybeielnpl223fgch3vjpliu5xcvakmuk27ej7k473rzyzwhwaenkkf7a -fetchai/skills/gym,bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba -fetchai/skills/http_echo,bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim +fetchai/skills/fipa_dummy_buyer,bafybeiawrtj27x3b5c4hjwyyfmm2jcji5blqzco7a4j6iof5sozppvigzu +fetchai/skills/generic_buyer,bafybeige2fqxoz4z7i3o7rfw2sfuv7ifdkjzp3smt34b5kci3cpip4zhxa +fetchai/skills/generic_seller,bafybeiabvyt4ftcxu25f66aqkgtxuxnebddd73mkqmseosocu6xu2vpsym +fetchai/skills/gym,bafybeibendxox7npijbsfqju74ptfl6y5b6s3ieufhiqzo44etveb6f5fq +fetchai/skills/http_echo,bafybeibk72ubyddpro426adfu5zqywy66es6qpsfvrklzovtmue5cvq7yy fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeigsiufi67imext4dejq76yloqvzpagcc2cp6eunsysgul4ugv2xk4 -open_aea/agents/http_echo,bafybeib4hxhkee6vgbvmnwmk4fjql2fdqhmke6mz7mo3x54j6lht6duvze -open_aea/agents/my_first_aea,bafybeic245xjddl3zyvpj5uuwtaqdmhsws6rasb2kdo6ip6e54fhnz2dvy +open_aea/agents/gym_aea,bafybeihpxqqsl22nbepfu6erfpb6rglcx756r6mxcn3bt2vh3cqhwcvztm +open_aea/agents/http_echo,bafybeigcrzzf43awj654puejjiir67pfec43h52dootqq4cxytb5lkvw4i +open_aea/agents/my_first_aea,bafybeibyrncegtdkyrdk7thwwedhzzbfd47alferuacswo5suu6mhorufe open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze -open_aea/protocols/signing,bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +open_aea/protocols/signing,bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re open_aea/skills/scaffold,bafybeih3h7yia76rrbittnoeotpraiuho5rdqsnksuvncinaa3akgmnbaa valory/connections/p2p_libp2p,bafybeigmjwjggrxsjjl6mekzds2lmgi6dpj32hwa5giz6fub5vh7ukuvsu valory/connections/p2p_libp2p_client,bafybeif7plocy4y6bvhtb3bob3onsyt6lycyjzcdfk5ze72qa2xwqb4yji valory/connections/p2p_libp2p_mailbox,bafybeie6mbdudc6iryro6pxjxsbkx2xnmexvthb7rwkum2pt6tv4n26aey valory/protocols/acn,bafybeif7dt6cwbixufftupr2srfuzg2w2vgevtqdxwq3z25yab3ptpkyqq -valory/protocols/tendermint,bafybeiacnsydypoa2kxxdcbqdxyfafqtwrg7mzkzcu7is4b7weqb6qilge +valory/protocols/tendermint,bafybeidbdvqgrr2lbstyqbyb24kxhen6xnv65e3zqg7xj6fwrogrzms2ty diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 4b76defdce..ed9f462d92 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeidd3izmj4lt4uflvqpl5v47bdo625w4phekdxe6z26mwtqsju3bk4 +- fetchai/gym:0.19.0:bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/gym:1.0.0:bafybeid3peikgfjhkd3yj62ldakrkt5v5jhcbw3fdgfwzmaomo3jzqhw6a -- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/gym:1.0.0:bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi +- fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: -- fetchai/gym:0.20.0:bafybeihhodqhrswfsnnieobw74gbf66pbpk4pw5vfktx6d4oohhiudowba +- fetchai/gym:0.20.0:bafybeibendxox7npijbsfqju74ptfl6y5b6s3ieufhiqzo44etveb6f5fq default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index 5aef0a4f83..c49ac87e09 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeib2xtqle4gjxik27xsrvotv2t6iqqwrgbspjlbbntwee3nssb5wyy +- fetchai/http_server:0.22.0:bafybeic75e2m2sjczfleblza52qah5f6qrwsxtgn3jhxet7xhrf5qzx73i contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/http:1.0.0:bafybeihcrvzou3ycxtj6aybd5mcnp3qwowxirh4srwmohfmnddwmgzymky -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/http:1.0.0:bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: -- fetchai/http_echo:0.20.0:bafybeihws5lhjw5g45hwwomt4nvoymyrkumw5nyegus6qtxo5cym4jnkim +- fetchai/http_echo:0.20.0:bafybeibk72ubyddpro426adfu5zqywy66es6qpsfvrklzovtmue5cvq7yy default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 2d09a7cb43..8a8c17801c 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeigqjxaetz7uhnki4xjlhqfwowokdn263exkaaagonub6pzh62x6gy +- fetchai/stub:0.21.0:bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 contracts: [] protocols: -- fetchai/default:1.0.0:bafybeifa7gnanyzkmb76y2xdyiinhygwvcdht7hmirfurx6gp4jx5xeshy -- fetchai/state_update:1.0.0:bafybeicd7te4idd5rudfwwaj3x4itwxa3lwa55zt7xpjdum62qv24uxz3m -- open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui +- fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy +- fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu +- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re skills: -- fetchai/echo:0.19.0:bafybeib2a7mbwntuhjanuwslfolfl3usjlvpfesawxnmkvuu4mamlthbre +- fetchai/echo:0.19.0:bafybeia6sgw3ppjl4y5hg5ha6mfqlo3hkvq7vkhonr3s4oubs2fow5ccyi default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: diff --git a/packages/open_aea/protocols/signing/protocol.yaml b/packages/open_aea/protocols/signing/protocol.yaml index 974199a295..54b135e7bb 100644 --- a/packages/open_aea/protocols/signing/protocol.yaml +++ b/packages/open_aea/protocols/signing/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: serialization.py: bafybeibxnsemtwyhyb4ztw453ojwzcwjrqth6ozvififmlszqrxsvui5i4 signing.proto: bafybeigbzr6x5wdmqzc7eanlz5xmvaoiwb4kwozgg3cugq63b7esicusra signing_pb2.py: bafybeihph4sio6j7s773dbzc46qrt7hyepxo6banh3c3arwuafoekuaddy - tests/test_signing.py: bafybeiaxcq4iftb3hnvbspcjorxzyfpexbzsel5xkszdhx3fdutqcuodh4 + tests/test_signing.py: bafybeihshq34fct35lkq3qoaozihbqd34dypoynndphgqkewu5idi4w4mu fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/open_aea/protocols/signing/tests/test_signing.py b/packages/open_aea/protocols/signing/tests/test_signing.py index 61d28ea04b..cb0a9807de 100644 --- a/packages/open_aea/protocols/signing/tests/test_signing.py +++ b/packages/open_aea/protocols/signing/tests/test_signing.py @@ -196,8 +196,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ BaseSigningDialogue.__init__( self, @@ -215,7 +214,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity for whom this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py index 2569851d90..5b6c95fda7 100644 --- a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py @@ -61,6 +61,7 @@ def __init__( :param client: the Docker client. :param addr: the address. :param port: the port. + :param tag: the tag :param config: optional configuration to command line. """ super().__init__(client) diff --git a/scripts/whitelist.py b/scripts/whitelist.py index 7b19cea47c..b7b6051510 100644 --- a/scripts/whitelist.py +++ b/scripts/whitelist.py @@ -310,7 +310,7 @@ UNKNOWN_PROTOCOL_PUBLIC_ID # unused variable (aea/test_tools/constants.py:28) UNKNOWN_CONNECTION_PUBLIC_ID # unused variable (aea/test_tools/constants.py:29) _client # unused attribute (aea/test_tools/docker_image.py:51) -sleep_rate # unused variable (aea/test_tools/docker_image.py:107) +sleep_rate # unused variable (aea/test_tools/docker_image.py:107) AnyStringWith # unused class (aea/test_tools/mocks.py:29) RegexComparator # unused class (aea/test_tools/mocks.py:41) ctx_mock_Popen # unused function (aea/test_tools/mocks.py:55) diff --git a/setup.cfg b/setup.cfg index aade6db38f..a161719a7b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,6 +56,9 @@ sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER python_version = 3.7 strict_optional = True +# temporary until fixed +exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py + # Before adding a module here, make sure it does not support type hints # Per-module options for aea dir: diff --git a/tests/test_aea.py b/tests/test_aea.py index 1621f73c2b..740c08f81f 100644 --- a/tests/test_aea.py +++ b/tests/test_aea.py @@ -29,6 +29,7 @@ from unittest.mock import MagicMock, PropertyMock, patch import pytest +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_PATH import aea # noqa: F401 from aea.aea import AEA @@ -45,6 +46,7 @@ from aea.registries.resources import Resources from aea.runtime import RuntimeStates from aea.skills.base import Skill, SkillContext +from aea.test_tools.constants import UNKNOWN_PROTOCOL_PUBLIC_ID from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection from packages.fetchai.protocols.default.message import DefaultMessage @@ -59,13 +61,7 @@ timeit_context, wait_for_condition, ) -from tests.conftest import ( - CUR_PATH, - FETCHAI_PRIVATE_KEY_PATH, - ROOT_DIR, - UNKNOWN_PROTOCOL_PUBLIC_ID, - _make_local_connection, -) +from tests.conftest import CUR_PATH, ROOT_DIR, _make_local_connection from tests.data.dummy_aea.skills.dummy.tasks import DummyTask # type: ignore from tests.data.dummy_skill import PUBLIC_ID as DUMMY_SKILL_PUBLIC_ID from tests.data.dummy_skill.behaviours import DummyBehaviour # type: ignore diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py index 1f0a086284..d7b5fdee60 100644 --- a/tests/test_aea_builder.py +++ b/tests/test_aea_builder.py @@ -60,6 +60,7 @@ from aea.protocols.base import Protocol from aea.registries.resources import Resources from aea.skills.base import Skill +from aea.test_tools.mocks import RegexComparator from aea.test_tools.test_cases import AEATestCase, AEATestCaseEmpty, BaseAEATestCase from packages.fetchai.connections.http_server.connection import ( @@ -69,7 +70,6 @@ from packages.fetchai.protocols.default import DefaultMessage from packages.fetchai.protocols.http.message import HttpMessage -from tests.common.mocks import RegexComparator from tests.conftest import ( CUR_PATH, DEFAULT_PRIVATE_KEY_PATH, diff --git a/tests/test_cli/test_add_key.py b/tests/test_cli/test_add_key.py index 058bfbfa62..9dd7bcb193 100644 --- a/tests/test_cli/test_add_key.py +++ b/tests/test_cli/test_add_key.py @@ -27,7 +27,9 @@ import pytest import yaml from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_FILE from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_FILE from click.exceptions import BadParameter import aea @@ -36,15 +38,7 @@ from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE from aea.test_tools.test_cases import AEATestCaseEmpty -from tests.conftest import ( - AUTHOR, - CLI_LOG_OPTION, - CUR_PATH, - CliRunner, - ETHEREUM_PRIVATE_KEY_FILE, - FETCHAI_PRIVATE_KEY_FILE, - ROOT_DIR, -) +from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner, ROOT_DIR from tests.test_cli.tools_for_testing import ContextMock diff --git a/tests/test_cli/test_generate_key.py b/tests/test_cli/test_generate_key.py index 5845baa120..cce9ca7f7a 100644 --- a/tests/test_cli/test_generate_key.py +++ b/tests/test_cli/test_generate_key.py @@ -26,19 +26,16 @@ from pathlib import Path from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_FILE from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_FILE from aea.cli import cli from aea.crypto.registries import make_crypto from aea.helpers.sym_link import cd from aea.test_tools.test_cases import AEATestCaseEmpty -from tests.conftest import ( - CLI_LOG_OPTION, - CliRunner, - ETHEREUM_PRIVATE_KEY_FILE, - FETCHAI_PRIVATE_KEY_FILE, -) +from tests.conftest import CLI_LOG_OPTION, CliRunner class TestGenerateKey: diff --git a/tests/test_cli/test_issue_certificates.py b/tests/test_cli/test_issue_certificates.py index 834f1e95c2..f6c97b70d3 100644 --- a/tests/test_cli/test_issue_certificates.py +++ b/tests/test_cli/test_issue_certificates.py @@ -26,14 +26,16 @@ import pytest from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_FILE from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_FILE from aea.cli.utils.config import dump_item_config from aea.configurations.constants import PRIVATE_KEY_PATH_SCHEMA from aea.helpers.base import CertRequest from aea.test_tools.test_cases import AEATestCaseEmpty, _get_password_option_args -from tests.conftest import CUR_PATH, ETHEREUM_PRIVATE_KEY_FILE, FETCHAI_PRIVATE_KEY_FILE +from tests.conftest import CUR_PATH from tests.data.dummy_connection.connection import DummyConnection diff --git a/tests/test_cli/test_run.py b/tests/test_cli/test_run.py index 79e39d5464..69e02d2dec 100644 --- a/tests/test_cli/test_run.py +++ b/tests/test_cli/test_run.py @@ -32,6 +32,7 @@ import pytest import yaml from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_FILE from click import ClickException from pexpect.exceptions import EOF # type: ignore @@ -54,14 +55,7 @@ from packages.fetchai.protocols.fipa.message import FipaMessage from tests.common.pexpect_popen import PexpectWrapper -from tests.conftest import ( - AUTHOR, - CLI_LOG_OPTION, - CliRunner, - FETCHAI_PRIVATE_KEY_FILE, - MAX_FLAKY_RERUNS, - ROOT_DIR, -) +from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS, ROOT_DIR @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS) diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py index fe95874217..395fdbee94 100644 --- a/tests/test_cli/test_test.py +++ b/tests/test_cli/test_test.py @@ -24,7 +24,7 @@ from copy import copy from pathlib import Path from textwrap import dedent -from typing import Any, Sequence, Type +from typing import Any, Generator, Sequence, Type from unittest import mock import click.testing @@ -85,7 +85,7 @@ def fun(args) -> int: @pytest.fixture(scope="function") -def mock_sys_modules() -> None: +def mock_sys_modules() -> Generator: """Store previous content of sys.modules and restore it after test execution.""" old_sys_modules = copy(sys.modules) yield diff --git a/tests/test_contracts/test_base.py b/tests/test_contracts/test_base.py index d8fcca8a67..8611f77df3 100644 --- a/tests/test_contracts/test_base.py +++ b/tests/test_contracts/test_base.py @@ -29,6 +29,7 @@ import pytest import web3 from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_TESTNET_CONFIG from aea_ledger_fetchai import FetchAICrypto from aea.configurations.base import ComponentType, ContractConfig @@ -40,7 +41,7 @@ from aea.crypto.registries import crypto_registry, ledger_apis_registry from aea.exceptions import AEAComponentLoadException -from tests.conftest import ETHEREUM_TESTNET_CONFIG, ROOT_DIR, make_uri +from tests.conftest import ROOT_DIR, make_uri logger = logging.getLogger(__name__) diff --git a/tests/test_crypto/test_helpers.py b/tests/test_crypto/test_helpers.py index 59b2f4e973..ee8e89abea 100644 --- a/tests/test_crypto/test_helpers.py +++ b/tests/test_crypto/test_helpers.py @@ -27,7 +27,12 @@ import pytest from aea_ledger_cosmos import CosmosCrypto from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ( + ETHEREUM_PRIVATE_KEY_FILE, + ETHEREUM_PRIVATE_KEY_PATH, +) from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_PATH from aea.crypto.helpers import ( create_private_key, @@ -39,13 +44,7 @@ ) from aea.crypto.wallet import Wallet -from tests.conftest import ( - COSMOS_PRIVATE_KEY_FILE, - CUR_PATH, - ETHEREUM_PRIVATE_KEY_FILE, - ETHEREUM_PRIVATE_KEY_PATH, - FETCHAI_PRIVATE_KEY_PATH, -) +from tests.conftest import COSMOS_PRIVATE_KEY_FILE, CUR_PATH from tests.test_cli.tools_for_testing import AgentConfigMock diff --git a/tests/test_crypto/test_ledger_apis.py b/tests/test_crypto/test_ledger_apis.py index 62efd285c6..b30c1f4216 100644 --- a/tests/test_crypto/test_ledger_apis.py +++ b/tests/test_crypto/test_ledger_apis.py @@ -26,13 +26,15 @@ import pytest from aea_ledger_cosmos import CosmosCrypto from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_ADDRESS_ONE from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_ADDRESS_ONE from aea.configurations.constants import DEFAULT_LEDGER from aea.crypto.ledger_apis import LedgerApis from aea.exceptions import AEAEnforceError -from tests.conftest import COSMOS_ADDRESS_ONE, ETHEREUM_ADDRESS_ONE, FETCHAI_ADDRESS_ONE +from tests.conftest import COSMOS_ADDRESS_ONE logger = logging.getLogger(__name__) diff --git a/tests/test_crypto/test_registry/test_ledger_api_registry.py b/tests/test_crypto/test_registry/test_ledger_api_registry.py index 28c52960d6..c5140871bc 100644 --- a/tests/test_crypto/test_registry/test_ledger_api_registry.py +++ b/tests/test_crypto/test_registry/test_ledger_api_registry.py @@ -24,17 +24,18 @@ import pytest from aea_ledger_ethereum import EthereumCrypto -from aea_ledger_fetchai import FetchAICrypto - -import aea.crypto - -from tests.conftest import ( +from aea_ledger_ethereum.test_tools.constants import ( ETHEREUM_ADDRESS_ONE, ETHEREUM_TESTNET_CONFIG, +) +from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import ( FETCHAI_ADDRESS_ONE, FETCHAI_TESTNET_CONFIG, ) +import aea.crypto + logger = logging.getLogger(__name__) diff --git a/tests/test_crypto/test_wallet.py b/tests/test_crypto/test_wallet.py index abe4bec4d7..917fd868ef 100644 --- a/tests/test_crypto/test_wallet.py +++ b/tests/test_crypto/test_wallet.py @@ -25,16 +25,14 @@ import pytest from aea_ledger_cosmos import CosmosCrypto from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_PATH from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_PATH from aea.crypto.wallet import Wallet from aea.exceptions import AEAException -from tests.conftest import ( - COSMOS_PRIVATE_KEY_PATH, - ETHEREUM_PRIVATE_KEY_PATH, - FETCHAI_PRIVATE_KEY_PATH, -) +from tests.conftest import COSMOS_PRIVATE_KEY_PATH def test_wallet_initialisation_error(): diff --git a/tests/test_decision_maker/test_default.py b/tests/test_decision_maker/test_default.py index 47a1e7ed08..a826d72e63 100644 --- a/tests/test_decision_maker/test_default.py +++ b/tests/test_decision_maker/test_default.py @@ -23,7 +23,12 @@ import pytest from aea_ledger_cosmos import CosmosCrypto from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_PATH from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import ( + FETCHAI_PRIVATE_KEY_PATH, + FETCHAI_TESTNET_CONFIG, +) from aea.configurations.base import PublicId from aea.crypto.registries import make_crypto, make_ledger_api @@ -48,9 +53,6 @@ from tests.conftest import ( COSMOS_PRIVATE_KEY_PATH, - ETHEREUM_PRIVATE_KEY_PATH, - FETCHAI_PRIVATE_KEY_PATH, - FETCHAI_TESTNET_CONFIG, MAX_FLAKY_RERUNS, get_wealth_if_needed, ) diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py index 9536e60e6f..cfaddfaaa9 100644 --- a/tests/test_multiplexer.py +++ b/tests/test_multiplexer.py @@ -43,6 +43,10 @@ from aea.mail.base import AEAConnectionError, Envelope, EnvelopeContext from aea.multiplexer import AsyncMultiplexer, InBox, Multiplexer, OutBox from aea.test_tools.click_testing import CliRunner +from aea.test_tools.constants import ( + UNKNOWN_CONNECTION_PUBLIC_ID, + UNKNOWN_PROTOCOL_PUBLIC_ID, +) from packages.fetchai.connections.local.connection import LocalNode from packages.fetchai.connections.stub.connection import PUBLIC_ID as STUB_CONNECTION_ID @@ -53,8 +57,6 @@ AUTHOR, CLI_LOG_OPTION, ROOT_DIR, - UNKNOWN_CONNECTION_PUBLIC_ID, - UNKNOWN_PROTOCOL_PUBLIC_ID, _make_dummy_connection, _make_local_connection, _make_stub_connection, diff --git a/tests/test_packages/test_connections/test_ledger/test_contract_api.py b/tests/test_packages/test_connections/test_ledger/test_contract_api.py index 68b24b9cda..576e24e4e5 100644 --- a/tests/test_packages/test_connections/test_ledger/test_contract_api.py +++ b/tests/test_packages/test_connections/test_ledger/test_contract_api.py @@ -27,6 +27,7 @@ import pytest from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_ADDRESS_ONE from aea.common import Address from aea.helpers.transaction.base import RawMessage, RawTransaction, State @@ -45,8 +46,6 @@ ) from packages.fetchai.protocols.contract_api.message import ContractApiMessage -from tests.conftest import ETHEREUM_ADDRESS_ONE - SOME_SKILL_ID = "some/skill:0.1.0" diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py index c43ccd68eb..a6636e6b97 100644 --- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py +++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py @@ -27,8 +27,8 @@ import pytest from aea.mail.base import Empty +from aea.test_tools.mocks import RegexComparator -from tests.common.mocks import RegexComparator from tests.conftest import DEFAULT_LEDGER from tests.test_packages.test_connections.test_p2p_libp2p.base import ( BaseP2PLibp2pTest, diff --git a/tests/test_protocols/test_base.py b/tests/test_protocols/test_base.py index fdaf36cb83..17f727d6fe 100644 --- a/tests/test_protocols/test_base.py +++ b/tests/test_protocols/test_base.py @@ -38,6 +38,7 @@ from aea.mail.base_pb2 import Message as ProtobufMessage from aea.protocols.base import Message, Protocol, Serializer from aea.protocols.dialogue.base import Dialogue, DialogueLabel +from aea.test_tools.constants import UNKNOWN_PROTOCOL_PUBLIC_ID from packages.fetchai.protocols.default.dialogues import ( DefaultDialogue, @@ -53,7 +54,7 @@ SigningDialogues, ) -from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID +from tests.conftest import ROOT_DIR def role_from_first_message_dd( diff --git a/tests/test_runner.py b/tests/test_runner.py index 47aa358113..27a7dc2fbe 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -22,6 +22,7 @@ from unittest.mock import call, patch import pytest +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_PATH from aea.aea_builder import AEABuilder from aea.configurations.base import SkillConfig @@ -32,7 +33,6 @@ from aea.skills.base import Skill, SkillContext from tests.common.utils import make_behaviour_cls_from_funcion, wait_for_condition -from tests.conftest import FETCHAI_PRIVATE_KEY_PATH class TestThreadedRunner: diff --git a/tests/test_skills/test_base.py b/tests/test_skills/test_base.py index 02cd53c586..8acc10b64d 100644 --- a/tests/test_skills/test_base.py +++ b/tests/test_skills/test_base.py @@ -29,7 +29,9 @@ import pytest from aea_ledger_ethereum import EthereumCrypto +from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_PATH from aea_ledger_fetchai import FetchAICrypto +from aea_ledger_fetchai.test_tools.constants import FETCHAI_PRIVATE_KEY_PATH import aea from aea.aea import AEA @@ -56,13 +58,7 @@ ) from aea.test_tools.test_cases import BaseAEATestCase -from tests.conftest import ( - CUR_PATH, - ETHEREUM_PRIVATE_KEY_PATH, - FETCHAI_PRIVATE_KEY_PATH, - ROOT_DIR, - _make_dummy_connection, -) +from tests.conftest import CUR_PATH, ROOT_DIR, _make_dummy_connection class BaseTestSkillContext: From f44a557937803a1c3aab6fc5e66466763e8c51d9 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 17:50:07 +0200 Subject: [PATCH 57/93] chore: fix remaining lint errors --- Makefile | 6 +- aea/test_tools/constants.py | 1 + aea/test_tools/docker_image.py | 2 +- docs/agent-vs-aea.md | 4 +- .../test_tools/constants.md | 6 + .../test_tools/docker_images.md | 69 ++++++++ .../test_tools/fixture_helpers.md | 20 +++ .../test_tools/constants.md | 6 + .../test_tools/docker_images.md | 69 ++++++++ .../protocols/signing/tests/test_signing.md | 160 ++++++++++++++++++ docs/api/test_tools/docker_image.md | 103 +++++++++++ docs/api/test_tools/mocks.md | 65 +++++++ docs/api/test_tools/network.md | 26 +++ docs/api/test_tools/utils.md | 19 +++ docs/build-aea-programmatically.md | 2 +- docs/decision-maker-transaction.md | 2 +- docs/echo_demo.md | 2 +- docs/gym-skill.md | 4 +- docs/http-connection-and-skill.md | 6 +- docs/http-echo-demo.md | 2 +- docs/ipfs_registry.md | 4 +- docs/multiplexer-standalone.md | 4 +- docs/quickstart.md | 6 +- docs/registry.md | 2 +- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/gym_aea/aea-config.yaml | 6 +- .../agents/my_first_aea/aea-config.yaml | 6 +- .../fetchai/connections/gym/connection.yaml | 2 +- .../fetchai/connections/gym/tests/__init__.py | 1 + .../connections/http_client/connection.yaml | 2 +- .../connections/http_client/tests/__init__.py | 1 + .../connections/http_server/connection.yaml | 2 +- .../connections/http_server/tests/__init__.py | 1 + .../connections/ledger/connection.yaml | 4 +- .../connections/ledger/tests/conftest.py | 2 + .../fetchai/connections/local/connection.yaml | 2 +- .../connections/local/tests/__init__.py | 1 + .../fetchai/connections/stub/connection.yaml | 2 +- .../connections/stub/tests/__init__.py | 1 + .../fetchai/contracts/erc1155/contract.yaml | 2 +- .../contracts/erc1155/tests/__init__.py | 1 + .../protocols/contract_api/protocol.yaml | 2 +- .../contract_api/tests/test_contract_api.py | 1 + packages/fetchai/skills/echo/skill.yaml | 6 +- .../skills/echo/tests/test_behaviours.py | 1 + .../skills/echo/tests/test_dialogues.py | 1 + .../skills/echo/tests/test_handlers.py | 1 + .../fetchai/skills/erc1155_client/skill.yaml | 18 +- .../tests/intermediate_class.py | 3 +- .../erc1155_client/tests/test_behaviours.py | 1 + .../erc1155_client/tests/test_dialogues.py | 3 +- .../erc1155_client/tests/test_handlers.py | 1 + .../erc1155_client/tests/test_strategy.py | 1 + .../fetchai/skills/erc1155_deploy/skill.yaml | 18 +- .../tests/intermediate_class.py | 3 +- .../erc1155_deploy/tests/test_behaviours.py | 1 + .../erc1155_deploy/tests/test_dialogues.py | 3 +- .../erc1155_deploy/tests/test_handlers.py | 1 + .../erc1155_deploy/tests/test_strategy.py | 1 + .../fetchai/skills/generic_buyer/skill.yaml | 12 +- .../generic_buyer/tests/test_behaviours.py | 1 + .../generic_buyer/tests/test_dialogues.py | 3 +- .../generic_buyer/tests/test_handlers.py | 1 + .../skills/generic_buyer/tests/test_models.py | 1 + .../fetchai/skills/generic_seller/skill.yaml | 10 +- .../generic_seller/tests/test_behaviours.py | 1 + .../generic_seller/tests/test_dialogues.py | 1 + .../generic_seller/tests/test_handlers.py | 1 + .../generic_seller/tests/test_models.py | 1 + packages/fetchai/skills/gym/skill.yaml | 14 +- .../skills/gym/tests/intermediate_class.py | 1 + .../skills/gym/tests/test_dialogues.py | 1 + .../fetchai/skills/gym/tests/test_handlers.py | 2 + .../fetchai/skills/gym/tests/test_helpers.py | 1 + .../fetchai/skills/gym/tests/test_rl_agent.py | 1 + .../fetchai/skills/gym/tests/test_task.py | 1 + packages/fetchai/skills/http_echo/skill.yaml | 4 +- .../skills/http_echo/tests/test_dialogues.py | 1 + .../skills/http_echo/tests/test_handlers.py | 1 + packages/hashes.csv | 44 ++--- .../open_aea/agents/gym_aea/aea-config.yaml | 6 +- .../open_aea/agents/http_echo/aea-config.yaml | 6 +- .../agents/my_first_aea/aea-config.yaml | 6 +- .../open_aea/protocols/signing/protocol.yaml | 2 +- .../protocols/signing/tests/test_signing.py | 2 + .../test_tools/docker_images.py | 5 +- .../test_tools/fixture_helpers.py | 2 +- .../test_tools/docker_images.py | 2 +- .../test_bash_yaml/md_files/bash-gym-skill.md | 4 +- .../bash-http-connection-and-skill.md | 8 +- .../md_files/bash-http-echo-demo.md | 2 +- .../md_files/bash-quickstart.md | 8 +- tests/test_protocols/test_base.py | 2 +- 93 files changed, 718 insertions(+), 134 deletions(-) create mode 100644 docs/api/plugins/aea_ledger_ethereum/test_tools/constants.md create mode 100644 docs/api/plugins/aea_ledger_ethereum/test_tools/docker_images.md create mode 100644 docs/api/plugins/aea_ledger_ethereum/test_tools/fixture_helpers.md create mode 100644 docs/api/plugins/aea_ledger_fetchai/test_tools/constants.md create mode 100644 docs/api/plugins/aea_ledger_fetchai/test_tools/docker_images.md create mode 100644 docs/api/protocols/signing/tests/test_signing.md create mode 100644 docs/api/test_tools/docker_image.md create mode 100644 docs/api/test_tools/mocks.md create mode 100644 docs/api/test_tools/network.md create mode 100644 docs/api/test_tools/utils.md diff --git a/Makefile b/Makefile index abdb7c9e6d..07b4f9ce1c 100644 --- a/Makefile +++ b/Makefile @@ -190,12 +190,12 @@ security: # update copyright headers .PHONY: generators generators: - python -m aea.cli generate-all-protocols - python -m aea.cli generate-all-protocols tests/data/packages + python scripts/check_copyright_notice.py python -m aea.cli hash all python -m aea.cli hash all --packages-dir=./tests/data/packages + # python -m aea.cli generate-all-protocols + # python -m aea.cli generate-all-protocols tests/data/packages python scripts/generate_api_docs.py - python scripts/check_copyright_notice.py python scripts/check_doc_ipfs_hashes.py --fix .PHONY: common-checks diff --git a/aea/test_tools/constants.py b/aea/test_tools/constants.py index 35955af6cf..ba92239eb4 100644 --- a/aea/test_tools/constants.py +++ b/aea/test_tools/constants.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/aea/test_tools/docker_image.py b/aea/test_tools/docker_image.py index 32ee7a5d93..0cb0a15c17 100644 --- a/aea/test_tools/docker_image.py +++ b/aea/test_tools/docker_image.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md index f3a215a1d2..e8ac6ca532 100644 --- a/docs/agent-vs-aea.md +++ b/docs/agent-vs-aea.md @@ -11,9 +11,9 @@ First, use an empty agent to get the stub connection and default protocol. mkdir packages # packages folder will contain the local package repository aea create my_aea # create an agent cd my_aea -aea add connection fetchai/stub:0.21.0:bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu --remote # get a connection from the remote registry +aea add connection fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 --remote # get a connection from the remote registry aea push connection fetchai/stub --local # push to local registry -aea add protocol fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm --remote +aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local cd .. aea delete my_aea # delete the agent diff --git a/docs/api/plugins/aea_ledger_ethereum/test_tools/constants.md b/docs/api/plugins/aea_ledger_ethereum/test_tools/constants.md new file mode 100644 index 0000000000..37554aa777 --- /dev/null +++ b/docs/api/plugins/aea_ledger_ethereum/test_tools/constants.md @@ -0,0 +1,6 @@ + + +# plugins.aea-ledger-ethereum.aea`_`ledger`_`ethereum.test`_`tools.constants + +Constants. + diff --git a/docs/api/plugins/aea_ledger_ethereum/test_tools/docker_images.md b/docs/api/plugins/aea_ledger_ethereum/test_tools/docker_images.md new file mode 100644 index 0000000000..b292bd41ab --- /dev/null +++ b/docs/api/plugins/aea_ledger_ethereum/test_tools/docker_images.md @@ -0,0 +1,69 @@ + + +# plugins.aea-ledger-ethereum.aea`_`ledger`_`ethereum.test`_`tools.docker`_`images + +Constants. + + + +## GanacheDockerImage Objects + +```python +class GanacheDockerImage(DockerImage) +``` + +Wrapper to Ganache Docker image. + + + +#### `__`init`__` + +```python +def __init__(client: DockerClient, + addr: str, + port: int, + config: Optional[Dict] = None, + gas_limit: str = "0x9184e72a000") +``` + +Initialize the Ganache Docker image. + +**Arguments**: + +- `client`: the Docker client. +- `addr`: the address. +- `port`: the port. +- `config`: optional configuration to command line. +- `gas_limit`: the gas limit for blocks. + + + +#### tag + +```python +@property +def tag() -> str +``` + +Get the image tag. + + + +#### create + +```python +def create() -> Container +``` + +Create the container. + + + +#### wait + +```python +def wait(max_attempts: int = 15, sleep_rate: float = 1.0) -> bool +``` + +Wait until the image is up. + diff --git a/docs/api/plugins/aea_ledger_ethereum/test_tools/fixture_helpers.md b/docs/api/plugins/aea_ledger_ethereum/test_tools/fixture_helpers.md new file mode 100644 index 0000000000..eede93d362 --- /dev/null +++ b/docs/api/plugins/aea_ledger_ethereum/test_tools/fixture_helpers.md @@ -0,0 +1,20 @@ + + +# plugins.aea-ledger-ethereum.aea`_`ledger`_`ethereum.test`_`tools.fixture`_`helpers + +Fixture helpers + + + +#### ganache + +```python +@pytest.fixture(scope="class") +def ganache(ganache_addr=DEFAULT_GANACHE_ADDR, + ganache_port=DEFAULT_GANACHE_PORT, + timeout: float = 2.0, + max_attempts: int = 10) +``` + +Launch the Ganache image. + diff --git a/docs/api/plugins/aea_ledger_fetchai/test_tools/constants.md b/docs/api/plugins/aea_ledger_fetchai/test_tools/constants.md new file mode 100644 index 0000000000..83c13893c6 --- /dev/null +++ b/docs/api/plugins/aea_ledger_fetchai/test_tools/constants.md @@ -0,0 +1,6 @@ + + +# plugins.aea-ledger-fetchai.aea`_`ledger`_`fetchai.test`_`tools.constants + +Constants. + diff --git a/docs/api/plugins/aea_ledger_fetchai/test_tools/docker_images.md b/docs/api/plugins/aea_ledger_fetchai/test_tools/docker_images.md new file mode 100644 index 0000000000..68f2e21e74 --- /dev/null +++ b/docs/api/plugins/aea_ledger_fetchai/test_tools/docker_images.md @@ -0,0 +1,69 @@ + + +# plugins.aea-ledger-fetchai.aea`_`ledger`_`fetchai.test`_`tools.docker`_`images + +This module contains testing utilities. + + + +## FetchLedgerDockerImage Objects + +```python +class FetchLedgerDockerImage(DockerImage) +``` + +Wrapper to Fetch ledger Docker image. + + + +#### `__`init`__` + +```python +def __init__(client: DockerClient, + addr: str, + port: int, + tag: str, + config: Optional[Dict] = None) +``` + +Initialize the Fetch ledger Docker image. + +**Arguments**: + +- `client`: the Docker client. +- `addr`: the address. +- `port`: the port. +- `tag`: the tag +- `config`: optional configuration to command line. + + + +#### tag + +```python +@property +def tag() -> str +``` + +Get the image tag. + + + +#### create + +```python +def create() -> Container +``` + +Create the container. + + + +#### wait + +```python +def wait(max_attempts: int = 15, sleep_rate: float = 1.0) -> bool +``` + +Wait until the image is up. + diff --git a/docs/api/protocols/signing/tests/test_signing.md b/docs/api/protocols/signing/tests/test_signing.md new file mode 100644 index 0000000000..fd097ccf63 --- /dev/null +++ b/docs/api/protocols/signing/tests/test_signing.md @@ -0,0 +1,160 @@ + + +# packages.open`_`aea.protocols.signing.tests.test`_`signing + +This module contains tests for transaction. + + + +## TestSigningMessage Objects + +```python +class TestSigningMessage() +``` + +Test the signing message module. + + + +#### setup`_`class + +```python +@classmethod +def setup_class(cls) +``` + +Setup class for test case. + + + +#### test`_`sign`_`transaction + +```python +def test_sign_transaction() +``` + +Test for an error for a sign transaction message. + + + +#### test`_`sign`_`message + +```python +def test_sign_message() +``` + +Test for an error for a sign transaction message. + + + +#### test`_`signed`_`transaction + +```python +def test_signed_transaction() +``` + +Test for an error for a signed transaction. + + + +#### test`_`signed`_`message + +```python +def test_signed_message() +``` + +Test for an error for a signed message. + + + +#### test`_`error`_`message + +```python +def test_error_message() +``` + +Test for an error for an error message. + + + +#### test`_`consistency`_`check`_`negative + +```python +def test_consistency_check_negative() +``` + +Test the consistency check, negative case. + + + +#### test`_`serialization`_`negative + +```python +def test_serialization_negative() +``` + +Test serialization when performative is not recognized. + + + +#### test`_`dialogues + +```python +def test_dialogues() +``` + +Test intiaontiation of dialogues. + + + +## SigningDialogue Objects + +```python +class SigningDialogue(BaseSigningDialogue) +``` + +The dialogue class maintains state of a dialogue and manages it. + + + +#### `__`init`__` + +```python +def __init__(dialogue_label: DialogueLabel, self_address: Address, + role: BaseDialogue.Role, + message_class: Type[SigningMessage]) -> None +``` + +Initialize a dialogue. + +**Arguments**: + +- `dialogue_label`: the identifier of the dialogue +- `self_address`: the address of the entity for whom this dialogue is maintained +- `role`: the role of the agent this dialogue is maintained for +- `message_class`: the message class + + + +## SigningDialogues Objects + +```python +class SigningDialogues(BaseSigningDialogues) +``` + +The dialogues class keeps track of all dialogues. + + + +#### `__`init`__` + +```python +def __init__(self_address: Address) -> None +``` + +Initialize dialogues. + +**Arguments**: + +- `self_address`: the address of the entity for whom this dialogues is maintained + diff --git a/docs/api/test_tools/docker_image.md b/docs/api/test_tools/docker_image.md new file mode 100644 index 0000000000..8993efc102 --- /dev/null +++ b/docs/api/test_tools/docker_image.md @@ -0,0 +1,103 @@ + + +# aea.test`_`tools.docker`_`image + +This module contains testing utilities. + + + +## DockerImage Objects + +```python +class DockerImage(ABC) +``` + +A class to wrap interatction with a Docker image. + + + +#### `__`init`__` + +```python +def __init__(client: DockerClient) +``` + +Initialize. + + + +#### check`_`skip + +```python +def check_skip() -> None +``` + +Check whether the test should be skipped. + +By default, nothing happens. + + + +#### tag + +```python +@property +@abstractmethod +def tag() -> str +``` + +Return the tag of the image. + + + +#### stop`_`if`_`already`_`running + +```python +def stop_if_already_running() -> None +``` + +Stop the running images with the same tag, if any. + + + +#### create + +```python +@abstractmethod +def create() -> Container +``` + +Instantiate the image in a container. + + + +#### wait + +```python +@abstractmethod +def wait(max_attempts: int = 15, sleep_rate: float = 1.0) -> bool +``` + +Wait until the image is running. + +**Arguments**: + +- `max_attempts`: max number of attempts. +- `sleep_rate`: the amount of time to sleep between different requests. + +**Returns**: + +True if the wait was successful, False otherwise. + + + +#### launch`_`image + +```python +def launch_image(image: DockerImage, + timeout: float = 2.0, + max_attempts: int = 10) -> Generator +``` + +Launch image. + diff --git a/docs/api/test_tools/mocks.md b/docs/api/test_tools/mocks.md new file mode 100644 index 0000000000..9f4f2cdd10 --- /dev/null +++ b/docs/api/test_tools/mocks.md @@ -0,0 +1,65 @@ + + +# aea.test`_`tools.mocks + +This module contains mocking utils testing purposes. + + + +## AnyStringWith Objects + +```python +class AnyStringWith(str) +``` + +Helper class to assert calls of mocked method with string arguments. + +It will use string inclusion as equality comparator. + + + +#### `__`eq`__` + +```python +def __eq__(other: Any) -> bool +``` + +Check equality. + + + +## RegexComparator Objects + +```python +class RegexComparator(str) +``` + +Helper class to assert calls of mocked method with string arguments. + +It will use regex matching as equality comparator. + + + +#### `__`eq`__` + +```python +def __eq__(other: Any) -> bool +``` + +Check equality. + + + +#### ctx`_`mock`_`Popen + +```python +@contextmanager +def ctx_mock_Popen() -> Generator +``` + +Mock subprocess.Popen. + +Act as context manager. + +:yield: mock generator. + diff --git a/docs/api/test_tools/network.md b/docs/api/test_tools/network.md new file mode 100644 index 0000000000..b52ee23940 --- /dev/null +++ b/docs/api/test_tools/network.md @@ -0,0 +1,26 @@ + + +# aea.test`_`tools.network + +Helper utils. + + + +#### get`_`unused`_`tcp`_`port + +```python +def get_unused_tcp_port() -> int +``` + +Get an unused TCP port. + + + +#### get`_`host + +```python +def get_host() -> str +``` + +Get the host. + diff --git a/docs/api/test_tools/utils.md b/docs/api/test_tools/utils.md new file mode 100644 index 0000000000..4e824ccd4f --- /dev/null +++ b/docs/api/test_tools/utils.md @@ -0,0 +1,19 @@ + + +# aea.test`_`tools.utils + +Helpful utilities. + + + +#### wait`_`for`_`condition + +```python +def wait_for_condition(condition_checker: Callable, + timeout: int = 2, + error_msg: str = "Timeout", + period: float = 0.001) -> None +``` + +Wait for condition to occur in selected timeout. + diff --git a/docs/build-aea-programmatically.md b/docs/build-aea-programmatically.md index d306c0930c..5e7d7f59f7 100644 --- a/docs/build-aea-programmatically.md +++ b/docs/build-aea-programmatically.md @@ -9,7 +9,7 @@ Get the needed packages from IPFS: mkdir packages aea create my_aea cd my_aea -aea add protocol fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm --remote +aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local cd .. aea delete my_aea diff --git a/docs/decision-maker-transaction.md b/docs/decision-maker-transaction.md index 69f2af565d..34eb7b212b 100644 --- a/docs/decision-maker-transaction.md +++ b/docs/decision-maker-transaction.md @@ -6,7 +6,7 @@ First, get the packages directory from IPFS: mkdir packages aea create my_aea cd my_aea -aea add protocol open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui --remote +aea add protocol open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi --remote aea push protocol open_aea/signing --local cd .. aea delete my_aea diff --git a/docs/echo_demo.md b/docs/echo_demo.md index 9592f420b9..7934cc521f 100644 --- a/docs/echo_demo.md +++ b/docs/echo_demo.md @@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/docs/gym-skill.md b/docs/gym-skill.md index 8ba38d9036..f2ab93cc63 100644 --- a/docs/gym-skill.md +++ b/docs/gym-skill.md @@ -19,7 +19,7 @@ Follow the Preliminaries and Second, add the stub connection to the project. ``` bash -aea add connection fetchai/stub:0.21.0:bafybeihby6suvjc4kiw7wwm6ul6wggcvrj3sizars6le4rerqdgetuzdvu --remote +aea add connection fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 --remote ```
Add the echo skill
Third, add the echo skill to the project. ``` bash -aea add skill fetchai/echo:0.19.0:bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y --remote +aea add skill fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana --remote ``` This copies the fetchai/echo:0.19.0 skill code containing the "behaviours", and "handlers" into the project, ready to run. The identifier of the skill fetchai/echo:0.19.0 consists of the name of the author of the skill, followed by the skill name and its version. @@ -328,7 +328,7 @@ First, get the needed packages directory from IPFS (execute from the working dir ```bash mkdir packages cd my_first_aea -aea add protocol fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm --remote +aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local cd .. aea delete my_aea diff --git a/docs/registry.md b/docs/registry.md index dd3d91cb4f..05463997ab 100644 --- a/docs/registry.md +++ b/docs/registry.md @@ -22,7 +22,7 @@ Successfully added protocol 'open_aea/signing:1.0.0'. Once we have an agent, we can add individual components to the agent as so; ``` -aea add skill fetchai/echo:0.19.0:bafybeia6agg5bvfof65d2ue2yvjdwpubizlfrl64zynblmvgpvyf3pd26y --remote +aea add skill fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana --remote Registry path not provided and local registry `packages` not found in current (.) and parent directory. Trying remote registry (`--remote`). Adding skill 'fetchai/echo:latest'... diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 1c588f5bcd..1599cdda90 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 +- fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 620ff83e38..0d73a93fb8 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq +- fetchai/gym:0.19.0:bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/gym:1.0.0:bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeibendxox7npijbsfqju74ptfl6y5b6s3ieufhiqzo44etveb6f5fq +- fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 4c23e5e7b3..45fd4ffaf1 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 +- fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/echo:0.19.0:bafybeia6sgw3ppjl4y5hg5ha6mfqlo3hkvq7vkhonr3s4oubs2fow5ccyi +- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml index 95ccccea05..ee2895ef66 100644 --- a/packages/fetchai/connections/gym/connection.yaml +++ b/packages/fetchai/connections/gym/connection.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeidafzjeoncxdycohsvxmxxgqnlxira724at6x4slxkuw3hasper2q __init__.py: bafybeiacpcxqwod5ppgwckp36jj3ax2ymzkrv4tlalzcatxrx4tblbvfvq connection.py: bafybeiacf4utttdtrp2zb5wjrksatswb7dtlgnzafxiofuvzxot53oqdd4 - tests/__init__.py: bafybeielwxjlvbzufqr3wgv4jrzbi6kquzelxbczla4cvpoiuz2no5eqp4 + tests/__init__.py: bafybeidgl3l7pzmg4upgkkfnq2kgbgzppkt5xy2tbottj3jqse2pf7juqm tests/test_gym.py: bafybeigyry6mxho2kww5ih5hat5e2ppfqmkgqky4xfdsmu2sxeowarg6si fingerprint_ignore_patterns: [] connections: [] diff --git a/packages/fetchai/connections/gym/tests/__init__.py b/packages/fetchai/connections/gym/tests/__init__.py index 9d1f2264f7..9c107d1aa9 100644 --- a/packages/fetchai/connections/gym/tests/__init__.py +++ b/packages/fetchai/connections/gym/tests/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml index eac2f05868..da7e94eb18 100644 --- a/packages/fetchai/connections/http_client/connection.yaml +++ b/packages/fetchai/connections/http_client/connection.yaml @@ -10,7 +10,7 @@ fingerprint: README.md: bafybeibx4ko4f5xbgozqlgfnxwc3rksm5b7khtikf46izrlndjrojv2lw4 __init__.py: bafybeiateb3vma46yihntj5gbai3eqcy3fkx55lkrwye6tbr4cuo5xktdm connection.py: bafybeihlwvleotrr5cgzokgcia7wek36c7pcflbuaminiqgvdrt2iuihoe - tests/__init__.py: bafybeic5mqiqjs46dbrhwepcsgm6wkq5az5lzzi2gtavcyskn4cbe2yuvi + tests/__init__.py: bafybeifdwnjjmrmu6g3eiuraixxfrumeacwdbjxcxqufeuhcks4hlc65nu tests/test_http_client.py: bafybeid5zspv56oacfrxqlint5jkkendg7az2t7ohxzfien2yqy2rjif6i fingerprint_ignore_patterns: [] connections: [] diff --git a/packages/fetchai/connections/http_client/tests/__init__.py b/packages/fetchai/connections/http_client/tests/__init__.py index c7f4dc6bcc..c734e700e9 100644 --- a/packages/fetchai/connections/http_client/tests/__init__.py +++ b/packages/fetchai/connections/http_client/tests/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml index c9abcfd495..24ab0868a8 100644 --- a/packages/fetchai/connections/http_server/connection.yaml +++ b/packages/fetchai/connections/http_server/connection.yaml @@ -10,7 +10,7 @@ fingerprint: README.md: bafybeihkuhhsdfw5qqtz2jwpfppub6yvsehzmvmaqjlxnal4v76x47mcrq __init__.py: bafybeif5pkr5oarwd7yagdgn46miolmdmvgdyxv4kadgws2bf3iwshom24 connection.py: bafybeicqhb5zrdmjt6vtb253luc7nfr4p4vrxkmniigqsokgatrsoeptoa - tests/__init__.py: bafybeiewlnh2eycgprywqi54fy766qorufe4qpjip4son4zvebwtut3p2m + tests/__init__.py: bafybeidpthyhnhsvpixejrud77klcfkb3titlmyrssovfzt4a76dn3wnpm tests/data/certs/server.crt: bafybeiev5i3xxkvn36wflf633gkumuxexsw4y2bubwbvl7edrz4igfgv34 tests/data/certs/server.csr: bafybeicvp7xdl5w3o4bzikkudpduitss3bpp6xqfwlxbw6kabdangohy5u tests/data/certs/server.key: bafybeiabvpkpqr4fctrbssfal6pviv5otgmu32qyrfpyhcql5wgmlzjtoe diff --git a/packages/fetchai/connections/http_server/tests/__init__.py b/packages/fetchai/connections/http_server/tests/__init__.py index 8b4d45bce1..5dd135e96c 100644 --- a/packages/fetchai/connections/http_server/tests/__init__.py +++ b/packages/fetchai/connections/http_server/tests/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index b1799c1b0f..29b95df83c 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -13,12 +13,12 @@ fingerprint: contract_dispatcher.py: bafybeigpzih7porhorupuu5zlrg7ho6fswf4qc65xq22wypgqzwxowqlay ledger_dispatcher.py: bafybeicrjfb2f4ngb3lvwgfbxf3r3ukk7pgm3oaour4htmnuqqn44ltmku tests/__init__.py: bafybeibx5zdcpx3u6sglbpp7yflnr7uaz557e6wqltawtzclubhhvaiw5e - tests/conftest.py: bafybeib4xwpgabqpzrm64v2mbjuexr7rzvvjpe7tdlp44cxe2zfqqezhuu + tests/conftest.py: bafybeiehywp4w4pddrqew4yt2i43rjdi74ple4nkwgasbrcvxjs536mvee tests/test_ledger_api.py: bafybeieqnd6z5wtmne5wtvj4jsuyg2g5iyr5ppawhiy7smjiq3b52msyfe fingerprint_ignore_patterns: [] connections: [] protocols: -- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +- fetchai/contract_api:1.0.0:bafybeiepagnggutqgxps5lwdxqfikwac5xz3wmv3ffsbjw5vzfuzvogxk4 - fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 class_name: LedgerConnection config: diff --git a/packages/fetchai/connections/ledger/tests/conftest.py b/packages/fetchai/connections/ledger/tests/conftest.py index b89484651f..4e29fdb7ba 100644 --- a/packages/fetchai/connections/ledger/tests/conftest.py +++ b/packages/fetchai/connections/ledger/tests/conftest.py @@ -18,6 +18,8 @@ # ------------------------------------------------------------------------------ """Conftest module.""" +# pylint: skip-file + import logging from pathlib import Path from typing import cast diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml index 9cbdcc3eeb..98306acc23 100644 --- a/packages/fetchai/connections/local/connection.yaml +++ b/packages/fetchai/connections/local/connection.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeigayltuo3dejkvuqvm6cysyzw6xueha4ehgo23qv75xdavd7bik24 __init__.py: bafybeibojyrqpiw5xkemsnrdie572mixa5ud4sxdtmpgfutl253kj4zjga connection.py: bafybeielwpaxz4nvhbrhmg3eyp55qq42drfyicfmbfbfty45bnzat7pvwm - tests/__init__.py: bafybeihwthgb4qi2py7i5kuc4rn6n3lgxb756pxo7c7wru2ek6m2mon4ua + tests/__init__.py: bafybeiecschrd664thii7emksuuziz3xrporjptci4wodsgdavlzpfzhqi tests/test_misc.py: bafybeifctqrq55fa6swalswkhe7bokxizvidy354e4naywcamkwckbgi54 tests/test_search_services.py: bafybeibcgnt5db5ms2zbshlxthzralqvmudyzy3llxurqkjg5cm7xhx56m fingerprint_ignore_patterns: [] diff --git a/packages/fetchai/connections/local/tests/__init__.py b/packages/fetchai/connections/local/tests/__init__.py index af4a4fc07b..e5ccea8f1f 100644 --- a/packages/fetchai/connections/local/tests/__init__.py +++ b/packages/fetchai/connections/local/tests/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index 1c2fd21559..5c51def61c 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -11,7 +11,7 @@ fingerprint: __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 input_file: bafybeiftu27piztiu5bfxbvhqsbppgtseykyfot6wtlrrzeuzya6zrgpky - tests/__init__.py: bafybeihodqbifehez7r4zalztsn5ildne4rxc6rvdhykl7vscghxi4v45i + tests/__init__.py: bafybeiadaetciszcob7cchexib74l7vecczthsx2pzaan7sp7csrkgjxce tests/test_stub.py: bafybeihu2smaadptjzzbrkrv4bae2l4bmd6ozidetlwrmnas2az7tgbqy4 fingerprint_ignore_patterns: [] connections: [] diff --git a/packages/fetchai/connections/stub/tests/__init__.py b/packages/fetchai/connections/stub/tests/__init__.py index 556ec04c96..76e5f27b1b 100644 --- a/packages/fetchai/connections/stub/tests/__init__.py +++ b/packages/fetchai/connections/stub/tests/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index ef8530a489..2c02b4ed15 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -16,7 +16,7 @@ fingerprint: contracts/erc1155.vy: bafybeieoxkgqprmmgvl2xdqtch4payvxzpw3c76thmtrl7vbmc6zxzl2a4 migrations/1_initial_migration.js: bafybeigzg7dadlq7sepncquzoo5hgs7q2pwvbhzilolgkjkr3jacb2owvy migrations/2_deploy_contracts.js: bafybeihnzburnurq4gvp4rj36b57uzrlgif5y73ggyu3rfc3iot4e5zppy - tests/__init__.py: bafybeidgqgy32gwubf3eu7ijc7ddq4bm675oxyfqevm5j2ew2zcu4p6tm4 + tests/__init__.py: bafybeig4dvxi35qewu667l3hktdygp33p5r6hzsz4abqzkgggptl3d4vje tests/test_contract.py: bafybeifpwwwzr6tomoubi7f5dvfzbwdnn4jught26uda2i4mexqkpqplwm fingerprint_ignore_patterns: [] class_name: ERC1155Contract diff --git a/packages/fetchai/contracts/erc1155/tests/__init__.py b/packages/fetchai/contracts/erc1155/tests/__init__.py index d110676a8b..352a75970b 100644 --- a/packages/fetchai/contracts/erc1155/tests/__init__.py +++ b/packages/fetchai/contracts/erc1155/tests/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # +# Copyright 2022 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml index fae96ba596..f215801c65 100644 --- a/packages/fetchai/protocols/contract_api/protocol.yaml +++ b/packages/fetchai/protocols/contract_api/protocol.yaml @@ -16,7 +16,7 @@ fingerprint: message.py: bafybeigftvzbo5xf42rxvyjqj3f3sladfpm3dikjymasasu73uo3emfrn4 serialization.py: bafybeif7ij4l5e6mx7gfuwggdlarohqblpluik6hkfq4s2ha7nubwwiwyy tests/__init__.py: bafybeiebqiklu6bfyzb6x6q7yby632h3nfncwzi3i7mjvombiq2eugpcym - tests/test_contract_api.py: bafybeifpn4c7wvzl3d4d7nreoxabflsvj72h7styq7wc7vmkkrhcqkgnfq + tests/test_contract_api.py: bafybeig4oyvxtkdxvelbwznpaqsqffgbx337tzxdukm7y3ogheknrr7qry fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py index 2d0ebc3522..7626af7131 100644 --- a/packages/fetchai/protocols/contract_api/tests/test_contract_api.py +++ b/packages/fetchai/protocols/contract_api/tests/test_contract_api.py @@ -19,6 +19,7 @@ # ------------------------------------------------------------------------------ """This module contains the tests of the contract_api protocol package.""" +# pylint: skip-file from typing import Type from unittest import mock diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 334a756388..0c63b5ce79 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -12,9 +12,9 @@ fingerprint: dialogues.py: bafybeici4rlde6qdpjtftn4xgelrrphpwzzymvhjrgua7frx7qvyw32gue handlers.py: bafybeihjjglefhpwbprqu6anjpmhj3nn7p53nsci3kmueab7hnhchfcmsi tests/__init__.py: bafybeidedsb72is3z5jndaoh232r7y5qvqb3acotjm6xi4pea3bmkoq6le - tests/test_behaviours.py: bafybeibea56daw5pjldrwx5dfv4w3tbmln5umzfz5ztt3p6jjaziiwczri - tests/test_dialogues.py: bafybeiafp2au3qo6xiobtdxyrviict5ssx7jygp5qbml66cthchaceismq - tests/test_handlers.py: bafybeid6xknzidjyrhooczkgolmxdesxriahb72q3be2jtk6iybfgaxbui + tests/test_behaviours.py: bafybeicfbfgoqishdrxvfy77qqmkztpkmceanhmheq6h5odyun5i23vwoe + tests/test_dialogues.py: bafybeiap6rqpxu46po5vgwv5xcupv7tnlzzlwuwzp35xolel6cgtrbp5vi + tests/test_handlers.py: bafybeienyvkpjil76o7bvkx3b2dqv3y7ouaha5mcaeyxgfettt3q4xsasa fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/packages/fetchai/skills/echo/tests/test_behaviours.py b/packages/fetchai/skills/echo/tests/test_behaviours.py index a18be71548..13cc743ca3 100644 --- a/packages/fetchai/skills/echo/tests/test_behaviours.py +++ b/packages/fetchai/skills/echo/tests/test_behaviours.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour class of the echo skill.""" +# pylint: skip-file import inspect import logging diff --git a/packages/fetchai/skills/echo/tests/test_dialogues.py b/packages/fetchai/skills/echo/tests/test_dialogues.py index 49f874ce42..59ce0aeb27 100644 --- a/packages/fetchai/skills/echo/tests/test_dialogues.py +++ b/packages/fetchai/skills/echo/tests/test_dialogues.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the echo skill.""" +# pylint: skip-file import inspect import os diff --git a/packages/fetchai/skills/echo/tests/test_handlers.py b/packages/fetchai/skills/echo/tests/test_handlers.py index 7d7e6656e7..83efc98f1e 100644 --- a/packages/fetchai/skills/echo/tests/test_handlers.py +++ b/packages/fetchai/skills/echo/tests/test_handlers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler class of the echo skill.""" +# pylint: skip-file import inspect import logging diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 544c4a8fd1..e737ac80fa 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -14,23 +14,23 @@ fingerprint: handlers.py: bafybeifaqwn3tweuawo65yn3ek6mfun2zu54qtoa2sqyndyvmsk7rkdi7i strategy.py: bafybeifudijy3opr6srw5kik3x3rmv6f75dts2pcqtlhjwkkzcafpad4em tests/__init__.py: bafybeiagjee55nf2csbyob2o5u3au6r76elv4b6o6qoxnrupinam2brfia - tests/intermediate_class.py: bafybeic6rlkj625jfphxumr4iorf4vngr5brtopesj5i2s6juut2zckyuu - tests/test_behaviours.py: bafybeifubppsuvjavl4a4rag7oacvinnwmbb2e2xyk2nzz2edmdlkiw32m - tests/test_dialogues.py: bafybeihs577t65wjqeas4whesp2ikgqmd7ezj4wa2pdifnjbuknp3nmknq - tests/test_handlers.py: bafybeia6cj2jrqbzafhirmqvgrh7pumhabmdvwkoobu6gft6dvlj2eesv4 - tests/test_strategy.py: bafybeic3zyvuaaqtfpdsgkfqlkyn2ftzlkmxs2cgfw5ub4qylnbguk7rbq + tests/intermediate_class.py: bafybeieoglop7efuq2etrenty2rq66lfkct46tvyjktwkqylojx2qr45by + tests/test_behaviours.py: bafybeigxo3uasrhzvhwjbqnqpvqjxqh3xagikqduygw2bbf6rjy7nlpxea + tests/test_dialogues.py: bafybeigmimeopcrjvgaq3e6ap3w3aqxyjfjacbtay6i2pcvx4nhzdmbtzi + tests/test_handlers.py: bafybeifgqbvf56uhyosydl3xoloc244uefo4f5nlelpaxfesrgdlmu24wu + tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu +- fetchai/ledger:0.19.0:bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq contracts: -- fetchai/erc1155:0.22.0:bafybeihdibjr5tthaamqlmgjnslshcy4nhjp7oonjfbi6dwzc2oj5qkguy +- fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi protocols: -- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +- fetchai/contract_api:1.0.0:bafybeiepagnggutqgxps5lwdxqfikwac5xz3wmv3ffsbjw5vzfuzvogxk4 - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca - fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 - fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: [] behaviours: search: diff --git a/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py b/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py index d9b34d0d45..e0ba604e48 100644 --- a/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py +++ b/packages/fetchai/skills/erc1155_client/tests/intermediate_class.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module sets up test environment for erc1155_client skill.""" +# pylint: skip-file from pathlib import Path from typing import cast diff --git a/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py b/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py index 290a73d03d..6fb015b66c 100644 --- a/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py +++ b/packages/fetchai/skills/erc1155_client/tests/test_behaviours.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour classes of the erc1155_client skill.""" +# pylint: skip-file from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage from packages.fetchai.protocols.oef_search.message import OefSearchMessage diff --git a/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py b/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py index d0e5ab3249..6649741040 100644 --- a/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py +++ b/packages/fetchai/skills/erc1155_client/tests/test_dialogues.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the erc1155_client skill.""" +# pylint: skip-file import pytest diff --git a/packages/fetchai/skills/erc1155_client/tests/test_handlers.py b/packages/fetchai/skills/erc1155_client/tests/test_handlers.py index b65b9ddfdb..f52ed84940 100644 --- a/packages/fetchai/skills/erc1155_client/tests/test_handlers.py +++ b/packages/fetchai/skills/erc1155_client/tests/test_handlers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler classes of the erc1155_client skill.""" +# pylint: skip-file import logging from typing import cast diff --git a/packages/fetchai/skills/erc1155_client/tests/test_strategy.py b/packages/fetchai/skills/erc1155_client/tests/test_strategy.py index 55454569ad..a84cdc3a45 100644 --- a/packages/fetchai/skills/erc1155_client/tests/test_strategy.py +++ b/packages/fetchai/skills/erc1155_client/tests/test_strategy.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the strategy class of the erc1155_client skill.""" +# pylint: skip-file from aea.helpers.search.models import Constraint, ConstraintType, Query diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 4460319352..2d53505dee 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -14,23 +14,23 @@ fingerprint: handlers.py: bafybeigf65e2hhzropscpyyvksxrtnkopofmbdhqfb6jty3vcdsippmz6a strategy.py: bafybeif5eor26xfagaoy3xafmwraw74btlw3o7jv2a6hpon46x5flzt6ey tests/__init__.py: bafybeig6dkwpgzga7j7xtr4m2lue5geufhea2wrhrr4t24maf3qb6f7ofq - tests/intermediate_class.py: bafybeig3htavq3dtrhvskev76ecusndajmfgnjyyys7uneou7jugwaxkuq - tests/test_behaviours.py: bafybeiezsoqme6k2dedjf3lrlvg2jjw7wgpqaebui5nfpegfbvgy5nth6a - tests/test_dialogues.py: bafybeia3c7b3fccfkiaaoyjd46vpbd3tx3zu4t3vflkospdusqcguftg3m - tests/test_handlers.py: bafybeifqmviuflrq25cuxrydjnipq43sb3v4jb6obpyhiud2idhagbl4ui - tests/test_strategy.py: bafybeihjb32d5x7qzilodj6coe7x3hox2bmzh5zcmhanwxpvsn44vf6nu4 + tests/intermediate_class.py: bafybeigxc3ijgmlmxnhqpepfgahnt5r2nsmbuug2estxbz3n56zgzvrgsa + tests/test_behaviours.py: bafybeiekgq5l3bglz6benq2uzrxalfhfjpzi3dqdhzkyovd5jhpsrmvzhu + tests/test_dialogues.py: bafybeigfpuikqr37ujcfctu5f36mxsemzo65hnfbcd5uljbkpomoqcwdge + tests/test_handlers.py: bafybeifjj632th5modlrjfo4uurhlehmlyo454g7lpq5xw7lcgolht5cvy + tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu +- fetchai/ledger:0.19.0:bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq contracts: -- fetchai/erc1155:0.22.0:bafybeihdibjr5tthaamqlmgjnslshcy4nhjp7oonjfbi6dwzc2oj5qkguy +- fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi protocols: -- fetchai/contract_api:1.0.0:bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +- fetchai/contract_api:1.0.0:bafybeiepagnggutqgxps5lwdxqfikwac5xz3wmv3ffsbjw5vzfuzvogxk4 - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca - fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 - fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: [] behaviours: service_registration: diff --git a/packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py b/packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py index 2878af1372..7e44598e79 100644 --- a/packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/intermediate_class.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module sets up test environment for erc1155_deploy skill.""" +# pylint: skip-file from pathlib import Path from typing import cast diff --git a/packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py b/packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py index e0affdd640..c9bb65b763 100644 --- a/packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_behaviours.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour classes of the erc1155_deploy skill.""" +# pylint: skip-file import logging from typing import cast diff --git a/packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py b/packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py index 5feb86dcad..af453a6670 100644 --- a/packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_dialogues.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the erc1155_deploy skill.""" +# pylint: skip-file import pytest diff --git a/packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py b/packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py index 636e01a4c2..7376b9022f 100644 --- a/packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_handlers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler classes of the erc1155_deploy skill.""" +# pylint: skip-file import logging from typing import cast diff --git a/packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py b/packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py index 265dc2c6fd..f4875024aa 100644 --- a/packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py +++ b/packages/fetchai/skills/erc1155_deploy/tests/test_strategy.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the strategy class of the erc1155_deploy skill.""" +# pylint: skip-file import pytest diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 109084008f..10014091c3 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -13,20 +13,20 @@ fingerprint: handlers.py: bafybeifdytrtxifnxuzcml4plgqttkuknwlavmskc6gyy3xt4vujwwxjg4 strategy.py: bafybeidzwda36osegdqljxoxcj5ljds5k62iuti73qu2ghzl6nubadmaxe tests/__init__.py: bafybeid6od3orr5gjysmm4lbcn6xcul22n2dlc7qafppiqvkvcov2pftiu - tests/test_behaviours.py: bafybeicmdo2lscp3eyimvlz6r36oizdkifphzkjxs3d65hii6hcesybb5i - tests/test_dialogues.py: bafybeicw26dbb5bsdrhryymxr2lge2n3m6dmkeperkdd6imlxaclrfjpge - tests/test_handlers.py: bafybeicssmw63jx3rrni37egleirg2yratrfcbxmxlefhaenrqdzov2roi - tests/test_models.py: bafybeia3a3wtmmjxqn4qspbrluaypql262xne3n4t7qdyjsn3bkfsq4cxq + tests/test_behaviours.py: bafybeifk7zdbtv6hocho62uhsshs66rqfpkjmyq6sdvcncu7old5jnmpmy + tests/test_dialogues.py: bafybeicabpwlrm2ppqllol5fhuyzujsbakwbnwagrtllfv2jve5jotgbqq + tests/test_handlers.py: bafybeiez7vth2e45mg6gza4d2tmhwawtt5wqx7fbvjnr2afcavj7mgl324 + tests/test_models.py: bafybeibc5tdfcizkxi7mannv22m7svbw2q5eytkxw726nswomzt7gucyzm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu +- fetchai/ledger:0.19.0:bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/fipa:1.0.0:bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca - fetchai/ledger_api:1.0.0:bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs5qkeboj4 - fetchai/oef_search:1.0.0:bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: [] behaviours: search: diff --git a/packages/fetchai/skills/generic_buyer/tests/test_behaviours.py b/packages/fetchai/skills/generic_buyer/tests/test_behaviours.py index dbf83ff6ba..27c63753b6 100644 --- a/packages/fetchai/skills/generic_buyer/tests/test_behaviours.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_behaviours.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour classes of the generic buyer skill.""" +# pylint: skip-file import logging from pathlib import Path diff --git a/packages/fetchai/skills/generic_buyer/tests/test_dialogues.py b/packages/fetchai/skills/generic_buyer/tests/test_dialogues.py index 355dd1ad5d..9d6cbb75bb 100644 --- a/packages/fetchai/skills/generic_buyer/tests/test_dialogues.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_dialogues.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the generic buyer skill.""" +# pylint: skip-file from pathlib import Path from typing import cast diff --git a/packages/fetchai/skills/generic_buyer/tests/test_handlers.py b/packages/fetchai/skills/generic_buyer/tests/test_handlers.py index 751338877b..1fffda99ef 100644 --- a/packages/fetchai/skills/generic_buyer/tests/test_handlers.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_handlers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler classes of the generic buyer skill.""" +# pylint: skip-file import logging from pathlib import Path diff --git a/packages/fetchai/skills/generic_buyer/tests/test_models.py b/packages/fetchai/skills/generic_buyer/tests/test_models.py index ba88090321..a82d806beb 100644 --- a/packages/fetchai/skills/generic_buyer/tests/test_models.py +++ b/packages/fetchai/skills/generic_buyer/tests/test_models.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the strategy class of the generic buyer skill.""" +# pylint: skip-file from pathlib import Path diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 4adf6f86d1..e1861c2f66 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -14,13 +14,13 @@ fingerprint: handlers.py: bafybeigz7pthvel63y4o3xq77icym2thcw4jy53hcj4a7t56eebqzdbgay strategy.py: bafybeia5mjxph7ui2iav5uxutwnr6q2uf4otxdge5vuk7g5ycaso3jldkm tests/__init__.py: bafybeihqxdniovyormfdxlfyxosmbstbriacfo4si7gofld5fx66jwmp5a - tests/test_behaviours.py: bafybeigyvkntknutwipnurwnxq2iiqcqhocvdpgvpaixoakqzxd4fckdxa - tests/test_dialogues.py: bafybeifcnehrjfzfrnu4lshzhocxzxvnummroiz7svwi7jjh7c32qbkzyi - tests/test_handlers.py: bafybeie6u2sfzm5hkneiapqlvelcokkb34vwiwhwmdzvmr6yjl6e7a37by - tests/test_models.py: bafybeicea7y22x23k77afs5qe4iokhxfnzw6fakhhlxcrvrbw2pnmrzimq + tests/test_behaviours.py: bafybeihd2ngqekfjqxlowzy2p3cy3tfu4ajtyewfvwb3ghwt4o4724xrui + tests/test_dialogues.py: bafybeidk3ypb3meyc3o3vevlxo5yszb7e6ivi6f7a7tse2raahzsoavncu + tests/test_handlers.py: bafybeihnolj6umzigr4fyu7zyfny5td3qpwfarlhixklt5asgh5mcdtbdi + tests/test_models.py: bafybeigymvfralqr63dpybfiqc4x4glcwmxmsweqycrmd75exi3gdz4oo4 fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu +- fetchai/ledger:0.19.0:bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/generic_seller/tests/test_behaviours.py b/packages/fetchai/skills/generic_seller/tests/test_behaviours.py index 98ac505b61..d77f71f790 100644 --- a/packages/fetchai/skills/generic_seller/tests/test_behaviours.py +++ b/packages/fetchai/skills/generic_seller/tests/test_behaviours.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the behaviour classes of the generic seller skill.""" +# pylint: skip-file import logging from pathlib import Path diff --git a/packages/fetchai/skills/generic_seller/tests/test_dialogues.py b/packages/fetchai/skills/generic_seller/tests/test_dialogues.py index c8e3a041ca..c3ba15d558 100644 --- a/packages/fetchai/skills/generic_seller/tests/test_dialogues.py +++ b/packages/fetchai/skills/generic_seller/tests/test_dialogues.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the generic seller skill.""" +# pylint: skip-file from pathlib import Path from typing import cast diff --git a/packages/fetchai/skills/generic_seller/tests/test_handlers.py b/packages/fetchai/skills/generic_seller/tests/test_handlers.py index 15a5517a87..f90855b8ce 100644 --- a/packages/fetchai/skills/generic_seller/tests/test_handlers.py +++ b/packages/fetchai/skills/generic_seller/tests/test_handlers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler classes of the generic seller skill.""" +# pylint: skip-file import logging from pathlib import Path diff --git a/packages/fetchai/skills/generic_seller/tests/test_models.py b/packages/fetchai/skills/generic_seller/tests/test_models.py index 366f0764b6..53ba34d7ca 100644 --- a/packages/fetchai/skills/generic_seller/tests/test_models.py +++ b/packages/fetchai/skills/generic_seller/tests/test_models.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the strategy class of the generic seller skill.""" +# pylint: skip-file from pathlib import Path diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 3789472943..a1f06db409 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -15,15 +15,15 @@ fingerprint: tasks.py: bafybeifvuancp2y57rjgwuzxgrzxiqkc4gzzbskgwch3uze5vlbvptlswm tests/__init__.py: bafybeihojk75sixkhbsmwxbrzdaqwouq6dh2oo6u7zk2clqcgxqrhklhny tests/helpers.py: bafybeifbvlf5ahttwz7uddixxp5ggw3uu3sby65ya4xr2gy3gfb5xouj5i - tests/intermediate_class.py: bafybeidvnxpidgj6kzd2kxwnexwh4tvxcgqvtoknruiw4jus5x6l4gxppy - tests/test_dialogues.py: bafybeibdkfgu2kx7rwppvhopy6idqvjhguzzfkedrzp7hpdj6lnhcc4bnq - tests/test_handlers.py: bafybeidri56t3alb4zivn6kqcf3aieeshbady4e3osunxw6u6gmpzjhx3i - tests/test_helpers.py: bafybeifi723zjei7bhlj3svkaj2uhz2labkf6esbaxpelluv4o3h6ch7gu - tests/test_rl_agent.py: bafybeiez422xh773yzym43raqurellfutra3ewdl4pjry7zkhnlv4ddjoi - tests/test_task.py: bafybeifwk6oi2ilsbm435ncjynli5iskvuwgwilivzugz67njryotz5kum + tests/intermediate_class.py: bafybeicnzyg7jkyc2xtyij7fj42aammx3xmrvvvnjen6vjxzisqqzipvie + tests/test_dialogues.py: bafybeihigzfcuycwtpj5no6owcfxlo7kwsvh7bh2ohdx7u7tphea23xuwy + tests/test_handlers.py: bafybeih6ktdgopxcpcn4n7a7wgem42wzzanjw6inwdqp67pb6lzgvxhrpy + tests/test_helpers.py: bafybeigoayt5pabnwi72kcxpoyan7r44igjizeycw7lqjnxy52alwnez44 + tests/test_rl_agent.py: bafybeia2s7ft7za4tyzsofmguny6vit7iwfp4gx6nemk4bekx7ytbrc4ze + tests/test_task.py: bafybeic4y7wulvlx2eparks3wyftfsx5ya2xsufoaohxfqhxrabm7zt7pi fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq +- fetchai/gym:0.19.0:bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/gym/tests/intermediate_class.py b/packages/fetchai/skills/gym/tests/intermediate_class.py index 4549391406..43f2a27e06 100644 --- a/packages/fetchai/skills/gym/tests/intermediate_class.py +++ b/packages/fetchai/skills/gym/tests/intermediate_class.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module sets up test environment for gym skill.""" +# pylint: skip-file from pathlib import Path from typing import cast diff --git a/packages/fetchai/skills/gym/tests/test_dialogues.py b/packages/fetchai/skills/gym/tests/test_dialogues.py index 63efbe4888..7fc63449c0 100644 --- a/packages/fetchai/skills/gym/tests/test_dialogues.py +++ b/packages/fetchai/skills/gym/tests/test_dialogues.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the ml_train skill.""" +# pylint: skip-file from aea.test_tools.test_skill import COUNTERPARTY_AGENT_ADDRESS diff --git a/packages/fetchai/skills/gym/tests/test_handlers.py b/packages/fetchai/skills/gym/tests/test_handlers.py index 2c73684d73..07fde4c1b4 100644 --- a/packages/fetchai/skills/gym/tests/test_handlers.py +++ b/packages/fetchai/skills/gym/tests/test_handlers.py @@ -18,6 +18,8 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler classes of the gym skill.""" +# pylint: skip-file + import logging from multiprocessing.pool import ApplyResult from typing import cast diff --git a/packages/fetchai/skills/gym/tests/test_helpers.py b/packages/fetchai/skills/gym/tests/test_helpers.py index f4236f5d88..d6a8c9874f 100644 --- a/packages/fetchai/skills/gym/tests/test_helpers.py +++ b/packages/fetchai/skills/gym/tests/test_helpers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests for the helpers module of the gym skill.""" +# pylint: skip-file from typing import cast from unittest.mock import patch diff --git a/packages/fetchai/skills/gym/tests/test_rl_agent.py b/packages/fetchai/skills/gym/tests/test_rl_agent.py index 0b28ab204d..c57f104747 100644 --- a/packages/fetchai/skills/gym/tests/test_rl_agent.py +++ b/packages/fetchai/skills/gym/tests/test_rl_agent.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests for the rl_agent module of the gym skill.""" +# pylint: skip-file import copy from unittest.mock import patch diff --git a/packages/fetchai/skills/gym/tests/test_task.py b/packages/fetchai/skills/gym/tests/test_task.py index c102008ac5..13c39d3e74 100644 --- a/packages/fetchai/skills/gym/tests/test_task.py +++ b/packages/fetchai/skills/gym/tests/test_task.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the task class of the gym skill.""" +# pylint: skip-file from unittest.mock import patch diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index cb7dceecf0..5f79b2e097 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -12,8 +12,8 @@ fingerprint: dialogues.py: bafybeibdcgcmvl3g7gp7rvndrhih7fpj4qbeihdqodgqndjuaqsq3g27bm handlers.py: bafybeidxvskxngwlhdnxs2xwr54vch2wjks2l5gqtgr5t5bc2izpjfr3ti tests/__init__.py: bafybeigqjv34vhfwcxmri75l5opezgu66jsyjj7metj7lgk2jbx4rqztyy - tests/test_dialogues.py: bafybeib4xlhm5wttmtysti4dl7alfzbu44yepckdvzlaymhqvbh33mphc4 - tests/test_handlers.py: bafybeiczxf7u22cqzghdpw3uttl3h5g2n3hp4pbv5oien6kxhduoqnm3bi + tests/test_dialogues.py: bafybeidcprz5p7lnkx6rwscsud4wbggarxekkglbvbmjflpvo3gtja36m4 + tests/test_handlers.py: bafybeidvwci67koqhmuw27baj6ocgvyd46w5tqpecsxcl3xnmx742bduxy fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/packages/fetchai/skills/http_echo/tests/test_dialogues.py b/packages/fetchai/skills/http_echo/tests/test_dialogues.py index 2dff450ffc..e7fe2ce5d8 100644 --- a/packages/fetchai/skills/http_echo/tests/test_dialogues.py +++ b/packages/fetchai/skills/http_echo/tests/test_dialogues.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the dialogue classes of the http_echo skill.""" +# pylint: skip-file from pathlib import Path from typing import cast diff --git a/packages/fetchai/skills/http_echo/tests/test_handlers.py b/packages/fetchai/skills/http_echo/tests/test_handlers.py index eac6eb21fb..67e1205f2d 100644 --- a/packages/fetchai/skills/http_echo/tests/test_handlers.py +++ b/packages/fetchai/skills/http_echo/tests/test_handlers.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ """This module contains the tests of the handler class of the http_echo skill.""" +# pylint: skip-file import json import logging diff --git a/packages/hashes.csv b/packages/hashes.csv index eb1be14e1e..7f595eca34 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,14 +1,14 @@ -fetchai/agents/error_test,bafybeid7bscl55pa23hxashd5w63k7bmuqs2bbwrrwxzpqj4qhtcdnvjxy -fetchai/agents/gym_aea,bafybeicj6mhhpa2w4pgxv4d5z7sh3ioqnfgzhmflhjhkd5hllduplhhnqm -fetchai/agents/my_first_aea,bafybeicgzz4qikxgwmfpsbkikkfj4wtuvofsabgtyygbn3ysjazvgek2ma -fetchai/connections/gym,bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq -fetchai/connections/http_client,bafybeie54wumi37bnfrw2r56k47clgqxzld2utd25u64ttdutcur66aanm -fetchai/connections/http_server,bafybeic75e2m2sjczfleblza52qah5f6qrwsxtgn3jhxet7xhrf5qzx73i -fetchai/connections/ledger,bafybeiahhceeicxpaoejed277kj7dyycca3hg4kbrdqdvoni44ypiqiryu -fetchai/connections/local,bafybeifbypog54zkoaie6n4wjqpof4tc6trrf4uqvdmnpuyplzslarknpe -fetchai/connections/stub,bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 -fetchai/contracts/erc1155,bafybeihdibjr5tthaamqlmgjnslshcy4nhjp7oonjfbi6dwzc2oj5qkguy -fetchai/protocols/contract_api,bafybeihoyoowp5uycaqea2h67hckoclmazlnojcy46eu3hv4apznyaqym4 +fetchai/agents/error_test,bafybeidwl24szpryioadr6dvuy23mu5xrhipuwnwggo2xwgygpgapuiya4 +fetchai/agents/gym_aea,bafybeie4snsglobxssmxwqfvo4spl4t2y4lrcbbvvew7fophpw3h2kzijm +fetchai/agents/my_first_aea,bafybeig6pd52ego3xhh3ql5sggvsui4fgzrdddndmvo72pdsqeikub4yya +fetchai/connections/gym,bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm +fetchai/connections/http_client,bafybeia6ndganooh22hj2j5ahz52afqv5mex74z7o4rk3765lvx3nchmlu +fetchai/connections/http_server,bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy +fetchai/connections/ledger,bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq +fetchai/connections/local,bafybeieap44noopu2dst53ddwtsx6vpwakuhmobfrcicnsozhmkwaqylce +fetchai/connections/stub,bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 +fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi +fetchai/protocols/contract_api,bafybeiepagnggutqgxps5lwdxqfikwac5xz3wmv3ffsbjw5vzfuzvogxk4 fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy fetchai/protocols/fipa,bafybeiftyy2usf3d6cqfitr44fu3facgajt2kse7tmpl7d3aph3qq4gtca fetchai/protocols/gym,bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi @@ -17,24 +17,24 @@ fetchai/protocols/ledger_api,bafybeihdaudx3xyxvgvvnp47sp53ocukalmtblwl3vpkgh3rcs fetchai/protocols/oef_search,bafybeig5crswgwck6be5iutp6b5rscjtbc233w4m6at4vy5cgs2l6roipq fetchai/protocols/state_update,bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu fetchai/protocols/tac,bafybeiawv2dhrr4yao5z3nonw6a2qcnygdulzocbpxy63tykpzdy547iiy -fetchai/skills/echo,bafybeia6sgw3ppjl4y5hg5ha6mfqlo3hkvq7vkhonr3s4oubs2fow5ccyi -fetchai/skills/erc1155_client,bafybeihvy4vntio77pombeykzk3spgfkrqtuvk3mhavu3bfyxhoxfvcdji -fetchai/skills/erc1155_deploy,bafybeif3gfxopwvblrcjkvisacbaqkfpu56ujtyk2zybslyllktc2aj5fe +fetchai/skills/echo,bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana +fetchai/skills/erc1155_client,bafybeibskhvsi3hlpsapff2vilmg6n5iehibib432u2cesl34yp2nw7jfm +fetchai/skills/erc1155_deploy,bafybeihybcqeifzntrb7yl5pyiockyf6wn743rk66bxwvymmuycr2l6fkq fetchai/skills/error,bafybeiakq3bepacafpzmalnec3cdb6r4tchaocfjk54sg5q7t3qu2ggcbu fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeiawrtj27x3b5c4hjwyyfmm2jcji5blqzco7a4j6iof5sozppvigzu -fetchai/skills/generic_buyer,bafybeige2fqxoz4z7i3o7rfw2sfuv7ifdkjzp3smt34b5kci3cpip4zhxa -fetchai/skills/generic_seller,bafybeiabvyt4ftcxu25f66aqkgtxuxnebddd73mkqmseosocu6xu2vpsym -fetchai/skills/gym,bafybeibendxox7npijbsfqju74ptfl6y5b6s3ieufhiqzo44etveb6f5fq -fetchai/skills/http_echo,bafybeibk72ubyddpro426adfu5zqywy66es6qpsfvrklzovtmue5cvq7yy +fetchai/skills/generic_buyer,bafybeie3a2pkiubo3ym66wsixkkbbd5zyg6pidesq2cys4f3elezoi5bje +fetchai/skills/generic_seller,bafybeihovawdozvok2no3xgwnkpoixo3jwr6mfgf4t7ufut4tjggn4ky7q +fetchai/skills/gym,bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu +fetchai/skills/http_echo,bafybeihdep36vvgcysdlwjugkovydff5qtz2oo6hbucnofjbiw24fm2t2e fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeihpxqqsl22nbepfu6erfpb6rglcx756r6mxcn3bt2vh3cqhwcvztm -open_aea/agents/http_echo,bafybeigcrzzf43awj654puejjiir67pfec43h52dootqq4cxytb5lkvw4i -open_aea/agents/my_first_aea,bafybeibyrncegtdkyrdk7thwwedhzzbfd47alferuacswo5suu6mhorufe +open_aea/agents/gym_aea,bafybeihv77uv74uzwazh4v2poajs6bgos6tnqa7g5prjpxfxftmfs3ziu4 +open_aea/agents/http_echo,bafybeifggbqwsv7uhpfo7sjawnxr5ksmq7jcmjbtzqcew43w2ca4j6x64u +open_aea/agents/my_first_aea,bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze -open_aea/protocols/signing,bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +open_aea/protocols/signing,bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi open_aea/skills/scaffold,bafybeih3h7yia76rrbittnoeotpraiuho5rdqsnksuvncinaa3akgmnbaa valory/connections/p2p_libp2p,bafybeigmjwjggrxsjjl6mekzds2lmgi6dpj32hwa5giz6fub5vh7ukuvsu valory/connections/p2p_libp2p_client,bafybeif7plocy4y6bvhtb3bob3onsyt6lycyjzcdfk5ze72qa2xwqb4yji diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index ed9f462d92..15f7de46c5 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,15 +9,15 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeibmg5zg2qnakhjod2lth6hcjd66tyekt5g5b7zsf3lwxwg6w3ljtq +- fetchai/gym:0.19.0:bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/gym:1.0.0:bafybeifft3rinvv5ai2snys3rmwyx3swfmgdvl26e7mq3olpz4cjjb3hoi - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeibendxox7npijbsfqju74ptfl6y5b6s3ieufhiqzo44etveb6f5fq +- fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index c49ac87e09..9da2d58c4f 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeibkr6ecv5efx3hwxvxposvpmr76ugrj6kydeasb7bppo3ibynnjcu fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeic75e2m2sjczfleblza52qah5f6qrwsxtgn3jhxet7xhrf5qzx73i +- fetchai/http_server:0.22.0:bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/http:1.0.0:bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/http_echo:0.20.0:bafybeibk72ubyddpro426adfu5zqywy66es6qpsfvrklzovtmue5cvq7yy +- fetchai/http_echo:0.20.0:bafybeihdep36vvgcysdlwjugkovydff5qtz2oo6hbucnofjbiw24fm2t2e default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 8a8c17801c..ab58a3d7dc 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,14 +8,14 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeifjmpjdoichvst5h4c3qarhdvtztnvl2chrieryp24gwvkzafxn34 +- fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu -- open_aea/signing:1.0.0:bafybeieeg23kk6eqqsp3dlm72lbwub3qbvttgbn3yq7y2ccam7mdvgi7re +- open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/echo:0.19.0:bafybeia6sgw3ppjl4y5hg5ha6mfqlo3hkvq7vkhonr3s4oubs2fow5ccyi +- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: diff --git a/packages/open_aea/protocols/signing/protocol.yaml b/packages/open_aea/protocols/signing/protocol.yaml index 54b135e7bb..b687a474fd 100644 --- a/packages/open_aea/protocols/signing/protocol.yaml +++ b/packages/open_aea/protocols/signing/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: serialization.py: bafybeibxnsemtwyhyb4ztw453ojwzcwjrqth6ozvififmlszqrxsvui5i4 signing.proto: bafybeigbzr6x5wdmqzc7eanlz5xmvaoiwb4kwozgg3cugq63b7esicusra signing_pb2.py: bafybeihph4sio6j7s773dbzc46qrt7hyepxo6banh3c3arwuafoekuaddy - tests/test_signing.py: bafybeihshq34fct35lkq3qoaozihbqd34dypoynndphgqkewu5idi4w4mu + tests/test_signing.py: bafybeig764tzcgd6nkdmn4vsndtlcm2hfzoxd3u3tu2pz7y6o3w4ldcj7y fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/open_aea/protocols/signing/tests/test_signing.py b/packages/open_aea/protocols/signing/tests/test_signing.py index cb0a9807de..b1c1238ae2 100644 --- a/packages/open_aea/protocols/signing/tests/test_signing.py +++ b/packages/open_aea/protocols/signing/tests/test_signing.py @@ -19,6 +19,8 @@ # ------------------------------------------------------------------------------ """This module contains tests for transaction.""" +# pylint: skip-file + from typing import Type from unittest.mock import patch diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py index 1ec49317ea..69f10feb4b 100644 --- a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/docker_images.py @@ -24,6 +24,7 @@ import requests +from aea.exceptions import enforce from aea.test_tools.docker_image import DockerImage @@ -34,8 +35,6 @@ DockerClient = Any Container = Any -from aea.exceptions import enforce - logger = logging.getLogger(__name__) @@ -101,7 +100,7 @@ def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: response = requests.post(f"{self._addr}:{self._port}", json=request) enforce(response.status_code == 200, "") return True - except Exception: + except Exception: # pylint: disable=broad-except logger.info( "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate ) diff --git a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py index 7d575ae137..8f82ea3e6d 100644 --- a/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py +++ b/plugins/aea-ledger-ethereum/aea_ledger_ethereum/test_tools/fixture_helpers.py @@ -59,7 +59,7 @@ def _ganache_context( timeout: float = 2.0, max_attempts: int = 10, ): - import docker + import docker # pylint: disable=import-outside-toplevel,import-error client = docker.from_env() image = GanacheDockerImage( diff --git a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py index 5b6c95fda7..2205132eea 100644 --- a/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py +++ b/plugins/aea-ledger-fetchai/aea_ledger_fetchai/test_tools/docker_images.py @@ -130,7 +130,7 @@ def wait(self, max_attempts: int = 15, sleep_rate: float = 1.0) -> bool: response = requests.get(url) enforce(response.status_code == 200, "") return True - except Exception: + except Exception: # pylint: disable=broad-except logger.info( "Attempt %s failed. Retrying in %s seconds...", i, sleep_rate ) diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md index 5fe3383319..3b04ed912a 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md @@ -1,5 +1,5 @@ ``` bash -aea fetch open_aea/gym_aea:0.1.0:bafybeibtvxaqbm567cgek7de6nlx33cmwqvhvh4hfowr2zi4uioha4l23a --remote +aea fetch open_aea/gym_aea:0.1.0:bafybeihv77uv74uzwazh4v2poajs6bgos6tnqa7g5prjpxfxftmfs3ziu4 --remote cd gym_aea aea install ``` @@ -8,7 +8,7 @@ aea create my_gym_aea cd my_gym_aea ``` ``` bash -aea add skill fetchai/gym:0.20.0:bafybeieulblm3l5s4na6von3tb3hrlh3x7u7dvpclvn2sfvufapqw4wwha --remote +aea add skill fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu --remote ``` ``` bash aea config set agent.default_connection fetchai/gym:0.19.0 diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md index 8f1f9d793f..8a620b5260 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md @@ -3,7 +3,7 @@ aea create my_aea cd my_aea ``` ``` bash -aea add connection fetchai/http_server:0.22.0:bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey --remote +aea add connection fetchai/http_server:0.22.0:bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy --remote ``` ``` bash aea config set agent.default_connection fetchai/http_server:0.22.0 @@ -48,11 +48,11 @@ models: mkdir packages aea create my_aea cd my_aea -aea add connection fetchai/http_server:0.22.0:bafybeigjfapqfw32e34xhetu4laarftozc7ba7nq6akjf3kec3k7jz4pey --remote +aea add connection fetchai/http_server:0.22.0:bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy --remote aea push connection fetchai/http_server --local -aea add protocol fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm --remote +aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local -aea add protocol fetchai/http:1.0.0:bafybeie2gaufz5ydmxiucqoqnlxfs2psqds6ewmk6kv6zsm5bg67d6sgyq --remote +aea add protocol fetchai/http:1.0.0:bafybeidqqu3vjnf76slzz434ieo7qzkkilsjpstzxh7fcvn6ffvpkffgqq --remote aea push protocol fetchai/http --local cd .. aea delete my_aea diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md b/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md index c32dfa3289..baa1698089 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md @@ -1,6 +1,6 @@ ``` bash pipenv shell -aea fetch open_aea/http_echo:0.1.0:bafybeicpwv6wpgc6qmzekrmddunfnjaziiksf6wbfyqzqyazons2vtrph4 --remote +aea fetch open_aea/http_echo:0.1.0:bafybeifggbqwsv7uhpfo7sjawnxr5ksmq7jcmjbtzqcew43w2ca4j6x64u --remote cd http_echo aea generate-key ethereum; aea add-key ethereum aea install diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index 57c53c64dc..a1e1f4b59d 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -72,7 +72,7 @@ v1.7.0 AEA configurations successfully initialized: {'author': 'fetchai'} ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote cd my_first_aea ``` ``` bash @@ -158,19 +158,19 @@ aea delete my_first_aea ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote cd my_first_aea ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote cd my_first_aea ``` ```bash mkdir packages cd my_first_aea -aea add protocol fetchai/default:1.0.0:bafybeibvtmpfzlig3ngtz6x2omc2rlx5knltnunbmg37tih5wlxnrfszvm --remote +aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local cd .. aea delete my_aea diff --git a/tests/test_protocols/test_base.py b/tests/test_protocols/test_base.py index 17f727d6fe..2386bed7fa 100644 --- a/tests/test_protocols/test_base.py +++ b/tests/test_protocols/test_base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021 Valory AG +# Copyright 2021-2022 Valory AG # Copyright 2018-2019 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); From 168efc7c9a3e7b57394c12de3fc9a90c07c9b6f1 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 17:56:39 +0200 Subject: [PATCH 58/93] chore: remove protocol generator check --- .github/workflows/workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a05ca4dac6..6d7f9f12c4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -139,8 +139,8 @@ jobs: run: tox -e package_version_checks - name: Check package dependencies run: tox -e package_dependencies_checks - - name: Check generate protocols - run: tox -e check_generate_all_protocols + # - name: Check generate protocols + # run: tox -e check_generate_all_protocols - name: Generate Documentation run: tox -e docs From e35859ab8de85399b21ea6d9debcdfc948aa4388 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 17:57:03 +0200 Subject: [PATCH 59/93] chore: fix hashes in docs --- docs/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quickstart.md b/docs/quickstart.md index 7c16cd40ba..a3267c247a 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -168,7 +168,7 @@ This is a simple demo that introduces you to the main components of an AEA. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote cd my_first_aea ``` ### Install AEA dependencies From 2a9b597316c1690c9e7d570079ef791b6a4d612d Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 18:02:41 +0200 Subject: [PATCH 60/93] chore: fix package hashes, remove DS_Store --- docs/gym-skill.md | 2 +- packages/fetchai/agents/gym_aea/aea-config.yaml | 4 ++-- packages/fetchai/skills/gym/skill.yaml | 2 +- packages/hashes.csv | 8 ++++---- packages/open_aea/agents/gym_aea/aea-config.yaml | 4 ++-- tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/gym-skill.md b/docs/gym-skill.md index f2ab93cc63..89db689b21 100644 --- a/docs/gym-skill.md +++ b/docs/gym-skill.md @@ -36,7 +36,7 @@ cd my_gym_aea ### Add the gym skill ``` bash -aea add skill fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu --remote +aea add skill fetchai/gym:0.20.0:bafybeiaxkoymzkrgi5pmaxb26ewwmcfricbzqxl4bnitqqzsggl5juyv64 --remote ``` ### Set gym connection as default diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index 0d73a93fb8..938bb4e898 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm +- fetchai/gym:0.19.0:bafybeihwcra7defbz4yo2lgwy22a7bzy2f7mojra2q7h5yee6czyzhe3oe contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu +- fetchai/gym:0.20.0:bafybeiaxkoymzkrgi5pmaxb26ewwmcfricbzqxl4bnitqqzsggl5juyv64 default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index a1f06db409..9c429e7b50 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -23,7 +23,7 @@ fingerprint: tests/test_task.py: bafybeic4y7wulvlx2eparks3wyftfsx5ya2xsufoaohxfqhxrabm7zt7pi fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm +- fetchai/gym:0.19.0:bafybeihwcra7defbz4yo2lgwy22a7bzy2f7mojra2q7h5yee6czyzhe3oe contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/hashes.csv b/packages/hashes.csv index 7f595eca34..d74ae92c82 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,7 +1,7 @@ fetchai/agents/error_test,bafybeidwl24szpryioadr6dvuy23mu5xrhipuwnwggo2xwgygpgapuiya4 -fetchai/agents/gym_aea,bafybeie4snsglobxssmxwqfvo4spl4t2y4lrcbbvvew7fophpw3h2kzijm +fetchai/agents/gym_aea,bafybeiaylegukiehopjddi3fyua5pohu7fmpxce34a62gaqqxbvuj3vcsa fetchai/agents/my_first_aea,bafybeig6pd52ego3xhh3ql5sggvsui4fgzrdddndmvo72pdsqeikub4yya -fetchai/connections/gym,bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm +fetchai/connections/gym,bafybeihwcra7defbz4yo2lgwy22a7bzy2f7mojra2q7h5yee6czyzhe3oe fetchai/connections/http_client,bafybeia6ndganooh22hj2j5ahz52afqv5mex74z7o4rk3765lvx3nchmlu fetchai/connections/http_server,bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy fetchai/connections/ledger,bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq @@ -25,10 +25,10 @@ fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6at fetchai/skills/fipa_dummy_buyer,bafybeiawrtj27x3b5c4hjwyyfmm2jcji5blqzco7a4j6iof5sozppvigzu fetchai/skills/generic_buyer,bafybeie3a2pkiubo3ym66wsixkkbbd5zyg6pidesq2cys4f3elezoi5bje fetchai/skills/generic_seller,bafybeihovawdozvok2no3xgwnkpoixo3jwr6mfgf4t7ufut4tjggn4ky7q -fetchai/skills/gym,bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu +fetchai/skills/gym,bafybeiaxkoymzkrgi5pmaxb26ewwmcfricbzqxl4bnitqqzsggl5juyv64 fetchai/skills/http_echo,bafybeihdep36vvgcysdlwjugkovydff5qtz2oo6hbucnofjbiw24fm2t2e fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeihv77uv74uzwazh4v2poajs6bgos6tnqa7g5prjpxfxftmfs3ziu4 +open_aea/agents/gym_aea,bafybeib3ezmhbsnq6s66xtgofhwwg2rcrj7he5n37wouytdga3kp5ute6m open_aea/agents/http_echo,bafybeifggbqwsv7uhpfo7sjawnxr5ksmq7jcmjbtzqcew43w2ca4j6x64u open_aea/agents/my_first_aea,bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 15f7de46c5..b49b20da2a 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -9,7 +9,7 @@ fingerprint: README.md: bafybeiadln5ca6tu6rzbsgjpeluf6nz5efxl3u223c3vxwgf2iynkj5n6q fingerprint_ignore_patterns: [] connections: -- fetchai/gym:0.19.0:bafybeic64c2sblm64o7l7zqjgmuqrns2t7bpwlo5unycdvrudd65qnyjmm +- fetchai/gym:0.19.0:bafybeihwcra7defbz4yo2lgwy22a7bzy2f7mojra2q7h5yee6czyzhe3oe contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu +- fetchai/gym:0.20.0:bafybeiaxkoymzkrgi5pmaxb26ewwmcfricbzqxl4bnitqqzsggl5juyv64 default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md index 3b04ed912a..458042b0d4 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md @@ -8,7 +8,7 @@ aea create my_gym_aea cd my_gym_aea ``` ``` bash -aea add skill fetchai/gym:0.20.0:bafybeiaqp5ypxr4iktijprk3drmad2u4sy2gpq3ig7iybjgabr4mo36uiu --remote +aea add skill fetchai/gym:0.20.0:bafybeiaxkoymzkrgi5pmaxb26ewwmcfricbzqxl4bnitqqzsggl5juyv64 --remote ``` ``` bash aea config set agent.default_connection fetchai/gym:0.19.0 From f7749c5cd77ab8507ad98ff8db1fdc52926a3017 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 18:09:02 +0200 Subject: [PATCH 61/93] chore: ignore test file in stub connection --- docs/agent-vs-aea.md | 2 +- docs/echo_demo.md | 2 +- docs/gym-skill.md | 2 +- docs/multiplexer-standalone.md | 2 +- docs/quickstart.md | 2 +- packages/fetchai/agents/error_test/aea-config.yaml | 2 +- packages/fetchai/agents/my_first_aea/aea-config.yaml | 2 +- packages/fetchai/connections/stub/connection.yaml | 4 ++-- packages/hashes.csv | 8 ++++---- packages/open_aea/agents/my_first_aea/aea-config.yaml | 2 +- tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md | 2 +- .../test_docs/test_bash_yaml/md_files/bash-quickstart.md | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md index e8ac6ca532..375f390674 100644 --- a/docs/agent-vs-aea.md +++ b/docs/agent-vs-aea.md @@ -11,7 +11,7 @@ First, use an empty agent to get the stub connection and default protocol. mkdir packages # packages folder will contain the local package repository aea create my_aea # create an agent cd my_aea -aea add connection fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 --remote # get a connection from the remote registry +aea add connection fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju --remote # get a connection from the remote registry aea push connection fetchai/stub --local # push to local registry aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local diff --git a/docs/echo_demo.md b/docs/echo_demo.md index 7934cc521f..d385a9c14b 100644 --- a/docs/echo_demo.md +++ b/docs/echo_demo.md @@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/docs/gym-skill.md b/docs/gym-skill.md index 89db689b21..fd065f0109 100644 --- a/docs/gym-skill.md +++ b/docs/gym-skill.md @@ -19,7 +19,7 @@ Follow the Preliminaries and Second, add the stub connection to the project. ``` bash -aea add connection fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 --remote +aea add connection fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju --remote ```
Add the echo skill diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 1599cdda90..0927cf994c 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 +- fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 45fd4ffaf1..7962b31141 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 +- fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index 5c51def61c..a25bdafecf 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -10,10 +10,10 @@ fingerprint: README.md: bafybeiht3qtxpf2meyrveoghidjtdsz433wguz4wlxhzsiixpafkrjv7yy __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 - input_file: bafybeiftu27piztiu5bfxbvhqsbppgtseykyfot6wtlrrzeuzya6zrgpky tests/__init__.py: bafybeiadaetciszcob7cchexib74l7vecczthsx2pzaan7sp7csrkgjxce tests/test_stub.py: bafybeihu2smaadptjzzbrkrv4bae2l4bmd6ozidetlwrmnas2az7tgbqy4 -fingerprint_ignore_patterns: [] +fingerprint_ignore_patterns: +- ./input_file connections: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/hashes.csv b/packages/hashes.csv index d74ae92c82..a473ee929f 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeidwl24szpryioadr6dvuy23mu5xrhipuwnwggo2xwgygpgapuiya4 +fetchai/agents/error_test,bafybeia4wk2ux7w2avqkxfuzgqx5ub2hwlvg4lxwidyd5hvnmw22ytirkq fetchai/agents/gym_aea,bafybeiaylegukiehopjddi3fyua5pohu7fmpxce34a62gaqqxbvuj3vcsa -fetchai/agents/my_first_aea,bafybeig6pd52ego3xhh3ql5sggvsui4fgzrdddndmvo72pdsqeikub4yya +fetchai/agents/my_first_aea,bafybeiazwjc6idiejodkerwib7xqvsx75gsub7hu7nnqrh2wfigwumk5re fetchai/connections/gym,bafybeihwcra7defbz4yo2lgwy22a7bzy2f7mojra2q7h5yee6czyzhe3oe fetchai/connections/http_client,bafybeia6ndganooh22hj2j5ahz52afqv5mex74z7o4rk3765lvx3nchmlu fetchai/connections/http_server,bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy fetchai/connections/ledger,bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq fetchai/connections/local,bafybeieap44noopu2dst53ddwtsx6vpwakuhmobfrcicnsozhmkwaqylce -fetchai/connections/stub,bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 +fetchai/connections/stub,bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeiepagnggutqgxps5lwdxqfikwac5xz3wmv3ffsbjw5vzfuzvogxk4 fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeihdep36vvgcysdlwjugkovydff5qtz2oo6hbucnofjbiw24fm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeib3ezmhbsnq6s66xtgofhwwg2rcrj7he5n37wouytdga3kp5ute6m open_aea/agents/http_echo,bafybeifggbqwsv7uhpfo7sjawnxr5ksmq7jcmjbtzqcew43w2ca4j6x64u -open_aea/agents/my_first_aea,bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga +open_aea/agents/my_first_aea,bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index ab58a3d7dc..6b7ff348ce 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihetrz4p6lxiwqbt5fzs5v5xrk6adsqhzdsro5awv64ryn5lytw74 +- fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md index 458042b0d4..32fd8a53a9 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md @@ -1,5 +1,5 @@ ``` bash -aea fetch open_aea/gym_aea:0.1.0:bafybeihv77uv74uzwazh4v2poajs6bgos6tnqa7g5prjpxfxftmfs3ziu4 --remote +aea fetch open_aea/gym_aea:0.1.0:bafybeib3ezmhbsnq6s66xtgofhwwg2rcrj7he5n37wouytdga3kp5ute6m --remote cd gym_aea aea install ``` diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index a1e1f4b59d..26e876aea3 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -72,7 +72,7 @@ v1.7.0 AEA configurations successfully initialized: {'author': 'fetchai'} ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote cd my_first_aea ``` ``` bash @@ -158,12 +158,12 @@ aea delete my_first_aea ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote cd my_first_aea ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote cd my_first_aea ``` From 36a1494f500e46e014d2cbd19ba1227add8803f6 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 18:14:42 +0200 Subject: [PATCH 62/93] chore: ignore test file in stub connection --- docs/agent-vs-aea.md | 2 +- docs/echo_demo.md | 2 +- docs/multiplexer-standalone.md | 2 +- docs/quickstart.md | 2 +- packages/fetchai/agents/error_test/aea-config.yaml | 2 +- packages/fetchai/agents/my_first_aea/aea-config.yaml | 2 +- packages/hashes.csv | 8 ++++---- packages/open_aea/agents/my_first_aea/aea-config.yaml | 2 +- .../test_docs/test_bash_yaml/md_files/bash-quickstart.md | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md index 375f390674..8d038d993a 100644 --- a/docs/agent-vs-aea.md +++ b/docs/agent-vs-aea.md @@ -11,7 +11,7 @@ First, use an empty agent to get the stub connection and default protocol. mkdir packages # packages folder will contain the local package repository aea create my_aea # create an agent cd my_aea -aea add connection fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju --remote # get a connection from the remote registry +aea add connection fetchai/stub:0.21.0:bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta --remote # get a connection from the remote registry aea push connection fetchai/stub --local # push to local registry aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push protocol fetchai/default --local diff --git a/docs/echo_demo.md b/docs/echo_demo.md index d385a9c14b..00b3cf10d9 100644 --- a/docs/echo_demo.md +++ b/docs/echo_demo.md @@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/docs/multiplexer-standalone.md b/docs/multiplexer-standalone.md index baa0e4be39..30a6a8cda0 100644 --- a/docs/multiplexer-standalone.md +++ b/docs/multiplexer-standalone.md @@ -8,7 +8,7 @@ aea create my_aea cd my_aea aea add protocol fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy --remote aea push connection fetchai/default --local -aea add connection fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju --remote +aea add connection fetchai/stub:0.21.0:bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta --remote aea push connection fetchai/stub --local cd .. aea delete my_aea diff --git a/docs/quickstart.md b/docs/quickstart.md index 43fb905c85..c4495609b3 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -264,7 +264,7 @@ cd my_first_aea
Second, add the stub connection to the project. ``` bash -aea add connection fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju --remote +aea add connection fetchai/stub:0.21.0:bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta --remote ```
Add the echo skill diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 0927cf994c..d505fa24d0 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju +- fetchai/stub:0.21.0:bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 7962b31141..aec253dbd5 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju +- fetchai/stub:0.21.0:bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/hashes.csv b/packages/hashes.csv index a473ee929f..2212540028 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeia4wk2ux7w2avqkxfuzgqx5ub2hwlvg4lxwidyd5hvnmw22ytirkq +fetchai/agents/error_test,bafybeifuwkau2gb5zzwwn52kyu4v6jg3c2rqyzixifjg546dfftsxj4gnu fetchai/agents/gym_aea,bafybeiaylegukiehopjddi3fyua5pohu7fmpxce34a62gaqqxbvuj3vcsa -fetchai/agents/my_first_aea,bafybeiazwjc6idiejodkerwib7xqvsx75gsub7hu7nnqrh2wfigwumk5re +fetchai/agents/my_first_aea,bafybeibn5pavydkefq6jfowfo56ewokog44ay5bqtrbgtyrxcy4dyw5n54 fetchai/connections/gym,bafybeihwcra7defbz4yo2lgwy22a7bzy2f7mojra2q7h5yee6czyzhe3oe fetchai/connections/http_client,bafybeia6ndganooh22hj2j5ahz52afqv5mex74z7o4rk3765lvx3nchmlu fetchai/connections/http_server,bafybeihsxwd3cu2ahhugouz6hfxo2zspeaheh4hc3fftdrjxe75gao73vy fetchai/connections/ledger,bafybeia5p7pa7z2wwgwbr5z6ag6x6b3zmcjyerdt476ddg2zbm2pz64xjq fetchai/connections/local,bafybeieap44noopu2dst53ddwtsx6vpwakuhmobfrcicnsozhmkwaqylce -fetchai/connections/stub,bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju +fetchai/connections/stub,bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeiepagnggutqgxps5lwdxqfikwac5xz3wmv3ffsbjw5vzfuzvogxk4 fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeihdep36vvgcysdlwjugkovydff5qtz2oo6hbucnofjbiw24fm fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeib3ezmhbsnq6s66xtgofhwwg2rcrj7he5n37wouytdga3kp5ute6m open_aea/agents/http_echo,bafybeifggbqwsv7uhpfo7sjawnxr5ksmq7jcmjbtzqcew43w2ca4j6x64u -open_aea/agents/my_first_aea,bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe +open_aea/agents/my_first_aea,bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 6b7ff348ce..6aa4c6cb63 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeihcojrfjfrwvkpbnujjs5hh7ettcb4zv2n7akrkpjnql7ie2oacju +- fetchai/stub:0.21.0:bafybeiayeaqz3zqg2o7gmjx4cx5xvadpvw42exm36uaynqryrmxdlsamta contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index 26e876aea3..a50d260e01 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -72,7 +72,7 @@ v1.7.0 AEA configurations successfully initialized: {'author': 'fetchai'} ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote cd my_first_aea ``` ``` bash @@ -158,12 +158,12 @@ aea delete my_first_aea ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote cd my_first_aea ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeicurre2nejardtm5djqvf536u5e5fslwftnpgqc3wlyw2ahhufkwe --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote cd my_first_aea ``` From 97534df3bd83d787362bdda6c181aa67129a4fa9 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 19:04:06 +0200 Subject: [PATCH 63/93] chore: fix linters --- .pylintrc | 2 +- aea/cli/test.py | 10 ++++++---- docs/gym-skill.md | 2 +- docs/http-connection-and-skill.md | 2 +- docs/quickstart.md | 2 +- setup.cfg | 3 +++ .../test_bash_yaml/md_files/bash-gym-skill.md | 2 +- .../md_files/bash-http-connection-and-skill.md | 4 ++-- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.pylintrc b/.pylintrc index e4ff8d7f27..d408235d5c 100644 --- a/.pylintrc +++ b/.pylintrc @@ -22,7 +22,7 @@ disable=C0103,C0201,C0301,C0302,W0105,W0707,W1202,W1203,R0801,E1136 # W0212: protected-access [IMPORTS] -ignored-modules=bech32,ecdsa,lru,eth_typing,eth_keys,eth_account,ipfshttpclient,werkzeug,openapi_spec_validator,aiohttp,multidict,yoti_python_sdk,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,web3,aioprometheus,pyaes,Crypto,asn1crypto,cosmpy,google +ignored-modules=bech32,ecdsa,lru,eth_typing,eth_keys,eth_account,ipfshttpclient,werkzeug,openapi_spec_validator,aiohttp,multidict,yoti_python_sdk,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,web3,aioprometheus,pyaes,Crypto,asn1crypto,cosmpy,google,coverage [DESIGN] min-public-methods=1 diff --git a/aea/cli/test.py b/aea/cli/test.py index 809978ac0e..c8f12385e1 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -19,6 +19,7 @@ # ------------------------------------------------------------------------------ """Implementation of the 'aea test' command.""" +import os import sys import tempfile import time @@ -153,7 +154,7 @@ def by_path( @pass_ctx def packages( ctx: Context, - args: Sequence[str], + args: Sequence[str], # pylint: disable=unused-argument ) -> None: """Executes a test suite of a package specified by a path.""" packages_dir = Path(ctx.registry_path) @@ -187,7 +188,7 @@ def packages( [ package_dir / AEA_TEST_DIRNAME, f"--cov={package_dir.absolute()}", - f"--doctest-modules", + "--doctest-modules", str(package_dir.absolute()), f"--cov-config={covrc_file}", "--cov-report=term", @@ -210,7 +211,7 @@ def packages( coverage(argv=["html", f"--rcfile={covrc_file}"]) coverage(argv=["xml", f"--rcfile={covrc_file}"]) - if len(failures): + if len(failures) > 0: click.echo("Failed tests") click.echo("Exit Code\tPackage") for exit_code, package in failures: @@ -311,6 +312,7 @@ def test_package_by_path( :param pytest_arguments: arguments to forward to Pytest :param aea_project_path: directory to the AEA project :param packages_dir: directory of the packages to import from + :param cov: coverage capture indicator """ load_package(package_dir, aea_project_path, packages_dir) @@ -334,7 +336,7 @@ def run_pytest( runtime_args.extend( [ f"--cov={package_dir.absolute()}", - f"--doctest-modules", + "--doctest-modules", str(package_dir.absolute()), "--cov-report=term", "--cov-report=term-missing", diff --git a/docs/gym-skill.md b/docs/gym-skill.md index 6eddc1024c..a43b551ebf 100644 --- a/docs/gym-skill.md +++ b/docs/gym-skill.md @@ -19,7 +19,7 @@ Follow the Preliminaries and Date: Thu, 1 Sep 2022 19:12:25 +0200 Subject: [PATCH 64/93] chore: add coverage dependency --- Makefile | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e455e60a79..e993d6bd57 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ generators: .PHONY: common-checks-1 common-checks: - tox -p -e check-copyright -e hash_check -e package-dependencies-checks + tox -p -e check-copyright -e hash-check -e package-dependencies-checks .PHONY: common-checks-2 common-checks-2: diff --git a/setup.py b/setup.py index 59826828cf..b228794e10 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ def get_all_extras() -> Dict: "jsonschema>=3.0.0,<4.0.0", "packaging>=20.3,<22.0", "pytest>=7.0.0,<7.2.0", + "pytest-cov==3.0.0", "semver>=2.9.1,<3.0.0", ] From b9d70011e96c5616bff0139a79e9afc8a6beb38b Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 19:39:29 +0200 Subject: [PATCH 65/93] chore: fix linters --- deploy-image/build.sh | 2 +- docs/quickstart.md | 2 +- setup.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deploy-image/build.sh b/deploy-image/build.sh index 949012d2dc..0b6da2df64 100644 --- a/deploy-image/build.sh +++ b/deploy-image/build.sh @@ -2,7 +2,7 @@ set -e # setup the agent -aea fetch open_aea/my_first_aea:0.1.0:bafybeibnjfr3sdg57ggyxbcfkh42yqkj6a3gftp55l26aaw2z2jvvc3tny --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote cd my_first_aea/ aea install aea build diff --git a/docs/quickstart.md b/docs/quickstart.md index c4495609b3..2a7f6e68dc 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -168,7 +168,7 @@ This is a simple demo that introduces you to the main components of an AEA. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeidr6ucplhpd27vof5qpmo7iekl277i3tprts22iyeprbmjlsuuaga --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/setup.py b/setup.py index b228794e10..59826828cf 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ def get_all_extras() -> Dict: "jsonschema>=3.0.0,<4.0.0", "packaging>=20.3,<22.0", "pytest>=7.0.0,<7.2.0", - "pytest-cov==3.0.0", "semver>=2.9.1,<3.0.0", ] From 7a3699d5c1e9c06cea73b4cab60d28ca3444298d Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 19:43:43 +0200 Subject: [PATCH 66/93] chore: fix setup.py deps --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 59826828cf..73b20a6ae3 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ def get_all_extras() -> Dict: "jsonschema>=3.0.0,<4.0.0", "packaging>=20.3,<22.0", "pytest>=7.0.0,<7.2.0", + "coverage>=6.4.4,<7.0.0", "semver>=2.9.1,<3.0.0", ] From dc06dbe9440e4a69f2caee448b8b7dd29e6b38e7 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 23:29:43 +0200 Subject: [PATCH 67/93] chore: fix tests --- aea/configurations/constants.py | 2 +- deploy-image/build.sh | 2 +- docs/echo_demo.md | 2 +- docs/quickstart.md | 2 +- packages/fetchai/agents/error_test/aea-config.yaml | 2 +- packages/fetchai/agents/my_first_aea/aea-config.yaml | 2 +- packages/fetchai/connections/stub/connection.yaml | 3 +-- packages/fetchai/connections/stub/tests/test_stub.py | 5 ++--- packages/hashes.csv | 8 ++++---- packages/open_aea/agents/my_first_aea/aea-config.yaml | 2 +- tests/test_aea.py | 2 ++ tests/test_aea_builder.py | 10 +++++++--- tests/test_cli/test_test.py | 4 ---- .../test_bash_yaml/md_files/bash-quickstart.md | 6 +++--- tests/test_examples/test_gym_ex.py | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py index 965069b90b..4767deaec3 100644 --- a/aea/configurations/constants.py +++ b/aea/configurations/constants.py @@ -29,7 +29,7 @@ _COSMOS_IDENTIFIER = "cosmos" SIGNING_PROTOCOL = "open_aea/signing:latest" SIGNING_PROTOCOL_WITH_HASH = ( - "open_aea/signing:1.0.0:bafybeighvx4vpsyspffggewidvkfq3lqbse6ap4tdewd6j5bs73ifnuaui" + "open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi" ) DEFAULT_LEDGER = _ETHEREUM_IDENTIFIER PRIVATE_KEY_PATH_SCHEMA = "{}_private_key.txt" diff --git a/deploy-image/build.sh b/deploy-image/build.sh index 0b6da2df64..b8cae8ee2e 100644 --- a/deploy-image/build.sh +++ b/deploy-image/build.sh @@ -2,7 +2,7 @@ set -e # setup the agent -aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote cd my_first_aea/ aea install aea build diff --git a/docs/echo_demo.md b/docs/echo_demo.md index 130367122c..d0959c4b64 100644 --- a/docs/echo_demo.md +++ b/docs/echo_demo.md @@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeigzotit7mipzrcp35j76m7ciq32z3n5jw3243eraeeglxm7wz4kju --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/docs/quickstart.md b/docs/quickstart.md index 1fa110f0b6..096dc61af2 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -168,7 +168,7 @@ This is a simple demo that introduces you to the main components of an AEA. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeieosuwomgx5mviv2jposmwf7xaau33mjrllgvasnipyvsw2eok3yu --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 4ebf14eae3..82b6ffab2e 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeieyoxxddnyqn7mibgeeld3bdkk32bspahqob7gfpqh4cbjopwh5jy +- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 94f949678c..9bf9764681 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeieyoxxddnyqn7mibgeeld3bdkk32bspahqob7gfpqh4cbjopwh5jy +- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index 8570484685..fdadfd9a6b 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -11,13 +11,12 @@ fingerprint: __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 tests/__init__.py: bafybeiadaetciszcob7cchexib74l7vecczthsx2pzaan7sp7csrkgjxce - tests/test_stub.py: bafybeihu2smaadptjzzbrkrv4bae2l4bmd6ozidetlwrmnas2az7tgbqy4 + tests/test_stub.py: bafybeianazzo5ejeleukcccizx4byd7xa6ea2sikwl3mjamyk3zzck5l3m fingerprint_ignore_patterns: - ./input_file connections: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy -- fetchai/oef_search:1.0.0:bafybeihdy3p7hjlh2vjkehfer5gfgjvqb666faupv4e7hgnxpgz2r7rwai class_name: StubConnection config: input_file: ./input_file diff --git a/packages/fetchai/connections/stub/tests/test_stub.py b/packages/fetchai/connections/stub/tests/test_stub.py index 8967ffbcf2..eb7f40456f 100644 --- a/packages/fetchai/connections/stub/tests/test_stub.py +++ b/packages/fetchai/connections/stub/tests/test_stub.py @@ -46,7 +46,6 @@ write_envelope, ) from packages.fetchai.protocols.default.message import DefaultMessage -from packages.fetchai.protocols.oef_search.message import OefSearchMessage SEPARATOR = "," @@ -159,11 +158,11 @@ def test_reception_b(self): def test_reception_c(self): """Test that the connection receives what has been enqueued in the input file.""" - encoded_envelope = b"0x5E22777dD831A459535AA4306AceC9cb22eC4cB5,default_oef,fetchai/oef_search:1.0.0,\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd," + encoded_envelope = b"0x5E22777dD831A459535AA4306AceC9cb22eC4cB5,default_oef,fetchai/default:1.0.0,\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd," expected_envelope = Envelope( to="0x5E22777dD831A459535AA4306AceC9cb22eC4cB5", sender="default_oef", - protocol_specification_id=OefSearchMessage.protocol_specification_id, + protocol_specification_id=DefaultMessage.protocol_specification_id, message=b"\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd", ) with open(self.input_file_path, "ab+") as f: diff --git a/packages/hashes.csv b/packages/hashes.csv index d5ce66f312..538eee04f6 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeidmbcom6ncmfcskxos6kqmykyk2jsgcfnemmcoaa6czwxtmz7saaa +fetchai/agents/error_test,bafybeieqovdbxjzeh6ajnxbn43flgc7mulps2kxyxng5moe56josqjkfa4 fetchai/agents/gym_aea,bafybeiajld24e55yzrnazizgnrqzb55qyahmaqo56ezrkfxh6dadyogttq -fetchai/agents/my_first_aea,bafybeid5qcqmh62y7sdrowqfgwz6mbon6w3wheipvjw6rmyo4eeugip56a +fetchai/agents/my_first_aea,bafybeihoe4zlwjezcvbqbqbspdlmzt4tvvw34kgk35vjrzhop43ow6utzi fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy fetchai/connections/ledger,bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue -fetchai/connections/stub,bafybeieyoxxddnyqn7mibgeeld3bdkk32bspahqob7gfpqh4cbjopwh5jy +fetchai/connections/stub,bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqz fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm open_aea/agents/http_echo,bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe -open_aea/agents/my_first_aea,bafybeigzotit7mipzrcp35j76m7ciq32z3n5jw3243eraeeglxm7wz4kju +open_aea/agents/my_first_aea,bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 9b29f44b83..e4fa8d7faf 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeieyoxxddnyqn7mibgeeld3bdkk32bspahqob7gfpqh4cbjopwh5jy +- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/tests/test_aea.py b/tests/test_aea.py index 740c08f81f..f9d9917561 100644 --- a/tests/test_aea.py +++ b/tests/test_aea.py @@ -177,6 +177,7 @@ def test_react(): builder.add_protocol( Path(ROOT_DIR, "packages", "fetchai", "protocols", "default") ) + builder.add_protocol(Path(ROOT_DIR, "packages", "fetchai", "protocols", "fipa")) builder.add_connection( Path(ROOT_DIR, "packages", "fetchai", "connections", "local") ) @@ -357,6 +358,7 @@ def test_initialize_aea_programmatically(): builder.add_protocol( Path(ROOT_DIR, "packages", "fetchai", "protocols", "default") ) + builder.add_protocol(Path(ROOT_DIR, "packages", "fetchai", "protocols", "fipa")) builder.add_connection( Path(ROOT_DIR, "packages", "fetchai", "connections", "local") ) diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py index 3d8f07277e..ef3a611020 100644 --- a/tests/test_aea_builder.py +++ b/tests/test_aea_builder.py @@ -179,9 +179,6 @@ class TestReentrancy: @classmethod def setup_class(cls): """Set up the test.""" - protocol_path = os.path.join( - ROOT_DIR, "packages", "fetchai", "protocols", "oef_search" - ) connection_path = os.path.join( ROOT_DIR, "packages", "fetchai", "connections", "local" ) @@ -189,6 +186,13 @@ def setup_class(cls): builder = AEABuilder() builder.set_name("aea1") builder.add_private_key(DEFAULT_LEDGER) + protocol_path = os.path.join( + ROOT_DIR, "packages", "fetchai", "protocols", "oef_search" + ) + builder.add_protocol(protocol_path) + protocol_path = os.path.join( + ROOT_DIR, "packages", "fetchai", "protocols", "fipa" + ) builder.add_protocol(protocol_path) protocol = os.path.join(ROOT_DIR, "packages", "fetchai", "protocols", "default") builder.add_component(ComponentType.PROTOCOL, protocol) diff --git a/tests/test_cli/test_test.py b/tests/test_cli/test_test.py index 395fdbee94..648644ba94 100644 --- a/tests/test_cli/test_test.py +++ b/tests/test_cli/test_test.py @@ -324,8 +324,6 @@ def test_run(self, package_type: ComponentType, mock_sys_modules) -> None: result = self.run_test_command( "by-path", str(package_dirpath), - "--registry-path", - str(self.t / self.packages_dir_path), ) assert result.exit_code == NO_TESTS_COLLECTED_PYTEST_EXIT_CODE @@ -346,7 +344,5 @@ def test_run( result = self.run_test_command( "by-path", str(package_dirpath), - "--registry-path", - str(self.t / self.packages_dir_path), ) assert result.exit_code == OK_PYTEST_EXIT_CODE diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index 4e7912490c..0a57bcb054 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -72,7 +72,7 @@ v1.7.0 AEA configurations successfully initialized: {'author': 'fetchai'} ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeigzotit7mipzrcp35j76m7ciq32z3n5jw3243eraeeglxm7wz4kju --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote cd my_first_aea ``` ``` bash @@ -158,12 +158,12 @@ aea delete my_first_aea ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeigzotit7mipzrcp35j76m7ciq32z3n5jw3243eraeeglxm7wz4kju --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote cd my_first_aea ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeigzotit7mipzrcp35j76m7ciq32z3n5jw3243eraeeglxm7wz4kju --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote cd my_first_aea ``` diff --git a/tests/test_examples/test_gym_ex.py b/tests/test_examples/test_gym_ex.py index 6e021074ed..15cb495449 100644 --- a/tests/test_examples/test_gym_ex.py +++ b/tests/test_examples/test_gym_ex.py @@ -90,7 +90,7 @@ def teardown_class(cls): pass -def test_gym_env_load(self): +def test_gym_env_load(): """Load gym env from file.""" try: curdir = os.getcwd() @@ -100,7 +100,7 @@ def test_gym_env_load(self): connection_id=GymConnection.connection_id, env=gym_env_path ) identity = Identity( - "name", address=self.agent_address, public_key=self.agent_public_key + "name", address="agent_address", public_key="agent_public_key" ) gym_con = GymConnection( gym_env=None, From 6aec1cade78164e3399aa62b9b9e3048ade589c9 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Thu, 1 Sep 2022 23:55:00 +0200 Subject: [PATCH 68/93] chore: remove test artifact --- Makefile | 1 + deploy-image/build.sh | 2 +- docs/echo_demo.md | 2 +- docs/quickstart.md | 2 +- packages/fetchai/agents/error_test/aea-config.yaml | 2 +- packages/fetchai/agents/my_first_aea/aea-config.yaml | 2 +- packages/hashes.csv | 8 ++++---- packages/open_aea/agents/my_first_aea/aea-config.yaml | 2 +- .../test_docs/test_bash_yaml/md_files/bash-quickstart.md | 6 +++--- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index e993d6bd57..f7c25db230 100644 --- a/Makefile +++ b/Makefile @@ -165,6 +165,7 @@ security: # update copyright headers .PHONY: generators generators: + rm -rf packages/fetchai/connections/stub/input_file tox -e fix-copyright python -m aea.cli hash all python -m aea.cli hash all --packages-dir=./tests/data/packages diff --git a/deploy-image/build.sh b/deploy-image/build.sh index b8cae8ee2e..3c3aea4d17 100644 --- a/deploy-image/build.sh +++ b/deploy-image/build.sh @@ -2,7 +2,7 @@ set -e # setup the agent -aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote cd my_first_aea/ aea install aea build diff --git a/docs/echo_demo.md b/docs/echo_demo.md index d0959c4b64..5a7b093b19 100644 --- a/docs/echo_demo.md +++ b/docs/echo_demo.md @@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/docs/quickstart.md b/docs/quickstart.md index 096dc61af2..c8a6d3428e 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -168,7 +168,7 @@ This is a simple demo that introduces you to the main components of an AEA. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 82b6ffab2e..bc0df19cc7 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +- fetchai/stub:0.21.0:bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 9bf9764681..4406dfa62d 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +- fetchai/stub:0.21.0:bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/hashes.csv b/packages/hashes.csv index 538eee04f6..7bd59cad9a 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeieqovdbxjzeh6ajnxbn43flgc7mulps2kxyxng5moe56josqjkfa4 +fetchai/agents/error_test,bafybeifrwxc7fdnjvl4va632dlrhpabdlfltroqn2i3japmazgi3smtgg4 fetchai/agents/gym_aea,bafybeiajld24e55yzrnazizgnrqzb55qyahmaqo56ezrkfxh6dadyogttq -fetchai/agents/my_first_aea,bafybeihoe4zlwjezcvbqbqbspdlmzt4tvvw34kgk35vjrzhop43ow6utzi +fetchai/agents/my_first_aea,bafybeiddba6hc5m44tydxbgm7gvqdoqeok7jnlykti5hpebs53msmo4dbq fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy fetchai/connections/ledger,bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue -fetchai/connections/stub,bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +fetchai/connections/stub,bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqz fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm open_aea/agents/http_echo,bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe -open_aea/agents/my_first_aea,bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa +open_aea/agents/my_first_aea,bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index e4fa8d7faf..2a9119c74a 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +- fetchai/stub:0.21.0:bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index 0a57bcb054..fd498b3d70 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -72,7 +72,7 @@ v1.7.0 AEA configurations successfully initialized: {'author': 'fetchai'} ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote cd my_first_aea ``` ``` bash @@ -158,12 +158,12 @@ aea delete my_first_aea ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote cd my_first_aea ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote cd my_first_aea ``` From ec271f3985c1aa112ea14ee9ea7e775dcd96adf6 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 05:12:06 +0000 Subject: [PATCH 69/93] chore: add `aea test packages` to CI --- tox.ini | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 7264d53797..7b8c53f990 100644 --- a/tox.ini +++ b/tox.ini @@ -55,7 +55,9 @@ commands = python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-cosmos python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-fetchai python -m pip install --no-deps file://{toxinidir}/plugins/aea-cli-ipfs - pytest -rfE --doctest-modules aea packages/fetchai/connections packages/fetchai/protocols packages/fetchai/skills tests/ --cov=aea --cov=packages/fetchai/connections --cov=packages/fetchai/contracts --cov=packages/fetchai/protocols --cov=packages/fetchai/skills --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov-config=.coveragerc {posargs} + + aea test packages --args {posargs} + pytest -rfE --doctest-modules aea tests/ --cov=aea --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov-config=.coveragerc --cov-append {posargs} [plugins] commands = @@ -63,10 +65,10 @@ commands = python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-cosmos python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-fetchai python -m pip install --no-deps file://{toxinidir}/plugins/aea-cli-ipfs - pytest -rfE plugins/aea-ledger-fetchai/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_fetchai --cov-config=.coveragerc --suppress-no-test-exit-code {posargs} - pytest -rfE plugins/aea-ledger-ethereum/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_ethereum --cov-config=.coveragerc --suppress-no-test-exit-code {posargs} - pytest -rfE plugins/aea-ledger-cosmos/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_cosmos --cov-config=.coveragerc --suppress-no-test-exit-code {posargs} - pytest -rfE plugins/aea-cli-ipfs/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_cli_ipfs --cov-config=.coveragerc --suppress-no-test-exit-code {posargs} + pytest -rfE plugins/aea-ledger-fetchai/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_fetchai --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} + pytest -rfE plugins/aea-ledger-ethereum/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_ethereum --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} + pytest -rfE plugins/aea-ledger-cosmos/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_cosmos --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} + pytest -rfE plugins/aea-cli-ipfs/tests --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_cli_ipfs --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} [testenv:py3.10] basepython = python3.10 From 02a583a0dfbf803f77f46a6b91dbc34d3c68cabc Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 06:03:21 +0000 Subject: [PATCH 70/93] fix: ledger connection test --- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- .../fetchai/connections/ledger/connection.yaml | 2 +- .../ledger/tests/test_ledger_api.py | 1 + .../fetchai/skills/erc1155_client/skill.yaml | 2 +- .../fetchai/skills/erc1155_deploy/skill.yaml | 2 +- .../fetchai/skills/generic_buyer/skill.yaml | 2 +- .../fetchai/skills/generic_seller/skill.yaml | 2 +- packages/hashes.csv | 18 +++++++++--------- .../agents/my_first_aea/aea-config.yaml | 2 +- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index bc0df19cc7..82b6ffab2e 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au +- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 4406dfa62d..9bf9764681 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au +- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index aafb33a762..c131bf17fa 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -14,7 +14,7 @@ fingerprint: ledger_dispatcher.py: bafybeicrjfb2f4ngb3lvwgfbxf3r3ukk7pgm3oaour4htmnuqqn44ltmku tests/__init__.py: bafybeibx5zdcpx3u6sglbpp7yflnr7uaz557e6wqltawtzclubhhvaiw5e tests/conftest.py: bafybeiehywp4w4pddrqew4yt2i43rjdi74ple4nkwgasbrcvxjs536mvee - tests/test_ledger_api.py: bafybeieqnd6z5wtmne5wtvj4jsuyg2g5iyr5ppawhiy7smjiq3b52msyfe + tests/test_ledger_api.py: bafybeidywya7qsxp35vseihxv2igmzgw4sg3jowv6dueiwqx4s464q36ey fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/ledger/tests/test_ledger_api.py b/packages/fetchai/connections/ledger/tests/test_ledger_api.py index 0f9d94bc24..b9e8b747d5 100644 --- a/packages/fetchai/connections/ledger/tests/test_ledger_api.py +++ b/packages/fetchai/connections/ledger/tests/test_ledger_api.py @@ -69,6 +69,7 @@ LedgerApiDialogues as BaseLedgerApiDialogues, ) from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage +from aea_ledger_ethereum.test_tools.fixture_helpers import ganache # noqa: F401 DEFAULT_GANACHE_ADDR = LOCALHOST.geturl() diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 10604c1e7c..597fecf51c 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -21,7 +21,7 @@ fingerprint: tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu +- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu contracts: - fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi protocols: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 79b1df6f47..60649ddefc 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -21,7 +21,7 @@ fingerprint: tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu +- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu contracts: - fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi protocols: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 2e95d14145..1f6e9f3e8f 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -19,7 +19,7 @@ fingerprint: tests/test_models.py: bafybeibc5tdfcizkxi7mannv22m7svbw2q5eytkxw726nswomzt7gucyzm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu +- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index e6303a904d..34fd789d5d 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -20,7 +20,7 @@ fingerprint: tests/test_models.py: bafybeigymvfralqr63dpybfiqc4x4glcwmxmsweqycrmd75exi3gdz4oo4 fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu +- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/hashes.csv b/packages/hashes.csv index 7bd59cad9a..2d2366d302 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeifrwxc7fdnjvl4va632dlrhpabdlfltroqn2i3japmazgi3smtgg4 +fetchai/agents/error_test,bafybeieqovdbxjzeh6ajnxbn43flgc7mulps2kxyxng5moe56josqjkfa4 fetchai/agents/gym_aea,bafybeiajld24e55yzrnazizgnrqzb55qyahmaqo56ezrkfxh6dadyogttq -fetchai/agents/my_first_aea,bafybeiddba6hc5m44tydxbgm7gvqdoqeok7jnlykti5hpebs53msmo4dbq +fetchai/agents/my_first_aea,bafybeihoe4zlwjezcvbqbqbspdlmzt4tvvw34kgk35vjrzhop43ow6utzi fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy -fetchai/connections/ledger,bafybeiamp4dvkpiuz46zz4p57fwkhzzkhmxqyrb3zpqamr6u4ydv2kpyeu +fetchai/connections/ledger,bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue -fetchai/connections/stub,bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au +fetchai/connections/stub,bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -18,19 +18,19 @@ fetchai/protocols/oef_search,bafybeihdy3p7hjlh2vjkehfer5gfgjvqb666faupv4e7hgnxpg fetchai/protocols/state_update,bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu fetchai/protocols/tac,bafybeiawv2dhrr4yao5z3nonw6a2qcnygdulzocbpxy63tykpzdy547iiy fetchai/skills/echo,bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana -fetchai/skills/erc1155_client,bafybeiccuwzeh2baqiiaac2qnyxzyttg43fed4nuihuqfu7xdrdbwsjcwa -fetchai/skills/erc1155_deploy,bafybeieomzhrni5q5drwx4l5kqzjjh2l66ufb3t2aqlalmzcmm3hcnfgle +fetchai/skills/erc1155_client,bafybeiexjxbzoxqfsskvfa5ziytl2mtfw57c4inp2qo7slfg56h43avfpy +fetchai/skills/erc1155_deploy,bafybeicytpzvldbsw3tizm4hpgj7ozhnmxafuxcp4dwkq3s6efjghosqha fetchai/skills/error,bafybeiakq3bepacafpzmalnec3cdb6r4tchaocfjk54sg5q7t3qu2ggcbu fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibjjkhuopftlssdxad2vvyx6ttcxonpvdd5neejiagwumsdblfqsi -fetchai/skills/generic_buyer,bafybeigysbt4t5hcsshpd4iklxvqvovhrrqo5zqkc6fzqc673pg7t4cey4 -fetchai/skills/generic_seller,bafybeigtmselqruflg26pu5ka3soxd4zjpvilr6tzlk3zvww3ttoaq2tpq +fetchai/skills/generic_buyer,bafybeien5juzmjuoc6lxal3q6wwyg23sod6hycs2vvhkjstmnkxdcvnaau +fetchai/skills/generic_seller,bafybeid645fesy7scbeaqfq44vswcgls72rapu2t727gyp3e3pgunztn5e fetchai/skills/gym,bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu fetchai/skills/http_echo,bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqzwv7e fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm open_aea/agents/http_echo,bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe -open_aea/agents/my_first_aea,bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy +open_aea/agents/my_first_aea,bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 2a9119c74a..e4fa8d7faf 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeifldqx5f3znri7lnu6wxixmircgituilakgig6a4c42glpmfbb2au +- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy From c775e7a80fee8802a7407d2d9e5ac491f311cc1f Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 06:09:38 +0000 Subject: [PATCH 71/93] chore: update hashes --- .../fetchai/agents/gym_aea/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- .../connections/ledger/connection.yaml | 2 +- .../ledger/tests/test_ledger_api.py | 8 +++--- .../fetchai/contracts/erc1155/contract.yaml | 1 + packages/fetchai/skills/echo/skill.yaml | 1 + .../fetchai/skills/erc1155_client/skill.yaml | 5 ++-- .../fetchai/skills/erc1155_deploy/skill.yaml | 5 ++-- .../fetchai/skills/generic_buyer/skill.yaml | 3 +- .../fetchai/skills/generic_seller/skill.yaml | 3 +- packages/fetchai/skills/gym/skill.yaml | 1 + packages/fetchai/skills/http_echo/skill.yaml | 1 + packages/hashes.csv | 28 +++++++++---------- .../open_aea/agents/gym_aea/aea-config.yaml | 2 +- .../open_aea/agents/http_echo/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- 16 files changed, 38 insertions(+), 30 deletions(-) diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index cc74d5edae..e22020585e 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu +- fetchai/gym:0.20.0:bafybeigkk5pjfg3q7gn7livksku45vgcxfcy4rrcdvipxsb5grewpmdlkq default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 9bf9764681..0afb0a847d 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana +- fetchai/echo:0.19.0:bafybeibivdh6ywmhme3o2pgycwg2447hozkbnm47hnna2ftul2sk2xm7ru default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml index c131bf17fa..63e46d4084 100644 --- a/packages/fetchai/connections/ledger/connection.yaml +++ b/packages/fetchai/connections/ledger/connection.yaml @@ -14,7 +14,7 @@ fingerprint: ledger_dispatcher.py: bafybeicrjfb2f4ngb3lvwgfbxf3r3ukk7pgm3oaour4htmnuqqn44ltmku tests/__init__.py: bafybeibx5zdcpx3u6sglbpp7yflnr7uaz557e6wqltawtzclubhhvaiw5e tests/conftest.py: bafybeiehywp4w4pddrqew4yt2i43rjdi74ple4nkwgasbrcvxjs536mvee - tests/test_ledger_api.py: bafybeidywya7qsxp35vseihxv2igmzgw4sg3jowv6dueiwqx4s464q36ey + tests/test_ledger_api.py: bafybeicymzwngble5fwcti6fmtoyddcrof2ioeqewjjpd3dflw6jx3qoxi fingerprint_ignore_patterns: [] connections: [] protocols: diff --git a/packages/fetchai/connections/ledger/tests/test_ledger_api.py b/packages/fetchai/connections/ledger/tests/test_ledger_api.py index b9e8b747d5..50bea724d2 100644 --- a/packages/fetchai/connections/ledger/tests/test_ledger_api.py +++ b/packages/fetchai/connections/ledger/tests/test_ledger_api.py @@ -33,6 +33,7 @@ EthereumCrypto, ) from aea_ledger_ethereum.test_tools.constants import ETHEREUM_PRIVATE_KEY_PATH +from aea_ledger_ethereum.test_tools.fixture_helpers import ganache # noqa: F401 from aea_ledger_fetchai import FetchAICrypto from aea_ledger_fetchai.test_tools.constants import ( FETCHAI_ADDRESS_ONE, @@ -69,7 +70,6 @@ LedgerApiDialogues as BaseLedgerApiDialogues, ) from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage -from aea_ledger_ethereum.test_tools.fixture_helpers import ganache # noqa: F401 DEFAULT_GANACHE_ADDR = LOCALHOST.geturl() @@ -147,7 +147,7 @@ async def test_get_balance( ledger_apis_connection: Connection, # noqa: F811 update_default_ethereum_ledger_api, ethereum_testnet_config, - ganache, + ganache, # noqa: F811 ): """Test get balance.""" import aea # noqa # to load registries @@ -196,7 +196,7 @@ async def test_get_state( ledger_apis_connection: Connection, # noqa: F811 update_default_ethereum_ledger_api, ethereum_testnet_config, - ganache, + ganache, # noqa: F811 ): """Test get state.""" import aea # noqa # to load registries @@ -256,7 +256,7 @@ async def test_send_signed_transaction_ethereum( gas_strategies, ledger_apis_connection: Connection, # noqa: F811 update_default_ethereum_ledger_api, - ganache, + ganache, # noqa: F811 ): """Test send signed transaction with Ethereum APIs.""" import aea # noqa # to load registries diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index 2c02b4ed15..4c932e5d65 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -6,6 +6,7 @@ description: The erc1155 contract implements an ERC1155 contract package. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeideg2k6arzx7fzbkl7bdl2f3x4w3ocu7sbalesjtivtxvu43obyxu README.md: bafybeigbif52kdfcgx4h2f57xtcwuxkt6hlbyrsceyqoxnoh4pd24pxuxi __init__.py: bafybeidlszdrxy5blev2tyvajau443hsh4v2y65rsey2gsfet3c7syggqa build/Migrations.json: bafybeih3i7gw7wekpsw7eylufug26dqphxara7acclv45mgkwy2bsookye diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 0c63b5ce79..9716559d18 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -6,6 +6,7 @@ description: The echo skill implements simple echo functionality. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeifppigpkg6g43kkiqsz66z52qbekik5gjl53acu5yhknrdh3kg3da README.md: bafybeiecz4czxtvzwfsfal5rtcjo4gma3ojxu3yxd7phgcfi6vfhnm622y __init__.py: bafybeigqsnja54qqvj6bmxkpj27v4ejqydklqhapdui44v4qj4e3nqyw24 behaviours.py: bafybeigwlodaanmbtfszhvsnqwozur4dynt2q3qw6dhoyajjsnjklb2hmi diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 597fecf51c..3ce2137953 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -7,6 +7,7 @@ description: The erc1155 client interacts with the erc1155 deployer to conduct a license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeiaazchr6qx5oyyfps2rhbahuu5buafvvutd37hohgzmymsb2fsfii README.md: bafybeid73sgd24psits3e6ktrxrwwin7zd6xb7adxsplxi5bizlrxk5bom __init__.py: bafybeidi6meicrc6tyeokv42f5u7xymlgfy2eua5ueuxmqv272oouhqehu behaviours.py: bafybeicwzknkh5tpogbqe5vaz52wxkkwqnb54giktpydns6o7fkwrxcqme @@ -21,9 +22,9 @@ fingerprint: tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu +- fetchai/ledger:0.19.0:bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi contracts: -- fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi +- fetchai/erc1155:0.22.0:bafybeia33ee5rsl4fgnyoq5d5of4bjyocz2t4aadflh3vag3ir3d7go524 protocols: - fetchai/contract_api:1.0.0:bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 60649ddefc..199da70fe8 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -7,6 +7,7 @@ description: The ERC1155 deploy skill has the ability to deploy and interact wit license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeifs5jwh6xlogm4m6v5oknok7ib3nvnm2sgvygpjmgfv2ekuzjn5ay README.md: bafybeiae7b2hjkzsd7z2yjft37hrqt5rfct6ocrox4pna7u4ypunz7rmw4 __init__.py: bafybeiehln6kky4ih7d2737tb4h4ofoffixbefhmjzlpzhzpkhlpg7dww4 behaviours.py: bafybeif2q62726tef2senpzwbjfsowep3v462xogzxo2j7jdfo6ndsjuue @@ -21,9 +22,9 @@ fingerprint: tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu +- fetchai/ledger:0.19.0:bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi contracts: -- fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi +- fetchai/erc1155:0.22.0:bafybeia33ee5rsl4fgnyoq5d5of4bjyocz2t4aadflh3vag3ir3d7go524 protocols: - fetchai/contract_api:1.0.0:bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index 1f6e9f3e8f..e1be333f77 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -6,6 +6,7 @@ description: The weather client skill implements the skill to purchase weather d license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeigdt3arsanqedeklq3hi6fodzakvnpoxmdst453y3qawsrscbryt4 README.md: bafybeig3rwpeqh5kdr2iflvy72vkfmby3sl4ulb3sbblt5lndvogvlblme __init__.py: bafybeic6biuigdmylscufxz6suvtkxems27j2cns3h36e53gxlm5hihvza behaviours.py: bafybeif6hnk74lkvkc6aurfngrhe35idvatgcqfgped4l3d4e3nektoh44 @@ -19,7 +20,7 @@ fingerprint: tests/test_models.py: bafybeibc5tdfcizkxi7mannv22m7svbw2q5eytkxw726nswomzt7gucyzm fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu +- fetchai/ledger:0.19.0:bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index 34fd789d5d..ebefd258cb 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -7,6 +7,7 @@ description: The weather station skill implements the functionality to sell weat license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeihsb3lcalv5m6tmxkhygogmjgfbgjtatj4wuhkbbfwf4xgpn3qmgi README.md: bafybeiazl5fv537mvhkqu2jsxhztcbe5cpa5mrdcm3xnnbinz3on3whipa __init__.py: bafybeiafdr7ynn72cev3ldmh7jpm2hkavrli7fwmq5h2is6632kiaqi3qa behaviours.py: bafybeifdwcntgwobpzagul3fxgmtptlrkk4e2yuhq2icb6crxf2onqwf6u @@ -20,7 +21,7 @@ fingerprint: tests/test_models.py: bafybeigymvfralqr63dpybfiqc4x4glcwmxmsweqycrmd75exi3gdz4oo4 fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.19.0:bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu +- fetchai/ledger:0.19.0:bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 0da64ad74c..479ec1bb6a 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -6,6 +6,7 @@ description: The gym skill wraps an RL agent. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeicxsax2jh6vofwlsqfudst6ogmolflbvrcigdhy7ahczsbjyhpnla README.md: bafybeictcczi3z3o7gcz3764jjotnfpek4da2w25j7d3sedbjb5phsskvu __init__.py: bafybeihcv27rv6jafmrgjgeqn3fsmep54k2epi7tkiv6zfxwtczwah4klm dialogues.py: bafybeicnd6qc3hrzk5unxfcvcrvv4qflqwfcuq6trsih4i57btxxrxc56a diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 15bf47615f..8cf4949d2c 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -7,6 +7,7 @@ description: The http echo skill prints out the content of received http message license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + .coverage: bafybeicxookdwwshinijxldevxby3zxuxtwelj2tan7ypd4nip3yfuyxw4 README.md: bafybeiesl5jlvvu4enydib32bpyfqphlkdulxy3oqid3t32cjxya5qykci __init__.py: bafybeigk7kbqmfrjjhyv6dvaacogp24qsv7czeb24zupvcgjqluxmlhlba dialogues.py: bafybeibdcgcmvl3g7gp7rvndrhih7fpj4qbeihdqodgqndjuaqsq3g27bm diff --git a/packages/hashes.csv b/packages/hashes.csv index 2d2366d302..d13c2a3337 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,13 +1,13 @@ fetchai/agents/error_test,bafybeieqovdbxjzeh6ajnxbn43flgc7mulps2kxyxng5moe56josqjkfa4 -fetchai/agents/gym_aea,bafybeiajld24e55yzrnazizgnrqzb55qyahmaqo56ezrkfxh6dadyogttq -fetchai/agents/my_first_aea,bafybeihoe4zlwjezcvbqbqbspdlmzt4tvvw34kgk35vjrzhop43ow6utzi +fetchai/agents/gym_aea,bafybeiabg722k5envag4ualtrvq2hshcuw6m67htk5vco7x3f4czpzx2cu +fetchai/agents/my_first_aea,bafybeid7ifpp6jaderywp6drk7uccaqqka5j6b6zukvomw5d3rlsirf6xm fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy -fetchai/connections/ledger,bafybeigpzqx6cmxh5m5sakk6sit6w3h6ihi354vauuwb77kjc5etxo7duu +fetchai/connections/ledger,bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue fetchai/connections/stub,bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm -fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi +fetchai/contracts/erc1155,bafybeia33ee5rsl4fgnyoq5d5of4bjyocz2t4aadflh3vag3ir3d7go524 fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy fetchai/protocols/fipa,bafybeib7mzgyjcfr7c4gcx24aeral7ldoqjb23qvsd266gnp66anftqt5q @@ -17,20 +17,20 @@ fetchai/protocols/ledger_api,bafybeiftily2ogosdp3gkbvlq2wahn66svkpaxdyu2a2br36uu fetchai/protocols/oef_search,bafybeihdy3p7hjlh2vjkehfer5gfgjvqb666faupv4e7hgnxpgz2r7rwai fetchai/protocols/state_update,bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu fetchai/protocols/tac,bafybeiawv2dhrr4yao5z3nonw6a2qcnygdulzocbpxy63tykpzdy547iiy -fetchai/skills/echo,bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana -fetchai/skills/erc1155_client,bafybeiexjxbzoxqfsskvfa5ziytl2mtfw57c4inp2qo7slfg56h43avfpy -fetchai/skills/erc1155_deploy,bafybeicytpzvldbsw3tizm4hpgj7ozhnmxafuxcp4dwkq3s6efjghosqha +fetchai/skills/echo,bafybeibivdh6ywmhme3o2pgycwg2447hozkbnm47hnna2ftul2sk2xm7ru +fetchai/skills/erc1155_client,bafybeidenvahqeok55enhaf334tc5d3muo3aov4enlzutsggwvpfj4jlcm +fetchai/skills/erc1155_deploy,bafybeidjufleuwt2ty4py65rfolgq7ewzo7wsexcdjphyjgr7wajeklkwy fetchai/skills/error,bafybeiakq3bepacafpzmalnec3cdb6r4tchaocfjk54sg5q7t3qu2ggcbu fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibjjkhuopftlssdxad2vvyx6ttcxonpvdd5neejiagwumsdblfqsi -fetchai/skills/generic_buyer,bafybeien5juzmjuoc6lxal3q6wwyg23sod6hycs2vvhkjstmnkxdcvnaau -fetchai/skills/generic_seller,bafybeid645fesy7scbeaqfq44vswcgls72rapu2t727gyp3e3pgunztn5e -fetchai/skills/gym,bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu -fetchai/skills/http_echo,bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqzwv7e +fetchai/skills/generic_buyer,bafybeig3ol3uai333is3mla33e7pxmlrdqrvx5ezmie56ijtioepnkfube +fetchai/skills/generic_seller,bafybeiak6q4uzmwvsfq3d4gduu4kaz5pbwu7hwv7mugrwjkjtlmbuwycoq +fetchai/skills/gym,bafybeigkk5pjfg3q7gn7livksku45vgcxfcy4rrcdvipxsb5grewpmdlkq +fetchai/skills/http_echo,bafybeidkutctiaqyhfypygyzwnkdgofpe5hg54wrb6x5rcc7rmamhipvhu fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm -open_aea/agents/http_echo,bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe -open_aea/agents/my_first_aea,bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa +open_aea/agents/gym_aea,bafybeidanccwle4dqfcxzhjbce35vylt6lrcy322pgo3fu76mnrztmiknu +open_aea/agents/http_echo,bafybeidxun5gmg4dtyyjdhtvnp24cvxfjkd5xgvzxcuh6f4l55gfa27lrq +open_aea/agents/my_first_aea,bafybeicfkp2pd54fp2pouyj62dmazpnjj6ylpac7uidr5ghiktb7ebhgou open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index f3fc233a4a..8c3cecb9b0 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu +- fetchai/gym:0.20.0:bafybeigkk5pjfg3q7gn7livksku45vgcxfcy4rrcdvipxsb5grewpmdlkq default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index 305514c30a..ac7b23d35b 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/http:1.0.0:bafybeig7ilrz5b5a62kweohjoexdpdqmlw3zytwoyrlnqmpomgttf7f33e - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/http_echo:0.20.0:bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqzwv7e +- fetchai/http_echo:0.20.0:bafybeidkutctiaqyhfypygyzwnkdgofpe5hg54wrb6x5rcc7rmamhipvhu default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index e4fa8d7faf..396d04b05a 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana +- fetchai/echo:0.19.0:bafybeibivdh6ywmhme3o2pgycwg2447hozkbnm47hnna2ftul2sk2xm7ru default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From 56426c960b57024bdc31d5ae72982cfdcb1f8b05 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 06:10:02 +0000 Subject: [PATCH 72/93] fix: support for extra args as pytest args --- aea/cli/test.py | 39 +++++++++++++++++++++++------------- aea/cli/utils/click_utils.py | 6 +++++- aea/cli/utils/decorators.py | 2 +- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index c8f12385e1..1b80879ae1 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -72,7 +72,9 @@ """ -@click.group(invoke_without_command=True) +@click.group( + invoke_without_command=True, +) @click.pass_context @click.option( "--cov", @@ -80,13 +82,12 @@ default=False, help="Use this flag to enable code coverage checks.", ) -@pytest_args -def test(click_context: click.Context, cov: bool, args: Sequence[str]) -> None: +def test(click_context: click.Context, cov: bool) -> None: """Run tests of an AEA project.""" ctx = cast(Context, click_context.obj) ctx.config["cov"] = cov if click_context.invoked_subcommand is None: - test_aea_project(click_context, Path(ctx.cwd), args) + test_aea_project(click_context, Path(ctx.cwd), args=[]) @test.command() @@ -149,14 +150,16 @@ def by_path( ) -@test.command() -@pytest_args -@pass_ctx -def packages( - ctx: Context, - args: Sequence[str], # pylint: disable=unused-argument -) -> None: +@test.command( + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) +@click.pass_context +def packages(click_context: click.Context) -> None: """Executes a test suite of a package specified by a path.""" + ctx: Context = click_context.obj packages_dir = Path(ctx.registry_path) available_packages = DependencyTree.find_packages_in_a_local_repository( packages_dir @@ -171,7 +174,8 @@ def packages( covrc_file.write_text( COVERAGERC_CONFIG.format(root_dir=str(packages_dir.parent)) ) - for package_type, package_dir in available_packages[:20]: + + for package_type, package_dir in available_packages: if package_type == PackageType.AGENT.value: continue @@ -192,9 +196,16 @@ def packages( str(package_dir.absolute()), f"--cov-config={covrc_file}", "--cov-report=term", + *click_context.args, ] ) if exit_code: + if exit_code == pytest.ExitCode.NO_TESTS_COLLECTED: + click.echo( + f"Could not collect tests for for {package_dir.name} of type {package_type}" + ) + continue + click.echo( f"Running tests for for {package_dir.name} of type {package_type} failed" ) @@ -202,11 +213,11 @@ def packages( (exit_code, os.path.sep.join(package_dir.parts[-3:])) ) coverage_data.append(str(package_dir / ".coverage")) - total_time = (time.perf_counter() - start_time) // 60 + total_time = (time.perf_counter() - start_time) // 60 click.echo(f"Time : {total_time}") - click.echo("Generating coverage reports.") + click.echo("Generating coverage reports.") coverage(argv=["combine", f"--rcfile={covrc_file}", *coverage_data]) coverage(argv=["html", f"--rcfile={covrc_file}"]) coverage(argv=["xml", f"--rcfile={covrc_file}"]) diff --git a/aea/cli/utils/click_utils.py b/aea/cli/utils/click_utils.py index 4bd11975a7..cca6a1931e 100644 --- a/aea/cli/utils/click_utils.py +++ b/aea/cli/utils/click_utils.py @@ -86,9 +86,13 @@ def arg_strip(s: str) -> str: class PytestArgs(click.Option): """Custom Click option for parsing Pytest arguments.""" - def type_cast_value(self, ctx: click.Context, value: str) -> Sequence[str]: + def type_cast_value( + self, ctx: click.Context, value: Optional[str] + ) -> Sequence[str]: """Cast a string value to a sequence of Pytest arguments.""" try: + if value is None: + return [] return value.split(" ") except Exception: error_message = f"cannot split '{value}' into pytest arguments" diff --git a/aea/cli/utils/decorators.py b/aea/cli/utils/decorators.py index 9315c5c1de..b7d47e0ab8 100644 --- a/aea/cli/utils/decorators.py +++ b/aea/cli/utils/decorators.py @@ -253,4 +253,4 @@ def wrapper( return wrapper -pytest_args = click.option("--args", "-a", cls=PytestArgs, default="") +pytest_args = click.option("--args", "-a", cls=PytestArgs) From 1be3fad6d8de49fee863129236b9f44294e19f94 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 06:11:24 +0000 Subject: [PATCH 73/93] chore: update tox config --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7b8c53f990..478fed4406 100644 --- a/tox.ini +++ b/tox.ini @@ -56,7 +56,7 @@ commands = python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-fetchai python -m pip install --no-deps file://{toxinidir}/plugins/aea-cli-ipfs - aea test packages --args {posargs} + aea test packages {posargs} pytest -rfE --doctest-modules aea tests/ --cov=aea --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov-config=.coveragerc --cov-append {posargs} [plugins] From daf03f1b60916464b3413c38c683bb5a497943ef Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 06:47:32 +0000 Subject: [PATCH 74/93] chore: update hashes --- .../fetchai/agents/gym_aea/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- .../fetchai/contracts/erc1155/contract.yaml | 1 - packages/fetchai/skills/echo/skill.yaml | 1 - .../fetchai/skills/erc1155_client/skill.yaml | 3 +-- .../fetchai/skills/erc1155_deploy/skill.yaml | 3 +-- .../fetchai/skills/generic_buyer/skill.yaml | 1 - .../fetchai/skills/generic_seller/skill.yaml | 1 - packages/fetchai/skills/gym/skill.yaml | 1 - packages/fetchai/skills/http_echo/skill.yaml | 1 - packages/hashes.csv | 26 +++++++++---------- .../open_aea/agents/gym_aea/aea-config.yaml | 2 +- .../open_aea/agents/http_echo/aea-config.yaml | 2 +- .../agents/my_first_aea/aea-config.yaml | 2 +- 14 files changed, 20 insertions(+), 28 deletions(-) diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml index e22020585e..cc74d5edae 100644 --- a/packages/fetchai/agents/gym_aea/aea-config.yaml +++ b/packages/fetchai/agents/gym_aea/aea-config.yaml @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeigkk5pjfg3q7gn7livksku45vgcxfcy4rrcdvipxsb5grewpmdlkq +- fetchai/gym:0.20.0:bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu default_connection: fetchai/gym:0.19.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 0afb0a847d..9bf9764681 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/echo:0.19.0:bafybeibivdh6ywmhme3o2pgycwg2447hozkbnm47hnna2ftul2sk2xm7ru +- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana default_connection: fetchai/stub:0.21.0 default_ledger: fetchai required_ledgers: diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml index 4c932e5d65..2c02b4ed15 100644 --- a/packages/fetchai/contracts/erc1155/contract.yaml +++ b/packages/fetchai/contracts/erc1155/contract.yaml @@ -6,7 +6,6 @@ description: The erc1155 contract implements an ERC1155 contract package. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeideg2k6arzx7fzbkl7bdl2f3x4w3ocu7sbalesjtivtxvu43obyxu README.md: bafybeigbif52kdfcgx4h2f57xtcwuxkt6hlbyrsceyqoxnoh4pd24pxuxi __init__.py: bafybeidlszdrxy5blev2tyvajau443hsh4v2y65rsey2gsfet3c7syggqa build/Migrations.json: bafybeih3i7gw7wekpsw7eylufug26dqphxara7acclv45mgkwy2bsookye diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml index 9716559d18..0c63b5ce79 100644 --- a/packages/fetchai/skills/echo/skill.yaml +++ b/packages/fetchai/skills/echo/skill.yaml @@ -6,7 +6,6 @@ description: The echo skill implements simple echo functionality. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeifppigpkg6g43kkiqsz66z52qbekik5gjl53acu5yhknrdh3kg3da README.md: bafybeiecz4czxtvzwfsfal5rtcjo4gma3ojxu3yxd7phgcfi6vfhnm622y __init__.py: bafybeigqsnja54qqvj6bmxkpj27v4ejqydklqhapdui44v4qj4e3nqyw24 behaviours.py: bafybeigwlodaanmbtfszhvsnqwozur4dynt2q3qw6dhoyajjsnjklb2hmi diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 3ce2137953..232715a5a2 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -7,7 +7,6 @@ description: The erc1155 client interacts with the erc1155 deployer to conduct a license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeiaazchr6qx5oyyfps2rhbahuu5buafvvutd37hohgzmymsb2fsfii README.md: bafybeid73sgd24psits3e6ktrxrwwin7zd6xb7adxsplxi5bizlrxk5bom __init__.py: bafybeidi6meicrc6tyeokv42f5u7xymlgfy2eua5ueuxmqv272oouhqehu behaviours.py: bafybeicwzknkh5tpogbqe5vaz52wxkkwqnb54giktpydns6o7fkwrxcqme @@ -24,7 +23,7 @@ fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi contracts: -- fetchai/erc1155:0.22.0:bafybeia33ee5rsl4fgnyoq5d5of4bjyocz2t4aadflh3vag3ir3d7go524 +- fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi protocols: - fetchai/contract_api:1.0.0:bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index 199da70fe8..cb67dc1cc7 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -7,7 +7,6 @@ description: The ERC1155 deploy skill has the ability to deploy and interact wit license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeifs5jwh6xlogm4m6v5oknok7ib3nvnm2sgvygpjmgfv2ekuzjn5ay README.md: bafybeiae7b2hjkzsd7z2yjft37hrqt5rfct6ocrox4pna7u4ypunz7rmw4 __init__.py: bafybeiehln6kky4ih7d2737tb4h4ofoffixbefhmjzlpzhzpkhlpg7dww4 behaviours.py: bafybeif2q62726tef2senpzwbjfsowep3v462xogzxo2j7jdfo6ndsjuue @@ -24,7 +23,7 @@ fingerprint_ignore_patterns: [] connections: - fetchai/ledger:0.19.0:bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi contracts: -- fetchai/erc1155:0.22.0:bafybeia33ee5rsl4fgnyoq5d5of4bjyocz2t4aadflh3vag3ir3d7go524 +- fetchai/erc1155:0.22.0:bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi protocols: - fetchai/contract_api:1.0.0:bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index e1be333f77..abdbc26507 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -6,7 +6,6 @@ description: The weather client skill implements the skill to purchase weather d license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeigdt3arsanqedeklq3hi6fodzakvnpoxmdst453y3qawsrscbryt4 README.md: bafybeig3rwpeqh5kdr2iflvy72vkfmby3sl4ulb3sbblt5lndvogvlblme __init__.py: bafybeic6biuigdmylscufxz6suvtkxems27j2cns3h36e53gxlm5hihvza behaviours.py: bafybeif6hnk74lkvkc6aurfngrhe35idvatgcqfgped4l3d4e3nektoh44 diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index ebefd258cb..26cbb4cf5a 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -7,7 +7,6 @@ description: The weather station skill implements the functionality to sell weat license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeihsb3lcalv5m6tmxkhygogmjgfbgjtatj4wuhkbbfwf4xgpn3qmgi README.md: bafybeiazl5fv537mvhkqu2jsxhztcbe5cpa5mrdcm3xnnbinz3on3whipa __init__.py: bafybeiafdr7ynn72cev3ldmh7jpm2hkavrli7fwmq5h2is6632kiaqi3qa behaviours.py: bafybeifdwcntgwobpzagul3fxgmtptlrkk4e2yuhq2icb6crxf2onqwf6u diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml index 479ec1bb6a..0da64ad74c 100644 --- a/packages/fetchai/skills/gym/skill.yaml +++ b/packages/fetchai/skills/gym/skill.yaml @@ -6,7 +6,6 @@ description: The gym skill wraps an RL agent. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeicxsax2jh6vofwlsqfudst6ogmolflbvrcigdhy7ahczsbjyhpnla README.md: bafybeictcczi3z3o7gcz3764jjotnfpek4da2w25j7d3sedbjb5phsskvu __init__.py: bafybeihcv27rv6jafmrgjgeqn3fsmep54k2epi7tkiv6zfxwtczwah4klm dialogues.py: bafybeicnd6qc3hrzk5unxfcvcrvv4qflqwfcuq6trsih4i57btxxrxc56a diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml index 8cf4949d2c..15bf47615f 100644 --- a/packages/fetchai/skills/http_echo/skill.yaml +++ b/packages/fetchai/skills/http_echo/skill.yaml @@ -7,7 +7,6 @@ description: The http echo skill prints out the content of received http message license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - .coverage: bafybeicxookdwwshinijxldevxby3zxuxtwelj2tan7ypd4nip3yfuyxw4 README.md: bafybeiesl5jlvvu4enydib32bpyfqphlkdulxy3oqid3t32cjxya5qykci __init__.py: bafybeigk7kbqmfrjjhyv6dvaacogp24qsv7czeb24zupvcgjqluxmlhlba dialogues.py: bafybeibdcgcmvl3g7gp7rvndrhih7fpj4qbeihdqodgqndjuaqsq3g27bm diff --git a/packages/hashes.csv b/packages/hashes.csv index d13c2a3337..8eb7c15c1c 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,13 +1,13 @@ fetchai/agents/error_test,bafybeieqovdbxjzeh6ajnxbn43flgc7mulps2kxyxng5moe56josqjkfa4 -fetchai/agents/gym_aea,bafybeiabg722k5envag4ualtrvq2hshcuw6m67htk5vco7x3f4czpzx2cu -fetchai/agents/my_first_aea,bafybeid7ifpp6jaderywp6drk7uccaqqka5j6b6zukvomw5d3rlsirf6xm +fetchai/agents/gym_aea,bafybeiajld24e55yzrnazizgnrqzb55qyahmaqo56ezrkfxh6dadyogttq +fetchai/agents/my_first_aea,bafybeihoe4zlwjezcvbqbqbspdlmzt4tvvw34kgk35vjrzhop43ow6utzi fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy fetchai/connections/ledger,bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue fetchai/connections/stub,bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm -fetchai/contracts/erc1155,bafybeia33ee5rsl4fgnyoq5d5of4bjyocz2t4aadflh3vag3ir3d7go524 +fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy fetchai/protocols/fipa,bafybeib7mzgyjcfr7c4gcx24aeral7ldoqjb23qvsd266gnp66anftqt5q @@ -17,20 +17,20 @@ fetchai/protocols/ledger_api,bafybeiftily2ogosdp3gkbvlq2wahn66svkpaxdyu2a2br36uu fetchai/protocols/oef_search,bafybeihdy3p7hjlh2vjkehfer5gfgjvqb666faupv4e7hgnxpgz2r7rwai fetchai/protocols/state_update,bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu fetchai/protocols/tac,bafybeiawv2dhrr4yao5z3nonw6a2qcnygdulzocbpxy63tykpzdy547iiy -fetchai/skills/echo,bafybeibivdh6ywmhme3o2pgycwg2447hozkbnm47hnna2ftul2sk2xm7ru -fetchai/skills/erc1155_client,bafybeidenvahqeok55enhaf334tc5d3muo3aov4enlzutsggwvpfj4jlcm -fetchai/skills/erc1155_deploy,bafybeidjufleuwt2ty4py65rfolgq7ewzo7wsexcdjphyjgr7wajeklkwy +fetchai/skills/echo,bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana +fetchai/skills/erc1155_client,bafybeigbtdqu56ytjtnapjbbctmx5xtpto2d4d37ylb5ogmplqesbacply +fetchai/skills/erc1155_deploy,bafybeia3urs7i3f52pyeqjnoov7tipdbs4p5deaorntkpydsh5ccw4mcty fetchai/skills/error,bafybeiakq3bepacafpzmalnec3cdb6r4tchaocfjk54sg5q7t3qu2ggcbu fetchai/skills/error_test_skill,bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu fetchai/skills/fipa_dummy_buyer,bafybeibjjkhuopftlssdxad2vvyx6ttcxonpvdd5neejiagwumsdblfqsi -fetchai/skills/generic_buyer,bafybeig3ol3uai333is3mla33e7pxmlrdqrvx5ezmie56ijtioepnkfube -fetchai/skills/generic_seller,bafybeiak6q4uzmwvsfq3d4gduu4kaz5pbwu7hwv7mugrwjkjtlmbuwycoq -fetchai/skills/gym,bafybeigkk5pjfg3q7gn7livksku45vgcxfcy4rrcdvipxsb5grewpmdlkq -fetchai/skills/http_echo,bafybeidkutctiaqyhfypygyzwnkdgofpe5hg54wrb6x5rcc7rmamhipvhu +fetchai/skills/generic_buyer,bafybeihbnbdatjsfzokma5ytqulj27ra6375qzc2yy5bmohtriygilccaa +fetchai/skills/generic_seller,bafybeid6msmx3hch724znkskrr7dpo3wkxedcl3frtbynm7bgehhowshkq +fetchai/skills/gym,bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu +fetchai/skills/http_echo,bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqzwv7e fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble -open_aea/agents/gym_aea,bafybeidanccwle4dqfcxzhjbce35vylt6lrcy322pgo3fu76mnrztmiknu -open_aea/agents/http_echo,bafybeidxun5gmg4dtyyjdhtvnp24cvxfjkd5xgvzxcuh6f4l55gfa27lrq -open_aea/agents/my_first_aea,bafybeicfkp2pd54fp2pouyj62dmazpnjj6ylpac7uidr5ghiktb7ebhgou +open_aea/agents/gym_aea,bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm +open_aea/agents/http_echo,bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe +open_aea/agents/my_first_aea,bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/gym_aea/aea-config.yaml b/packages/open_aea/agents/gym_aea/aea-config.yaml index 8c3cecb9b0..f3fc233a4a 100644 --- a/packages/open_aea/agents/gym_aea/aea-config.yaml +++ b/packages/open_aea/agents/gym_aea/aea-config.yaml @@ -17,7 +17,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/gym:0.20.0:bafybeigkk5pjfg3q7gn7livksku45vgcxfcy4rrcdvipxsb5grewpmdlkq +- fetchai/gym:0.20.0:bafybeif774uxl33jeg6lk5rov4bkmq5vn6ryvtochyah3czvo56rgvfnzu default_connection: fetchai/gym:0.19.0 default_ledger: ethereum private_key_paths: {} diff --git a/packages/open_aea/agents/http_echo/aea-config.yaml b/packages/open_aea/agents/http_echo/aea-config.yaml index ac7b23d35b..305514c30a 100644 --- a/packages/open_aea/agents/http_echo/aea-config.yaml +++ b/packages/open_aea/agents/http_echo/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/http:1.0.0:bafybeig7ilrz5b5a62kweohjoexdpdqmlw3zytwoyrlnqmpomgttf7f33e - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/http_echo:0.20.0:bafybeidkutctiaqyhfypygyzwnkdgofpe5hg54wrb6x5rcc7rmamhipvhu +- fetchai/http_echo:0.20.0:bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqzwv7e default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index 396d04b05a..e4fa8d7faf 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -15,7 +15,7 @@ protocols: - fetchai/state_update:1.0.0:bafybeib736dqbkd43sz5hpb3yd4kviv2b4g2okirknn3vsdo5tlykuu4bu - open_aea/signing:1.0.0:bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi skills: -- fetchai/echo:0.19.0:bafybeibivdh6ywmhme3o2pgycwg2447hozkbnm47hnna2ftul2sk2xm7ru +- fetchai/echo:0.19.0:bafybeice3v5erl4rdm3fjtakyfckm4wjq3accn5ajzkhjnyhbtfqm2cana default_connection: fetchai/stub:0.21.0 default_ledger: ethereum required_ledgers: From 26e707937889196997904aa50dff55d3783e4101 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 07:11:31 +0000 Subject: [PATCH 75/93] test: update stub connection test to prevent the creation of residue files --- .../fetchai/agents/error_test/aea-config.yaml | 2 +- .../fetchai/agents/my_first_aea/aea-config.yaml | 2 +- .../fetchai/connections/stub/connection.yaml | 2 +- .../fetchai/connections/stub/tests/test_stub.py | 16 ++++++++++------ packages/hashes.csv | 8 ++++---- .../open_aea/agents/my_first_aea/aea-config.yaml | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/fetchai/agents/error_test/aea-config.yaml b/packages/fetchai/agents/error_test/aea-config.yaml index 82b6ffab2e..440e5f6139 100644 --- a/packages/fetchai/agents/error_test/aea-config.yaml +++ b/packages/fetchai/agents/error_test/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeig75bdp2xp2k44ohxt277etnzeqhwdkwsjfciz7upwgymawmfo2vm fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +- fetchai/stub:0.21.0:bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq contracts: [] protocols: [] skills: diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml index 9bf9764681..c252aa4832 100644 --- a/packages/fetchai/agents/my_first_aea/aea-config.yaml +++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +- fetchai/stub:0.21.0:bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy diff --git a/packages/fetchai/connections/stub/connection.yaml b/packages/fetchai/connections/stub/connection.yaml index fdadfd9a6b..63d7883b99 100644 --- a/packages/fetchai/connections/stub/connection.yaml +++ b/packages/fetchai/connections/stub/connection.yaml @@ -11,7 +11,7 @@ fingerprint: __init__.py: bafybeihw7l7zie5dxycptwwiynqgnqfesnhr3epali5e4tmzhy54lxjnbq connection.py: bafybeicjrtpc2pwf2fwvqwr74tkzztjee2rmd7zkkzs2ctdgua2n5omgl4 tests/__init__.py: bafybeiadaetciszcob7cchexib74l7vecczthsx2pzaan7sp7csrkgjxce - tests/test_stub.py: bafybeianazzo5ejeleukcccizx4byd7xa6ea2sikwl3mjamyk3zzck5l3m + tests/test_stub.py: bafybeigdhz55jb6hagw4qfwtz7rxquojze47i3k3zcsrt4xqedsdwjxouq fingerprint_ignore_patterns: - ./input_file connections: [] diff --git a/packages/fetchai/connections/stub/tests/test_stub.py b/packages/fetchai/connections/stub/tests/test_stub.py index eb7f40456f..229b7e1093 100644 --- a/packages/fetchai/connections/stub/tests/test_stub.py +++ b/packages/fetchai/connections/stub/tests/test_stub.py @@ -399,12 +399,16 @@ async def test_bad_envelope(): @pytest.mark.asyncio async def test_load_from_dir(): """Test stub connection can be loaded from dir.""" - StubConnection.from_dir( - str(PACKAGE_DIR), - Identity("name", "address", "public_key"), - CryptoStore(), - os.getcwd(), - ) + with mock.patch.object( + Path, "touch" + ) as touch_mock: # to prevent this test from creating the input_file file + StubConnection.from_dir( + str(PACKAGE_DIR), + Identity("name", "address", "public_key"), + CryptoStore(), + os.getcwd(), + ) + touch_mock.assert_any_call() class TestFileLock: diff --git a/packages/hashes.csv b/packages/hashes.csv index 8eb7c15c1c..b7d2ea92a7 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -1,12 +1,12 @@ -fetchai/agents/error_test,bafybeieqovdbxjzeh6ajnxbn43flgc7mulps2kxyxng5moe56josqjkfa4 +fetchai/agents/error_test,bafybeigmsncgfdfosb2lqihdkzzgi6osuianbdbuizaoua6zpmmnwhiaa4 fetchai/agents/gym_aea,bafybeiajld24e55yzrnazizgnrqzb55qyahmaqo56ezrkfxh6dadyogttq -fetchai/agents/my_first_aea,bafybeihoe4zlwjezcvbqbqbspdlmzt4tvvw34kgk35vjrzhop43ow6utzi +fetchai/agents/my_first_aea,bafybeifztdbqr7qclzoxlfcq2wuw4mm5nfnba7lxa4tcs6vt2kuurd6dzm fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxacxay fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy fetchai/connections/ledger,bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue -fetchai/connections/stub,bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +fetchai/connections/stub,bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi fetchai/protocols/default,bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy @@ -30,7 +30,7 @@ fetchai/skills/http_echo,bafybeiaas4srdjqrnnz5yxfwvcu53i6cli6vrzbqakvml35s3pouqz fetchai/skills/task_test_skill,bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble open_aea/agents/gym_aea,bafybeiee4piv344vdkrcqgpdx5xfoftgzxabebvpgcxv3oc66bpla5bpzm open_aea/agents/http_echo,bafybeibin53i74qbwvyeehgvjrfcxbpfoj5aahj4a57uxu64a6anihjiqe -open_aea/agents/my_first_aea,bafybeiduffhp5g7u6hdlragqnre4i3eqkdkkjukik7vjbxvhgm7ykdv5fa +open_aea/agents/my_first_aea,bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 open_aea/connections/scaffold,bafybeifucsl5zfe4if4zfaddud77lzwgg7emv3mr3x3us57py7vbhktb24 open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxtaygehda open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze diff --git a/packages/open_aea/agents/my_first_aea/aea-config.yaml b/packages/open_aea/agents/my_first_aea/aea-config.yaml index e4fa8d7faf..e3d8eb1482 100644 --- a/packages/open_aea/agents/my_first_aea/aea-config.yaml +++ b/packages/open_aea/agents/my_first_aea/aea-config.yaml @@ -8,7 +8,7 @@ fingerprint: README.md: bafybeiftiqiqpxn7ghrurhepquzqzk3su3x6wanlnolt2uj772fzgz574m fingerprint_ignore_patterns: [] connections: -- fetchai/stub:0.21.0:bafybeie3i7oxzx34dspfxt6oemyswg2tnhdskpe3sj24c7nyamd3tytygm +- fetchai/stub:0.21.0:bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq contracts: [] protocols: - fetchai/default:1.0.0:bafybeide4cvhzwohrzuk44zpnie64gjm3rwem7xrwdufvnrusgggmwe2dy From a48703d6674d1ad6202eb896f44f949e2e9303a6 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Fri, 2 Sep 2022 09:57:14 +0200 Subject: [PATCH 76/93] chore: move acn protocol tests --- deploy-image/build.sh | 2 +- docs/echo_demo.md | 2 +- docs/quickstart.md | 2 +- packages/hashes.csv | 8 +- .../connections/p2p_libp2p/connection.yaml | 2 +- .../p2p_libp2p_client/connection.yaml | 2 +- .../p2p_libp2p_mailbox/connection.yaml | 2 +- packages/valory/protocols/acn/protocol.yaml | 2 + .../valory/protocols/acn/tests/__init__.py | 20 ++ .../valory/protocols/acn/tests/test_acn.py | 257 ++++++++++++++++++ .../md_files/bash-quickstart.md | 6 +- .../test_packages/test_protocols/test_acn.py | 234 ---------------- 12 files changed, 292 insertions(+), 247 deletions(-) create mode 100644 packages/valory/protocols/acn/tests/__init__.py create mode 100644 packages/valory/protocols/acn/tests/test_acn.py diff --git a/deploy-image/build.sh b/deploy-image/build.sh index 3c3aea4d17..c9c46f3413 100644 --- a/deploy-image/build.sh +++ b/deploy-image/build.sh @@ -2,7 +2,7 @@ set -e # setup the agent -aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote cd my_first_aea/ aea install aea build diff --git a/docs/echo_demo.md b/docs/echo_demo.md index 5a7b093b19..7b199c4ed1 100644 --- a/docs/echo_demo.md +++ b/docs/echo_demo.md @@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/docs/quickstart.md b/docs/quickstart.md index c8a6d3428e..73fdd475b1 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -168,7 +168,7 @@ This is a simple demo that introduces you to the main components of an AEA. The fastest way to have your first AEA is to fetch one that already exists! ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote cd my_first_aea ``` ### Install AEA dependencies diff --git a/packages/hashes.csv b/packages/hashes.csv index b7d2ea92a7..8b3f2c81de 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -36,8 +36,8 @@ open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxt open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze open_aea/protocols/signing,bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi open_aea/skills/scaffold,bafybeih3h7yia76rrbittnoeotpraiuho5rdqsnksuvncinaa3akgmnbaa -valory/connections/p2p_libp2p,bafybeigxbnvgurf6byb646snqchqlrpxfd4h3rxt7bvg5zlg3yjcq7tzma -valory/connections/p2p_libp2p_client,bafybeif7plocy4y6bvhtb3bob3onsyt6lycyjzcdfk5ze72qa2xwqb4yji -valory/connections/p2p_libp2p_mailbox,bafybeie6mbdudc6iryro6pxjxsbkx2xnmexvthb7rwkum2pt6tv4n26aey -valory/protocols/acn,bafybeif7dt6cwbixufftupr2srfuzg2w2vgevtqdxwq3z25yab3ptpkyqq +valory/connections/p2p_libp2p,bafybeiebn2fe6sankudbesknoz4oqa5ir6fzyzlzmcadlserwxx637gwau +valory/connections/p2p_libp2p_client,bafybeibjsohzs4gyjothhiskcrmcnsxtlkf5tq2aipbzh7vyjkq2ky4bsm +valory/connections/p2p_libp2p_mailbox,bafybeigyxfnmpvkmmvxkbkni3bjd7q4q27pm7zkw5tczr54tqriuozms7m +valory/protocols/acn,bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm valory/protocols/tendermint,bafybeidbdvqgrr2lbstyqbyb24kxhen6xnv65e3zqg7xj6fwrogrzms2ty diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 3e3fca8e94..41a356cd42 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -58,7 +58,7 @@ fingerprint_ignore_patterns: [] build_entrypoint: check_dependencies.py connections: [] protocols: -- valory/acn:1.1.0:bafybeif7dt6cwbixufftupr2srfuzg2w2vgevtqdxwq3z25yab3ptpkyqq +- valory/acn:1.1.0:bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm class_name: P2PLibp2pConnection config: delegate_uri: 127.0.0.1:11000 diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index 4401a6f8d4..719bb87829 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeif7dt6cwbixufftupr2srfuzg2w2vgevtqdxwq3z25yab3ptpkyqq +- valory/acn:1.1.0:bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm class_name: P2PLibp2pClientConnection config: connect_retries: 3 diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index 6f1b3cf166..cec7f302f7 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeif7dt6cwbixufftupr2srfuzg2w2vgevtqdxwq3z25yab3ptpkyqq +- valory/acn:1.1.0:bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm class_name: P2PLibp2pMailboxConnection config: connect_retries: 3 diff --git a/packages/valory/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml index 4605ba32ef..49e05d4070 100644 --- a/packages/valory/protocols/acn/protocol.yaml +++ b/packages/valory/protocols/acn/protocol.yaml @@ -15,6 +15,8 @@ fingerprint: dialogues.py: bafybeicgcqcnztuwcwvwzzbh5jjmc5gw56yzk65b33gxj7fu7caoay6bd4 message.py: bafybeiggjefapn3d5s623fazxrl7von5yqel4eczrie5yvwk4s7gbumt44 serialization.py: bafybeiaz3ykvi6nyyx6cdry7fepy76l55jpduhl6vazhmrgt7trejmksam + tests/__init__.py: bafybeidteufp2npjd77ekcftk5e4gbaquq3gike5nxtk5xfmnusls56keu + tests/test_acn.py: bafybeia4usywpj5gnp5qgdne4xojwwnx2jowvjx3xo53v6bl262fjzkhsq fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/acn/tests/__init__.py b/packages/valory/protocols/acn/tests/__init__.py new file mode 100644 index 0000000000..0ca8df4d2b --- /dev/null +++ b/packages/valory/protocols/acn/tests/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""The tests module contains the tests of the acn protocol.""" diff --git a/packages/valory/protocols/acn/tests/test_acn.py b/packages/valory/protocols/acn/tests/test_acn.py new file mode 100644 index 0000000000..c758eaa1a7 --- /dev/null +++ b/packages/valory/protocols/acn/tests/test_acn.py @@ -0,0 +1,257 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2022 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +"""This module contains the tests of the messages module.""" + +from typing import Type +from unittest import mock +from unittest.mock import patch + +import pytest + +from aea.common import Address +from aea.protocols.base import Message +from aea.protocols.dialogue.base import Dialogue as BaseDialogue +from aea.protocols.dialogue.base import DialogueLabel + +from packages.valory.protocols.acn.dialogues import AcnDialogue as BaseAcnDialogue +from packages.valory.protocols.acn.dialogues import AcnDialogues as BaseAcnDialogues +from packages.valory.protocols.acn.message import AcnMessage + + +def test_acn_aea_envelope_serialization(): + """Test that the serialization for the 'simple' protocol works for the AEA_ENVELOPE message.""" + expected_msg = AcnMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=AcnMessage.Performative.AEA_ENVELOPE, + envelope=b"envelope", + record=AcnMessage.AgentRecord( + address="address", + public_key="pbk", + peer_public_key="peerpbk", + signature="sign", + service_id="acn", + ledger_id="fetchai", + ), + ) + msg_bytes = AcnMessage.serializer.encode(expected_msg) + actual_msg = AcnMessage.serializer.decode(msg_bytes) + assert expected_msg == actual_msg + + +def test_acn_lookup_request_serialization(): + """Test that the serialization for the 'simple' protocol works for the LOOKUP_REQUEST message.""" + msg = AcnMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=AcnMessage.Performative.LOOKUP_REQUEST, + agent_address="some_address", + ) + msg_bytes = AcnMessage.serializer.encode(msg) + actual_msg = AcnMessage.serializer.decode(msg_bytes) + expected_msg = msg + assert expected_msg == actual_msg + + +def test_acn_lookup_response_serialization(): + """Test that the serialization for the 'simple' protocol works for the LOOKUP_RESPONSE message.""" + msg = AcnMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=AcnMessage.Performative.LOOKUP_RESPONSE, + record=AcnMessage.AgentRecord( + address="address", + public_key="pbk", + peer_public_key="peerpbk", + signature="sign", + service_id="acn", + ledger_id="fetchai", + ), + ) + msg_bytes = AcnMessage.serializer.encode(msg) + actual_msg = AcnMessage.serializer.decode(msg_bytes) + expected_msg = msg + assert expected_msg == actual_msg + + +def test_acn_record_serialization(): + """Test that the serialization for the 'simple' protocol works for the REGISTER message.""" + msg = AcnMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=AcnMessage.Performative.REGISTER, + record=AcnMessage.AgentRecord( + address="address", + public_key="pbk", + peer_public_key="peerpbk", + signature="sign", + service_id="acn", + ledger_id="fetchai", + ), + ) + msg_bytes = AcnMessage.serializer.encode(msg) + actual_msg = AcnMessage.serializer.decode(msg_bytes) + expected_msg = msg + assert expected_msg == actual_msg + + +def test_acn_status_serialization(): + """Test that the serialization for the 'simple' protocol works for the STATUS message.""" + msg = AcnMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=AcnMessage.Performative.STATUS, + body=AcnMessage.StatusBody( + status_code=AcnMessage.StatusBody.StatusCode.ERROR_UNSUPPORTED_VERSION, + msgs=["pbk"], + ), + ) + msg_bytes = AcnMessage.serializer.encode(msg) + actual_msg = AcnMessage.serializer.decode(msg_bytes) + expected_msg = msg + assert expected_msg == actual_msg + + +def test_acn_message_str_values(): + """Tests the returned string values of acn Message.""" + assert ( + str(AcnMessage.Performative.LOOKUP_REQUEST) == "lookup_request" + ), "AcnMessage.Performative.LOOKUP_REQUEST must be lookup_request" + + +def test_encoding_unknown_performative(): + """Test that we raise an exception when the performative is unknown during encoding.""" + msg = AcnMessage( + performative=AcnMessage.Performative.LOOKUP_REQUEST, + agent_address="address", + ) + + with pytest.raises(ValueError, match="Performative not valid:"): + with mock.patch.object(AcnMessage.Performative, "__eq__", return_value=False): + AcnMessage.serializer.encode(msg) + + +def test_check_consistency_raises_exception_when_type_not_recognized(): + """Test that we raise exception when the type of the message is not recognized.""" + message = AcnMessage( + dialogue_reference=("", ""), + message_id=1, + target=0, + performative=AcnMessage.Performative.LOOKUP_REQUEST, + agent_address="address", + ) + # mock the __eq__ method such that any kind of matching is going to fail. + with mock.patch.object(AcnMessage.Performative, "__eq__", return_value=False): + assert not message._is_consistent() + + +def test_acn_valid_performatives(): + """Test 'valid_performatives' getter.""" + msg = AcnMessage(AcnMessage.Performative.LOOKUP_REQUEST, agent_address="address") + assert msg.valid_performatives == set( + map(lambda x: x.value, iter(AcnMessage.Performative)) + ) + + +def test_serializer_performative_not_found(): + """Test the serializer when the performative is not found.""" + message = AcnMessage( + message_id=1, + target=0, + performative=AcnMessage.Performative.LOOKUP_REQUEST, + agent_address="address", + ) + message_bytes = message.serializer.encode(message) + with patch.object(AcnMessage.Performative, "__eq__", return_value=False): + with pytest.raises(ValueError, match="Performative not valid: .*"): + message.serializer.decode(message_bytes) + + +def test_dialogues(): + """Test intiaontiation of dialogues.""" + acn_dialogues = AcnDialogues("agent_addr") + msg, dialogue = acn_dialogues.create( + counterparty="abc", + performative=AcnMessage.Performative.LOOKUP_REQUEST, + agent_address="address", + ) + assert dialogue is not None + + +class AcnDialogue(BaseAcnDialogue): + """The dialogue class maintains state of a dialogue and manages it.""" + + def __init__( + self, + dialogue_label: DialogueLabel, + self_address: Address, + role: BaseDialogue.Role, + message_class: Type[AcnMessage], + ) -> None: + """ + Initialize a dialogue. + + :param dialogue_label: the identifier of the dialogue + :param self_address: the address of the entity for whom this dialogue is maintained + :param role: the role of the agent this dialogue is maintained for + + :return: None + """ + BaseAcnDialogue.__init__( + self, + dialogue_label=dialogue_label, + self_address=self_address, + role=role, + message_class=message_class, + ) + + +class AcnDialogues(BaseAcnDialogues): + """The dialogues class keeps track of all dialogues.""" + + def __init__(self, self_address: Address) -> None: + """ + Initialize dialogues. + + :return: None + """ + + def role_from_first_message( # pylint: disable=unused-argument + message: Message, receiver_address: Address + ) -> BaseDialogue.Role: + """Infer the role of the agent from an incoming/outgoing first message + + :param message: an incoming/outgoing first message + :param receiver_address: the address of the receiving agent + :return: The role of the agent + """ + return AcnDialogue.Role.NODE + + BaseAcnDialogues.__init__( + self, + self_address=self_address, + role_from_first_message=role_from_first_message, + dialogue_class=AcnDialogue, + ) diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index fd498b3d70..2ab890f697 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -72,7 +72,7 @@ v1.7.0 AEA configurations successfully initialized: {'author': 'fetchai'} ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote cd my_first_aea ``` ``` bash @@ -158,12 +158,12 @@ aea delete my_first_aea ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote cd my_first_aea ``` ``` bash -aea fetch open_aea/my_first_aea:0.1.0:bafybeih7n7c3j24cd4ioycwt5a4fgfmj4u7l6r5yww5o2tzh236pgrpmjy --remote +aea fetch open_aea/my_first_aea:0.1.0:bafybeia2h6uk25aktvzwle3nbdex7iqkf4nktgp2w2b6qbqqj3za7h7d24 --remote cd my_first_aea ``` diff --git a/tests/test_packages/test_protocols/test_acn.py b/tests/test_packages/test_protocols/test_acn.py index ba0be3fc85..10c7757c8a 100644 --- a/tests/test_packages/test_protocols/test_acn.py +++ b/tests/test_packages/test_protocols/test_acn.py @@ -23,244 +23,10 @@ import os from pathlib import Path from types import ModuleType -from typing import Type -from unittest import mock -from unittest.mock import patch -import pytest - -from aea.common import Address -from aea.protocols.base import Message -from aea.protocols.dialogue.base import Dialogue as BaseDialogue -from aea.protocols.dialogue.base import DialogueLabel from libs.go.aealite.protocols.acn import v1_0_0 as aealite_acn # type: ignore from packages.valory.protocols import acn as package_acn -from packages.valory.protocols.acn.dialogues import AcnDialogue as BaseAcnDialogue -from packages.valory.protocols.acn.dialogues import AcnDialogues as BaseAcnDialogues -from packages.valory.protocols.acn.message import AcnMessage - - -def test_acn_aea_envelope_serialization(): - """Test that the serialization for the 'simple' protocol works for the AEA_ENVELOPE message.""" - expected_msg = AcnMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=AcnMessage.Performative.AEA_ENVELOPE, - envelope=b"envelope", - record=AcnMessage.AgentRecord( - address="address", - public_key="pbk", - peer_public_key="peerpbk", - signature="sign", - service_id="acn", - ledger_id="fetchai", - ), - ) - msg_bytes = AcnMessage.serializer.encode(expected_msg) - actual_msg = AcnMessage.serializer.decode(msg_bytes) - assert expected_msg == actual_msg - - -def test_acn_lookup_request_serialization(): - """Test that the serialization for the 'simple' protocol works for the LOOKUP_REQUEST message.""" - msg = AcnMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=AcnMessage.Performative.LOOKUP_REQUEST, - agent_address="some_address", - ) - msg_bytes = AcnMessage.serializer.encode(msg) - actual_msg = AcnMessage.serializer.decode(msg_bytes) - expected_msg = msg - assert expected_msg == actual_msg - - -def test_acn_lookup_response_serialization(): - """Test that the serialization for the 'simple' protocol works for the LOOKUP_RESPONSE message.""" - msg = AcnMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=AcnMessage.Performative.LOOKUP_RESPONSE, - record=AcnMessage.AgentRecord( - address="address", - public_key="pbk", - peer_public_key="peerpbk", - signature="sign", - service_id="acn", - ledger_id="fetchai", - ), - ) - msg_bytes = AcnMessage.serializer.encode(msg) - actual_msg = AcnMessage.serializer.decode(msg_bytes) - expected_msg = msg - assert expected_msg == actual_msg - - -def test_acn_record_serialization(): - """Test that the serialization for the 'simple' protocol works for the REGISTER message.""" - msg = AcnMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=AcnMessage.Performative.REGISTER, - record=AcnMessage.AgentRecord( - address="address", - public_key="pbk", - peer_public_key="peerpbk", - signature="sign", - service_id="acn", - ledger_id="fetchai", - ), - ) - msg_bytes = AcnMessage.serializer.encode(msg) - actual_msg = AcnMessage.serializer.decode(msg_bytes) - expected_msg = msg - assert expected_msg == actual_msg - - -def test_acn_status_serialization(): - """Test that the serialization for the 'simple' protocol works for the STATUS message.""" - msg = AcnMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=AcnMessage.Performative.STATUS, - body=AcnMessage.StatusBody( - status_code=AcnMessage.StatusBody.StatusCode.ERROR_UNSUPPORTED_VERSION, - msgs=["pbk"], - ), - ) - msg_bytes = AcnMessage.serializer.encode(msg) - actual_msg = AcnMessage.serializer.decode(msg_bytes) - expected_msg = msg - assert expected_msg == actual_msg - - -def test_acn_message_str_values(): - """Tests the returned string values of acn Message.""" - assert ( - str(AcnMessage.Performative.LOOKUP_REQUEST) == "lookup_request" - ), "AcnMessage.Performative.LOOKUP_REQUEST must be lookup_request" - - -def test_encoding_unknown_performative(): - """Test that we raise an exception when the performative is unknown during encoding.""" - msg = AcnMessage( - performative=AcnMessage.Performative.LOOKUP_REQUEST, - agent_address="address", - ) - - with pytest.raises(ValueError, match="Performative not valid:"): - with mock.patch.object(AcnMessage.Performative, "__eq__", return_value=False): - AcnMessage.serializer.encode(msg) - - -def test_check_consistency_raises_exception_when_type_not_recognized(): - """Test that we raise exception when the type of the message is not recognized.""" - message = AcnMessage( - dialogue_reference=("", ""), - message_id=1, - target=0, - performative=AcnMessage.Performative.LOOKUP_REQUEST, - agent_address="address", - ) - # mock the __eq__ method such that any kind of matching is going to fail. - with mock.patch.object(AcnMessage.Performative, "__eq__", return_value=False): - assert not message._is_consistent() - - -def test_acn_valid_performatives(): - """Test 'valid_performatives' getter.""" - msg = AcnMessage(AcnMessage.Performative.LOOKUP_REQUEST, agent_address="address") - assert msg.valid_performatives == set( - map(lambda x: x.value, iter(AcnMessage.Performative)) - ) - - -def test_serializer_performative_not_found(): - """Test the serializer when the performative is not found.""" - message = AcnMessage( - message_id=1, - target=0, - performative=AcnMessage.Performative.LOOKUP_REQUEST, - agent_address="address", - ) - message_bytes = message.serializer.encode(message) - with patch.object(AcnMessage.Performative, "__eq__", return_value=False): - with pytest.raises(ValueError, match="Performative not valid: .*"): - message.serializer.decode(message_bytes) - - -def test_dialogues(): - """Test intiaontiation of dialogues.""" - acn_dialogues = AcnDialogues("agent_addr") - msg, dialogue = acn_dialogues.create( - counterparty="abc", - performative=AcnMessage.Performative.LOOKUP_REQUEST, - agent_address="address", - ) - assert dialogue is not None - - -class AcnDialogue(BaseAcnDialogue): - """The dialogue class maintains state of a dialogue and manages it.""" - - def __init__( - self, - dialogue_label: DialogueLabel, - self_address: Address, - role: BaseDialogue.Role, - message_class: Type[AcnMessage], - ) -> None: - """ - Initialize a dialogue. - - :param dialogue_label: the identifier of the dialogue - :param self_address: the address of the entity for whom this dialogue is maintained - :param role: the role of the agent this dialogue is maintained for - - :return: None - """ - BaseAcnDialogue.__init__( - self, - dialogue_label=dialogue_label, - self_address=self_address, - role=role, - message_class=message_class, - ) - - -class AcnDialogues(BaseAcnDialogues): - """The dialogues class keeps track of all dialogues.""" - - def __init__(self, self_address: Address) -> None: - """ - Initialize dialogues. - - :return: None - """ - - def role_from_first_message( # pylint: disable=unused-argument - message: Message, receiver_address: Address - ) -> BaseDialogue.Role: - """Infer the role of the agent from an incoming/outgoing first message - - :param message: an incoming/outgoing first message - :param receiver_address: the address of the receiving agent - :return: The role of the agent - """ - return AcnDialogue.Role.NODE - - BaseAcnDialogues.__init__( - self, - self_address=self_address, - role_from_first_message=role_from_first_message, - dialogue_class=AcnDialogue, - ) def test_aealite_protocol_matching(): From e9433b4341cd7b597982fe4df3a9556786f3f8df Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Fri, 2 Sep 2022 10:27:44 +0200 Subject: [PATCH 77/93] chore: fix linters --- packages/hashes.csv | 8 ++++---- packages/valory/connections/p2p_libp2p/connection.yaml | 2 +- .../valory/connections/p2p_libp2p_client/connection.yaml | 2 +- .../connections/p2p_libp2p_mailbox/connection.yaml | 2 +- packages/valory/protocols/acn/protocol.yaml | 2 +- packages/valory/protocols/acn/tests/test_acn.py | 9 ++++----- setup.cfg | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/hashes.csv b/packages/hashes.csv index 8b3f2c81de..bef3bfe203 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -36,8 +36,8 @@ open_aea/contracts/scaffold,bafybeiba4pdufnxve5hdkla42lixnxwfkyg7s2bvuy6zqbxjsxt open_aea/protocols/scaffold,bafybeihhyjuqvp5zqtikkjrwtikg4fr4tsub43n777huxtpeu77g75poze open_aea/protocols/signing,bafybeihjlpgjm5vkg6kxm66a5k2r357dadnsjfpddta2mzd2bshstv6vdi open_aea/skills/scaffold,bafybeih3h7yia76rrbittnoeotpraiuho5rdqsnksuvncinaa3akgmnbaa -valory/connections/p2p_libp2p,bafybeiebn2fe6sankudbesknoz4oqa5ir6fzyzlzmcadlserwxx637gwau -valory/connections/p2p_libp2p_client,bafybeibjsohzs4gyjothhiskcrmcnsxtlkf5tq2aipbzh7vyjkq2ky4bsm -valory/connections/p2p_libp2p_mailbox,bafybeigyxfnmpvkmmvxkbkni3bjd7q4q27pm7zkw5tczr54tqriuozms7m -valory/protocols/acn,bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm +valory/connections/p2p_libp2p,bafybeiazna3ty23alflepujxvxsiil7bhfy4dvrz6tahz5zqbpidzhslsy +valory/connections/p2p_libp2p_client,bafybeicxp7kgrkewdfq763gk5rtxii4k5dwhjbblym275m62vkbygfyuie +valory/connections/p2p_libp2p_mailbox,bafybeigjanxsumu34z2rq6biylmewva54kfiz6ymtdmyvo53bknmykl26a +valory/protocols/acn,bafybeih5pz5re4kycou46xbzgguantxzj46aqtc575pgvej3m6bfg4xpfy valory/protocols/tendermint,bafybeidbdvqgrr2lbstyqbyb24kxhen6xnv65e3zqg7xj6fwrogrzms2ty diff --git a/packages/valory/connections/p2p_libp2p/connection.yaml b/packages/valory/connections/p2p_libp2p/connection.yaml index 41a356cd42..af8da1ddf4 100644 --- a/packages/valory/connections/p2p_libp2p/connection.yaml +++ b/packages/valory/connections/p2p_libp2p/connection.yaml @@ -58,7 +58,7 @@ fingerprint_ignore_patterns: [] build_entrypoint: check_dependencies.py connections: [] protocols: -- valory/acn:1.1.0:bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm +- valory/acn:1.1.0:bafybeih5pz5re4kycou46xbzgguantxzj46aqtc575pgvej3m6bfg4xpfy class_name: P2PLibp2pConnection config: delegate_uri: 127.0.0.1:11000 diff --git a/packages/valory/connections/p2p_libp2p_client/connection.yaml b/packages/valory/connections/p2p_libp2p_client/connection.yaml index 719bb87829..2a95e910bb 100644 --- a/packages/valory/connections/p2p_libp2p_client/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_client/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm +- valory/acn:1.1.0:bafybeih5pz5re4kycou46xbzgguantxzj46aqtc575pgvej3m6bfg4xpfy class_name: P2PLibp2pClientConnection config: connect_retries: 3 diff --git a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml index cec7f302f7..a9145c33e7 100644 --- a/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml +++ b/packages/valory/connections/p2p_libp2p_mailbox/connection.yaml @@ -14,7 +14,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/acn:1.1.0:bafybeig5eegg2pc3clffga6fhyta2jt7so3nt4eqlvkzaiqmia26luzxlm +- valory/acn:1.1.0:bafybeih5pz5re4kycou46xbzgguantxzj46aqtc575pgvej3m6bfg4xpfy class_name: P2PLibp2pMailboxConnection config: connect_retries: 3 diff --git a/packages/valory/protocols/acn/protocol.yaml b/packages/valory/protocols/acn/protocol.yaml index 49e05d4070..98d17890a0 100644 --- a/packages/valory/protocols/acn/protocol.yaml +++ b/packages/valory/protocols/acn/protocol.yaml @@ -16,7 +16,7 @@ fingerprint: message.py: bafybeiggjefapn3d5s623fazxrl7von5yqel4eczrie5yvwk4s7gbumt44 serialization.py: bafybeiaz3ykvi6nyyx6cdry7fepy76l55jpduhl6vazhmrgt7trejmksam tests/__init__.py: bafybeidteufp2npjd77ekcftk5e4gbaquq3gike5nxtk5xfmnusls56keu - tests/test_acn.py: bafybeia4usywpj5gnp5qgdne4xojwwnx2jowvjx3xo53v6bl262fjzkhsq + tests/test_acn.py: bafybeignjgdtlfdnj25hc5necmg7zl3kvngsmzkjgcwfm5qg36liqa63ki fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/acn/tests/test_acn.py b/packages/valory/protocols/acn/tests/test_acn.py index c758eaa1a7..efd8dfa956 100644 --- a/packages/valory/protocols/acn/tests/test_acn.py +++ b/packages/valory/protocols/acn/tests/test_acn.py @@ -164,7 +164,7 @@ def test_check_consistency_raises_exception_when_type_not_recognized(): ) # mock the __eq__ method such that any kind of matching is going to fail. with mock.patch.object(AcnMessage.Performative, "__eq__", return_value=False): - assert not message._is_consistent() + assert not message._is_consistent() # pylint: disable=protected-access def test_acn_valid_performatives(): @@ -192,7 +192,7 @@ def test_serializer_performative_not_found(): def test_dialogues(): """Test intiaontiation of dialogues.""" acn_dialogues = AcnDialogues("agent_addr") - msg, dialogue = acn_dialogues.create( + _, dialogue = acn_dialogues.create( counterparty="abc", performative=AcnMessage.Performative.LOOKUP_REQUEST, agent_address="address", @@ -216,8 +216,7 @@ def __init__( :param dialogue_label: the identifier of the dialogue :param self_address: the address of the entity for whom this dialogue is maintained :param role: the role of the agent this dialogue is maintained for - - :return: None + :param message_class: the message class """ BaseAcnDialogue.__init__( self, @@ -235,7 +234,7 @@ def __init__(self, self_address: Address) -> None: """ Initialize dialogues. - :return: None + :param self_address: the address of the entity that this dialogues is maintained """ def role_from_first_message( # pylint: disable=unused-argument diff --git a/setup.cfg b/setup.cfg index 1e3ac895c0..b974d2edfa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -57,7 +57,7 @@ python_version = 3.7 strict_optional = True # temporary until fixed -exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py +exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py|acn/tests/test_acn.py # Before adding a module here, make sure it does not support type hints From 8796cf6b9186b677ab2da7d5efc7d2318a0939b6 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 13:40:24 +0000 Subject: [PATCH 78/93] feat: clean up test.py file --- aea/cli/test.py | 325 +++++++++++++++++++++++++++++------------------- 1 file changed, 200 insertions(+), 125 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 1b80879ae1..c50015e344 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -19,12 +19,12 @@ # ------------------------------------------------------------------------------ """Implementation of the 'aea test' command.""" +import contextlib import os import sys import tempfile -import time from pathlib import Path -from typing import Callable, Optional, Sequence, Set, cast +from typing import Any, Callable, List, Optional, Sequence, Set, Tuple, cast import click import pytest @@ -35,7 +35,6 @@ determine_package_type_for_directory, ) from aea.cli.utils.context import Context -from aea.cli.utils.decorators import check_aea_project, pass_ctx, pytest_args from aea.cli.utils.package_utils import get_package_path from aea.components.base import load_aea_package from aea.configurations.base import ComponentConfiguration @@ -72,9 +71,7 @@ """ -@click.group( - invoke_without_command=True, -) +@click.group() @click.pass_context @click.option( "--cov", @@ -82,71 +79,108 @@ default=False, help="Use this flag to enable code coverage checks.", ) -def test(click_context: click.Context, cov: bool) -> None: +@click.option( + "--cov-output", + type=click.Path(exists=True, dir_okay=True, file_okay=False), + help="Directory to output codecov reports.", +) +def test(click_context: click.Context, cov: bool, cov_output: str) -> None: """Run tests of an AEA project.""" ctx = cast(Context, click_context.obj) ctx.config["cov"] = cov - if click_context.invoked_subcommand is None: - test_aea_project(click_context, Path(ctx.cwd), args=[]) + ctx.config["cov_output"] = cov_output -@test.command() +@test.command( + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) @click.argument("connection_public_id", type=PublicIdParameter(), required=True) -@pytest_args -@pass_ctx +@click.pass_context def connection( - ctx: Context, connection_public_id: PublicId, args: Sequence[str] + click_context: click.Context, + connection_public_id: PublicId, ) -> None: """Executes a test suite of a connection package dependency.""" - test_item(ctx, CONNECTION, connection_public_id, args) + test_item(click_context.obj, CONNECTION, connection_public_id, click_context.args) -@test.command() +@test.command( + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) @click.argument("contract_public_id", type=PublicIdParameter(), required=True) -@pytest_args -@pass_ctx -def contract(ctx: Context, contract_public_id: PublicId, args: Sequence[str]) -> None: +@click.pass_context +def contract( + click_context: click.Context, + contract_public_id: PublicId, +) -> None: """Executes a test suite of a contract package dependency.""" - test_item(ctx, CONTRACT, contract_public_id, args) + test_item(click_context.obj, CONTRACT, contract_public_id, click_context.args) -@test.command() +@test.command( + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) @click.argument("protocol_public_id", type=PublicIdParameter(), required=True) -@pytest_args -@pass_ctx -def protocol(ctx: Context, protocol_public_id: PublicId, args: Sequence[str]) -> None: +@click.pass_context +def protocol( + click_context: click.Context, + protocol_public_id: PublicId, +) -> None: """Executes a test suite of a protocol package dependency.""" - test_item(ctx, PROTOCOL, protocol_public_id, args) + test_item(click_context.obj, PROTOCOL, protocol_public_id, click_context.args) -@test.command() +@test.command( + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) @click.argument("skill_public_id", type=PublicIdParameter(), required=True) -@pytest_args -@pass_ctx -def skill(ctx: Context, skill_public_id: PublicId, args: Sequence[str]) -> None: +@click.pass_context +def skill( + click_context: click.Context, + skill_public_id: PublicId, +) -> None: """Executes a test suite of a skill package dependency.""" - test_item(ctx, SKILL, skill_public_id, args) + test_item(click_context.obj, SKILL, skill_public_id, click_context.args) -@test.command() +@test.command( + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) @click.argument( "path", type=click.Path(exists=True, file_okay=False, dir_okay=True), required=True ) -@pytest_args -@pass_ctx +@click.pass_context def by_path( - ctx: Context, + click_context: click.Context, path: str, - args: Sequence[str], ) -> None: """Executes a test suite of a package specified by a path.""" click.echo(f"Executing tests of package at {path}'...") + + ctx: Context = click_context.obj full_path = Path(ctx.cwd) / Path(path) + test_package_by_path( full_path, - args, + click_context.args, packages_dir=Path(ctx.registry_path), cov=ctx.config.get("cov", False), + cov_output=ctx.config.get("cov_output"), ) @@ -158,69 +192,25 @@ def by_path( ) @click.pass_context def packages(click_context: click.Context) -> None: - """Executes a test suite of a package specified by a path.""" + """Executes a test suite for a collection of packages.""" ctx: Context = click_context.obj packages_dir = Path(ctx.registry_path) available_packages = DependencyTree.find_packages_in_a_local_repository( packages_dir ) - coverage_data = [] - failures = [] - start_time = time.perf_counter() - - with tempfile.TemporaryDirectory() as temp_dir: - covrc_file = Path(temp_dir, COVERAGERC_FILE) - covrc_file.write_text( - COVERAGERC_CONFIG.format(root_dir=str(packages_dir.parent)) + cov = ctx.config.get("cov", False) + cov_output = Path(ctx.config.get("cov_output") or Path.cwd()).resolve() + with CoveragercFile(root_dir=cov_output) as covrc_file: + coverage_data, failures = test_package_collection( + available_packages=available_packages, + packages_dir=packages_dir, + pytest_args=click_context.args, + cov=cov, + covrc_file=covrc_file, ) - - for package_type, package_dir in available_packages: - if package_type == PackageType.AGENT.value: - continue - - test_dir = package_dir / AEA_TEST_DIRNAME - if not test_dir.exists(): - continue - - load_package(package_dir, packages_dir=packages_dir) - with cd(package_dir): - click.echo( - f"Running tests for {package_dir.name} of type {package_type}" - ) - exit_code = pytest.main( - [ - package_dir / AEA_TEST_DIRNAME, - f"--cov={package_dir.absolute()}", - "--doctest-modules", - str(package_dir.absolute()), - f"--cov-config={covrc_file}", - "--cov-report=term", - *click_context.args, - ] - ) - if exit_code: - if exit_code == pytest.ExitCode.NO_TESTS_COLLECTED: - click.echo( - f"Could not collect tests for for {package_dir.name} of type {package_type}" - ) - continue - - click.echo( - f"Running tests for for {package_dir.name} of type {package_type} failed" - ) - failures.append( - (exit_code, os.path.sep.join(package_dir.parts[-3:])) - ) - coverage_data.append(str(package_dir / ".coverage")) - - total_time = (time.perf_counter() - start_time) // 60 - click.echo(f"Time : {total_time}") - - click.echo("Generating coverage reports.") - coverage(argv=["combine", f"--rcfile={covrc_file}", *coverage_data]) - coverage(argv=["html", f"--rcfile={covrc_file}"]) - coverage(argv=["xml", f"--rcfile={covrc_file}"]) + if cov: + aggregate_coverage(coverage_data=coverage_data, covrc_file=covrc_file) if len(failures) > 0: click.echo("Failed tests") @@ -315,6 +305,7 @@ def test_package_by_path( aea_project_path: Optional[Path] = None, packages_dir: Optional[Path] = None, cov: bool = False, + cov_output: Optional[Path] = None, ) -> None: """ Fingerprint package placed in package_dir. @@ -324,49 +315,71 @@ def test_package_by_path( :param aea_project_path: directory to the AEA project :param packages_dir: directory of the packages to import from :param cov: coverage capture indicator + :param cov_output: Path to coverage output directory """ - + cov_output = Path(cov_output or Path.cwd()).resolve() load_package(package_dir, aea_project_path, packages_dir) - exit_code = run_pytest(package_dir, pytest_arguments=pytest_arguments, cov=cov) - sys.exit(exit_code) + with CoveragercFile(root_dir=cov_output) as covrc_file: + with cd(package_dir): + runtime_args = [ + *get_pytest_args(covrc_file=covrc_file, cov=cov), + *pytest_arguments, + ] + exit_code = pytest.main(runtime_args) + coverage_file = ".coverage" + coverage( + argv=["html", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] + ) + coverage( + argv=["xml", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] + ) + os.remove(coverage_file) + sys.exit(exit_code) -def run_pytest( - package_dir: Path, - pytest_arguments: Sequence[str], - cov: bool = False, -) -> int: - """Run pytest.""" - runtime_args = [ - AEA_TEST_DIRNAME, - *pytest_arguments, - ] +def test_package_collection( + available_packages: List[Tuple[str, Path]], + packages_dir: Path, + pytest_args: List[str], + cov: bool, + covrc_file: Path, +) -> Tuple[List[str], List[Tuple[int, str]]]: + """Test a collection of packages.""" - if cov: - runtime_args.extend( - [ - f"--cov={package_dir.absolute()}", - "--doctest-modules", - str(package_dir.absolute()), - "--cov-report=term", - "--cov-report=term-missing", - ] - ) + coverage_data = [] + failures = [] - with cd(package_dir): - return pytest.main(runtime_args) + for package_type, package_dir in available_packages: + test_dir = package_dir / AEA_TEST_DIRNAME + if package_type == PackageType.AGENT.value or not test_dir.exists(): + continue + + load_package(package_dir, packages_dir=packages_dir) + with cd(package_dir): + click.echo(f"Running tests for {package_dir.name} of type {package_type}") + exit_code = pytest.main( + [ + *get_pytest_args(covrc_file=covrc_file, cov=cov), + *pytest_args, + ] + ) + coverage_file = package_dir / ".coverage" + coverage_data.append(str(coverage_file)) + + if exit_code: + if exit_code == pytest.ExitCode.NO_TESTS_COLLECTED: + click.echo( + f"Could not collect tests for for {package_dir.name} of type {package_type}" + ) + continue + click.echo( + f"Running tests for for {package_dir.name} of type {package_type} failed" + ) + failures.append((exit_code, os.path.sep.join(package_dir.parts[-3:]))) -@check_aea_project -def test_aea_project( - click_context: click.Context, aea_project_dirpath: Path, args: Sequence[str] -) -> None: - """Run tests of an AEA project.""" - click.echo("Executing tests of the AEA project...") - ctx = cast(Context, click_context.obj) - # in case of an AEA project, the 'packages' directory is the AEA project path itself - test_package_by_path(aea_project_dirpath, args, aea_project_path=Path(ctx.cwd)) + return coverage_data, failures def load_aea_packages_recursively( @@ -415,3 +428,65 @@ def find_component_directory_from_component_id_in_registry( return package_path raise ValueError("Package {} not found.".format(component_id)) + + +def aggregate_coverage(coverage_data: List[str], covrc_file: Path) -> None: + """Aggregate coverage reports.""" + + click.echo("Generating coverage reports.") + + coverage_data = [file for file in coverage_data if Path(file).exists()] + coverage(argv=["combine", f"--rcfile={covrc_file}", *coverage_data]) + coverage(argv=["html", f"--rcfile={covrc_file}"]) + coverage(argv=["xml", f"--rcfile={covrc_file}"]) + + # remove redundant coverage data + for file in coverage_data: + if Path(file).exists(): + os.remove(file) + + +def get_pytest_args( + covrc_file: Path, + cov: bool = False, +) -> List: + """Get pytest args for coverage checks.""" + + if not cov: + return [ + AEA_TEST_DIRNAME, + ] + + return [ + AEA_TEST_DIRNAME, + "--cov=.", + "--doctest-modules", + ".", + f"--cov-config={covrc_file}", + "--cov-report=term", + ] + + +class CoveragercFile: + """Coveragerc file context""" + + def __init__(self, root_dir: Path) -> None: + """Initialize object.""" + + self._t = tempfile.TemporaryDirectory() + self.file = Path(self._t.name, COVERAGERC_FILE) + self.root_dir = root_dir + + def __enter__( + self, + ) -> Path: + """Enter context.""" + + self.file.write_text(COVERAGERC_CONFIG.format(root_dir=self.root_dir)) + return self.file + + def __exit__(self, *args: Any, **kwargs: Any) -> None: + """Exit context.""" + + with contextlib.suppress(OSError, PermissionError): + self._t.cleanup() From bce8719f54bb99225b1c0aa0109caa715c9dc530 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 15:07:18 +0000 Subject: [PATCH 79/93] feat: reintroduce project test runner --- aea/cli/test.py | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index c50015e344..5cdd35766f 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -35,6 +35,7 @@ determine_package_type_for_directory, ) from aea.cli.utils.context import Context +from aea.cli.utils.decorators import check_aea_project from aea.cli.utils.package_utils import get_package_path from aea.components.base import load_aea_package from aea.configurations.base import ComponentConfiguration @@ -71,7 +72,13 @@ """ -@click.group() +@click.group( + invoke_without_command=True, + context_settings=dict( + ignore_unknown_options=True, + allow_extra_args=True, + ), +) @click.pass_context @click.option( "--cov", @@ -90,6 +97,42 @@ def test(click_context: click.Context, cov: bool, cov_output: str) -> None: ctx.config["cov"] = cov ctx.config["cov_output"] = cov_output + if click_context.invoked_subcommand is None: + test_aea_project(click_context) + + +@check_aea_project +def test_aea_project(click_context: click.Context) -> None: + """Test AEA project.""" + + click.echo("Executing tests of the AEA project...") + + ctx = cast(Context, click_context.obj) + + aea_project_dir = Path(ctx.cwd) + packages_dir = Path(ctx.registry_path) + cov = ctx.config.get("cov", False) + cov_output = Path(ctx.config.get("cov_output") or Path.cwd()).resolve() + + # in case of an AEA project, the 'packages' directory is the AEA project path itself + load_package(aea_project_dir, aea_project_dir, packages_dir) + with CoveragercFile(root_dir=cov_output) as covrc_file: + with cd(aea_project_dir): + runtime_args = [ + *get_pytest_args(covrc_file=covrc_file, cov=cov), + ] + exit_code = pytest.main(runtime_args) + coverage_file = ".coverage" + coverage( + argv=["html", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] + ) + coverage( + argv=["xml", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] + ) + os.remove(coverage_file) + + sys.exit(exit_code) + @test.command( context_settings=dict( From 57235a0be4ea758011d42b69fbc70886466f52db Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 15:22:23 +0000 Subject: [PATCH 80/93] fix: coverage clean up --- aea/cli/test.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 5cdd35766f..91c7493157 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -369,14 +369,23 @@ def test_package_by_path( *pytest_arguments, ] exit_code = pytest.main(runtime_args) - coverage_file = ".coverage" - coverage( - argv=["html", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] - ) - coverage( - argv=["xml", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] - ) - os.remove(coverage_file) + if cov: + coverage_file = ".coverage" + coverage( + argv=[ + "html", + f"--rcfile={covrc_file}", + f"--data-file={coverage_file}", + ] + ) + coverage( + argv=[ + "xml", + f"--rcfile={covrc_file}", + f"--data-file={coverage_file}", + ] + ) + os.remove(coverage_file) sys.exit(exit_code) From 12ba50bf2309f5550961a648b8caa63fd69acbf5 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 15:45:45 +0000 Subject: [PATCH 81/93] chore: bump open-aea to v1.18.0 --- aea/__version__.py | 2 +- deploy-image/Dockerfile | 2 +- deploy-image/README.md | 2 +- develop-image/docker-env.sh | 2 +- examples/tac_deploy/Dockerfile | 2 +- packages/hashes.csv | 2 +- scripts/install.ps1 | 2 +- scripts/install.sh | 2 +- skaffold.yaml | 4 ++-- tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md | 2 +- user-image/docker-env.sh | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aea/__version__.py b/aea/__version__.py index 176e41b95d..ffd3523263 100644 --- a/aea/__version__.py +++ b/aea/__version__.py @@ -23,7 +23,7 @@ __title__ = "open-aea" __description__ = "Open Autonomous Economic Agent framework (without vendor lock-in)" __url__ = "https://github.com/valory-xyz/open-aea.git" -__version__ = "1.17.0" +__version__ = "1.18.0" __author__ = "Valory AG" __license__ = "Apache-2.0" __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited" diff --git a/deploy-image/Dockerfile b/deploy-image/Dockerfile index 3bd908a197..f3dcbe8c32 100644 --- a/deploy-image/Dockerfile +++ b/deploy-image/Dockerfile @@ -16,7 +16,7 @@ RUN apk add --no-cache go # aea installation RUN pip install --upgrade pip -RUN pip install --upgrade --force-reinstall open-aea[all]==1.17.0 "open-aea-cli-ipfs<2.0.0,>=1.17.0" +RUN pip install --upgrade --force-reinstall open-aea[all]==1.18.0 "open-aea-cli-ipfs<2.0.0,>=1.17.0" # directories and aea cli config WORKDIR /home/agents diff --git a/deploy-image/README.md b/deploy-image/README.md index 2d54eb2ea0..287b752aba 100644 --- a/deploy-image/README.md +++ b/deploy-image/README.md @@ -11,7 +11,7 @@ The example uses the `fetchai/my_first_aea` project. You will likely want to mod Install subversion, then download the example directory to your local working directory ``` bash -svn checkout https://github.com/valory-xyz/open-aea/tags/v1.17.0/packages packages +svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0/packages packages ``` ### Modify scripts diff --git a/develop-image/docker-env.sh b/develop-image/docker-env.sh index 8e8933299d..b483f11d27 100755 --- a/develop-image/docker-env.sh +++ b/develop-image/docker-env.sh @@ -1,7 +1,7 @@ #!/bin/bash # Swap the following lines if you want to work with 'latest' -DOCKER_IMAGE_TAG=valory/open-aea-develop:1.17.0 +DOCKER_IMAGE_TAG=valory/open-aea-develop:1.18.0 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest DOCKER_BUILD_CONTEXT_DIR=.. diff --git a/examples/tac_deploy/Dockerfile b/examples/tac_deploy/Dockerfile index 460bc3e2e0..9754a73624 100644 --- a/examples/tac_deploy/Dockerfile +++ b/examples/tac_deploy/Dockerfile @@ -19,7 +19,7 @@ RUN apk add --no-cache go # aea installation RUN python -m pip install --upgrade pip -RUN pip install --upgrade --force-reinstall aea[all]==1.17.0 +RUN pip install --upgrade --force-reinstall aea[all]==1.18.0 # directories and aea cli config COPY /.aea /home/.aea diff --git a/packages/hashes.csv b/packages/hashes.csv index bef3bfe203..6e1d827fd6 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -5,7 +5,7 @@ fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxac fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy fetchai/connections/ledger,bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi -fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue +fetchai/connections/local,bafybeihbkstu6rqxxen34246hlr4s3tj4s2janodvt2tuara6mu3xig6sq fetchai/connections/stub,bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 2ddc4476f7..e8ad5ad88d 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -34,7 +34,7 @@ function instal_choco_golang_gcc { } function install_aea { echo "Install aea" - $output=pip install open-aea[all]==1.17.0 --force --no-cache-dir 2>&1 |out-string; + $output=pip install open-aea[all]==1.18.0 --force --no-cache-dir 2>&1 |out-string; if ($LastExitCode -ne 0) { echo $output echo "AEA install failed!" diff --git a/scripts/install.sh b/scripts/install.sh index 98a5aefab0..0a52ab4773 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -42,7 +42,7 @@ function is_python_version_ok() { function install_aea (){ echo "Install AEA" - output=$(pip3 install --user open-aea[all]==1.17.0 --force --no-cache-dir) + output=$(pip3 install --user open-aea[all]==1.18.0 --force --no-cache-dir) if [[ $? -ne 0 ]]; then echo "$output" diff --git a/skaffold.yaml b/skaffold.yaml index a9dde79c93..fb72598f90 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -5,7 +5,7 @@ metadata: build: tagPolicy: envTemplate: - template: "1.17.0" + template: "1.18.0" artifacts: - image: valory/open-aea-develop docker: @@ -24,7 +24,7 @@ profiles: build: tagPolicy: envTemplate: - template: "1.17.0" + template: "1.18.0" artifacts: - image: valory/open-aea-docs docker: diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index 2ab890f697..aebd71c452 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -44,7 +44,7 @@ pip install open-aea[all] pip install open-aea-cli-ipfs ``` ``` -svn checkout https://github.com/valory-xyz/open-aea/tags/v1.17.0/packages packages +svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0/packages packages ``` ``` bash diff --git a/user-image/docker-env.sh b/user-image/docker-env.sh index d8a7cd6683..4ea7ab9a92 100644 --- a/user-image/docker-env.sh +++ b/user-image/docker-env.sh @@ -1,7 +1,7 @@ #!/bin/bash # Swap the following lines if you want to work with 'latest' -DOCKER_IMAGE_TAG=valory/open-aea-user:1.17.0 +DOCKER_IMAGE_TAG=valory/open-aea-user:1.18.0 # DOCKER_IMAGE_TAG=valory/open-aea-user:latest DOCKER_BUILD_CONTEXT_DIR=.. From c2eafbb57de17e081fbd01d7e95fca7fe3a8956f Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 15:47:26 +0000 Subject: [PATCH 82/93] chore: bump plugins to v1.18.0 --- deploy-image/Dockerfile | 2 +- plugins/aea-cli-benchmark/setup.py | 2 +- plugins/aea-cli-ipfs/setup.py | 2 +- plugins/aea-ledger-cosmos/setup.py | 2 +- plugins/aea-ledger-ethereum/setup.py | 2 +- plugins/aea-ledger-fetchai/setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy-image/Dockerfile b/deploy-image/Dockerfile index f3dcbe8c32..c651288765 100644 --- a/deploy-image/Dockerfile +++ b/deploy-image/Dockerfile @@ -16,7 +16,7 @@ RUN apk add --no-cache go # aea installation RUN pip install --upgrade pip -RUN pip install --upgrade --force-reinstall open-aea[all]==1.18.0 "open-aea-cli-ipfs<2.0.0,>=1.17.0" +RUN pip install --upgrade --force-reinstall open-aea[all]==1.18.0 "open-aea-cli-ipfs<2.0.0,>=1.18.0" # directories and aea cli config WORKDIR /home/agents diff --git a/plugins/aea-cli-benchmark/setup.py b/plugins/aea-cli-benchmark/setup.py index 4b3cd47486..eda79e98ba 100755 --- a/plugins/aea-cli-benchmark/setup.py +++ b/plugins/aea-cli-benchmark/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-cli-benchmark", - version="1.17.0", + version="1.18.0", author="Valory AG", license="Apache-2.0", description="CLI extension for AEA framework benchmarking.", diff --git a/plugins/aea-cli-ipfs/setup.py b/plugins/aea-cli-ipfs/setup.py index 102e64300c..d1307aebca 100755 --- a/plugins/aea-cli-ipfs/setup.py +++ b/plugins/aea-cli-ipfs/setup.py @@ -28,7 +28,7 @@ setup( name="open-aea-cli-ipfs", - version="1.17.0", + version="1.18.0", author="Valory AG", license="Apache-2.0", description="CLI extension for open AEA framework wrapping IPFS functionality.", diff --git a/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py index 8f11fa19c8..2f6da7ac60 100644 --- a/plugins/aea-ledger-cosmos/setup.py +++ b/plugins/aea-ledger-cosmos/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-ledger-cosmos", - version="1.17.0", + version="1.18.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.", diff --git a/plugins/aea-ledger-ethereum/setup.py b/plugins/aea-ledger-ethereum/setup.py index 925adc0589..7c179a0a27 100644 --- a/plugins/aea-ledger-ethereum/setup.py +++ b/plugins/aea-ledger-ethereum/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-ledger-ethereum", - version="1.17.0", + version="1.18.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Ethereum.", diff --git a/plugins/aea-ledger-fetchai/setup.py b/plugins/aea-ledger-fetchai/setup.py index 871deb3c61..04f3b94a51 100644 --- a/plugins/aea-ledger-fetchai/setup.py +++ b/plugins/aea-ledger-fetchai/setup.py @@ -31,7 +31,7 @@ setup( name="open-aea-ledger-fetchai", - version="1.17.0", + version="1.18.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger API of Fetch.AI.", From 3d572de34c4756f67fd8a6e935bb852b4c71d472 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 15:54:16 +0000 Subject: [PATCH 83/93] chore: update docs --- mkdocs.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index ba493ce475..994d79d148 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -217,6 +217,10 @@ nav: - Test Cases: 'api/test_tools/test_cases.md' - Test Contract: 'api/test_tools/test_contract.md' - Test Skill: 'api/test_tools/test_skill.md' + - Docker Image : api/test_tools/docker_image.md + - Mocks : api/test_tools/mocks.md + - Network : api/test_tools/network.md + - Utils : api/test_tools/utils.md - Plugins: - CLI: - IPFS: @@ -275,8 +279,13 @@ nav: - API: 'api/plugins/aea_ledger_cosmos/cosmos.md' - Ethereum: - API: 'api/plugins/aea_ledger_ethereum/ethereum.md' + - Constants: api/plugins/aea_ledger_ethereum/test_tools/constants.md + - Docker Images: api/plugins/aea_ledger_ethereum/test_tools/docker_images.md + - Fixture Helpers: api/plugins/aea_ledger_ethereum/test_tools/fixture_helpers.md - Fetchai: - API: 'api/plugins/aea_ledger_fetchai/fetchai.md' + - Constants: api/plugins/aea_ledger_fetchai/test_tools/constants.md + - Docker Images: api/plugins/aea_ledger_fetchai/test_tools/docker_images.md - Helper: 'api/plugins/aea_ledger_fetchai/_cosmos.md' - Registries: - IPFS: ipfs_registry.md From a2060242e394f2ef3076454d2e9c482f4af4aa31 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 16:04:54 +0000 Subject: [PATCH 84/93] chore: update release notes --- HISTORY.md | 40 +++++++++++++++++++++++++++++++++++++++- SECURITY.md | 4 ++-- docs/upgrading.md | 5 +++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index e8bd7e541a..de3e4b353a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,7 +1,45 @@ # Release History - open AEA +## 1.18.0 (2022-08-26) -## 1.17.0 +AEA: +- Fixed protocol header string regex +- Adds `FIELDS_WITH_NESTED_FIELDS` and `NESTED_FIELDS_ALLOWED_TO_UPDATE` in the base config class +- Introduces support for test + - `aea test item_type public_id`: Run all tests of the AEA package specified by `item_type` and `public_id` + - `aea test by-path package_dir`: Run all the tests of the AEA package located at `package_dir` + +Tests: +- Ports tests for following packages into there respective package folders + - `packages/valory/protocols/acn` + - `packages/valory/protocols/tendermint` + - `packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhttests` + - `packages/open_aea/protocols/signing` + - `packages/fetchai/skills/generic_seller` + - `packages/fetchai/skills/http_echo` + - `packages/fetchai/skills/echo` + - `packages/fetchai/skills/erc1155_client` + - `packages/fetchai/skills/gym` + - `packages/fetchai/skills/erc1155_deploy` + - `packages/fetchai/skills/generic_buyer` + - `packages/fetchai/protocols/http` + - `packages/fetchai/protocols/fipa` + - `packages/fetchai/protocols/default` + - `packages/fetchai/protocols/state_update` + - `packages/fetchai/protocols/ledger_api` + - `packages/fetchai/protocols/oef_search` + - `packages/fetchai/protocols/contract_api` + - `packages/fetchai/protocols/gym` + - `packages/fetchai/protocols/tac` + - `packages/fetchai/connections/ledger` + - `packages/fetchai/connections/http_server` + - `packages/fetchai/connections/local` + - `packages/fetchai/connections/stub` + - `packages/fetchai/connections/gym` + - `packages/fetchai/connections/http_client` + - `packages/fetchai/contracts/erc1155` + +## 1.17.0 (2022-08-26) AEA: - Updates the deploy image Dockerfile to use Python 3.10 diff --git a/SECURITY.md b/SECURITY.md index 97ec38f2be..8696ecce16 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,8 +8,8 @@ The following table shows which versions of `open-aea` are currently being suppo | Version | Supported | | --------- | ------------------ | -| `1.17.x` | :white_check_mark: | -| `< 1.17.0` | :x: | +| `1.18.x` | :white_check_mark: | +| `< 1.18.0` | :x: | ## Reporting a Vulnerability diff --git a/docs/upgrading.md b/docs/upgrading.md index d9212f9e9c..c95b35ecb4 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -6,6 +6,11 @@ Below we describe the additional manual steps required to upgrade between differ # Open AEA +## `v1.17.0` to `v1.18.0` + +No backwards incompatible changes. + +Plugins from previous versions are not compatible anymore. ## `v1.16.0` to `v1.17.0` From 5e864dc98e49680f4816cd7869da64a7f6ce3238 Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 16:13:32 +0000 Subject: [PATCH 85/93] chore: revert aea test method --- aea/cli/test.py | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/aea/cli/test.py b/aea/cli/test.py index 91c7493157..dd2b3744b6 100644 --- a/aea/cli/test.py +++ b/aea/cli/test.py @@ -98,40 +98,18 @@ def test(click_context: click.Context, cov: bool, cov_output: str) -> None: ctx.config["cov_output"] = cov_output if click_context.invoked_subcommand is None: - test_aea_project(click_context) + test_aea_project(click_context, Path(ctx.cwd), args=[]) @check_aea_project -def test_aea_project(click_context: click.Context) -> None: - """Test AEA project.""" - +def test_aea_project( + click_context: click.Context, aea_project_dirpath: Path, args: Sequence[str] +) -> None: + """Run tests of an AEA project.""" click.echo("Executing tests of the AEA project...") - ctx = cast(Context, click_context.obj) - - aea_project_dir = Path(ctx.cwd) - packages_dir = Path(ctx.registry_path) - cov = ctx.config.get("cov", False) - cov_output = Path(ctx.config.get("cov_output") or Path.cwd()).resolve() - # in case of an AEA project, the 'packages' directory is the AEA project path itself - load_package(aea_project_dir, aea_project_dir, packages_dir) - with CoveragercFile(root_dir=cov_output) as covrc_file: - with cd(aea_project_dir): - runtime_args = [ - *get_pytest_args(covrc_file=covrc_file, cov=cov), - ] - exit_code = pytest.main(runtime_args) - coverage_file = ".coverage" - coverage( - argv=["html", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] - ) - coverage( - argv=["xml", f"--rcfile={covrc_file}", f"--data-file={coverage_file}"] - ) - os.remove(coverage_file) - - sys.exit(exit_code) + test_package_by_path(aea_project_dirpath, args, aea_project_path=Path(ctx.cwd)) @test.command( From fc201c28f650fff11f33e86737a19173f618703f Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 16:17:34 +0000 Subject: [PATCH 86/93] chore: update hashes --- packages/hashes.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hashes.csv b/packages/hashes.csv index 6e1d827fd6..bef3bfe203 100644 --- a/packages/hashes.csv +++ b/packages/hashes.csv @@ -5,7 +5,7 @@ fetchai/connections/gym,bafybeibenubxl7lamgct2kqlkjbqfpjdvmgsen5jjj6cxaeullesxac fetchai/connections/http_client,bafybeibtrtu7jt2kmdsmghsmgwsj27wrtrc3wscrnughi4qmk2oexppmfa fetchai/connections/http_server,bafybeifpqp4uczojoczhjgl3yle3ojum7hzd7q6wwlmlagz2zpmuarjsmy fetchai/connections/ledger,bafybeiaqwi7itsdle63qhl5f63mvw2qtbl3exouggisutlt6xe6cyjrloi -fetchai/connections/local,bafybeihbkstu6rqxxen34246hlr4s3tj4s2janodvt2tuara6mu3xig6sq +fetchai/connections/local,bafybeici77hdq7ywo4awwweaiz3uof4h2246snv42kjxlexf5kmcsr5pue fetchai/connections/stub,bafybeidrjbyak3nfgch3acwjvvjbpetjhqtxvcoecmvz7zlvghzycc37dq fetchai/contracts/erc1155,bafybeidw2vhsh3ifmg5sxnbxhpu4ygosov5jtzjhilsfkdhoanvwiu7dyi fetchai/protocols/contract_api,bafybeierqtg3fi2t4mn4dbz2xmwfqd4qeuz5rwxqp4ew6jzz24bxjbytpi From 0932b4eb63d9288341ce6904ebf838c2da23f40f Mon Sep 17 00:00:00 2001 From: Viraj Patel Date: Fri, 2 Sep 2022 16:51:16 +0000 Subject: [PATCH 87/93] chore: fix release note --- HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index de3e4b353a..7600086e03 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,7 +5,7 @@ AEA: - Fixed protocol header string regex - Adds `FIELDS_WITH_NESTED_FIELDS` and `NESTED_FIELDS_ALLOWED_TO_UPDATE` in the base config class -- Introduces support for test +- Introduces `aea test` command group - `aea test item_type public_id`: Run all tests of the AEA package specified by `item_type` and `public_id` - `aea test by-path package_dir`: Run all the tests of the AEA package located at `package_dir` From 64b78d8b794d53d5112a78609386919c76a0eb01 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Sun, 4 Sep 2022 14:36:37 +0200 Subject: [PATCH 88/93] chore: fix history --- HISTORY.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 7600086e03..0942d1f00e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,16 +1,17 @@ # Release History - open AEA -## 1.18.0 (2022-08-26) +## 1.18.0 (2022-09-04) AEA: -- Fixed protocol header string regex -- Adds `FIELDS_WITH_NESTED_FIELDS` and `NESTED_FIELDS_ALLOWED_TO_UPDATE` in the base config class -- Introduces `aea test` command group +- Fixes protocol header string regex. +- Adds `FIELDS_WITH_NESTED_FIELDS` and `NESTED_FIELDS_ALLOWED_TO_UPDATE` in the base config class. +- Introduces `aea test` command group: - `aea test item_type public_id`: Run all tests of the AEA package specified by `item_type` and `public_id` - `aea test by-path package_dir`: Run all the tests of the AEA package located at `package_dir` + - `aea test packages`: Runs all tests in the `packages` (local registry) folder. Tests: -- Ports tests for following packages into there respective package folders +- Ports tests for the following packages into their respective package folders - `packages/valory/protocols/acn` - `packages/valory/protocols/tendermint` - `packages/valory/connections/p2p_libp2p/libp2p_node/dht/dhttests` From d250de7d2682a30122ee9d9e80cbf64550516893 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Sun, 4 Sep 2022 15:04:46 +0200 Subject: [PATCH 89/93] chore: skip flaky loading test for now --- tests/test_components/test_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_components/test_base.py b/tests/test_components/test_base.py index 071867e852..d1c6c9a0d1 100644 --- a/tests/test_components/test_base.py +++ b/tests/test_components/test_base.py @@ -121,6 +121,7 @@ def test_load_aea_package(): load_aea_package(config) +@pytest.mark.skip("Problem in CI") def test_load_aea_package_twice(): """Test aea package load twice and ensure python objects stay the same.""" config = ConnectionConfig( From c68a6c75b2995490e405d558e9220e4f90e634e0 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Sun, 4 Sep 2022 15:55:15 +0200 Subject: [PATCH 90/93] fix: copy tests in protocol generator functionality --- aea/cli/generate_all_protocols.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/aea/cli/generate_all_protocols.py b/aea/cli/generate_all_protocols.py index b02387aba6..981a0fae2c 100644 --- a/aea/cli/generate_all_protocols.py +++ b/aea/cli/generate_all_protocols.py @@ -64,6 +64,7 @@ SPECIFICATION_REGEX = re.compile(r"(---\nname.*\.\.\.)", re.DOTALL) LIBPROTOC_VERSION = "libprotoc 3.19.4" CUSTOM_TYPE_MODULE_NAME = "custom_types.py" +TESTS_DIRECTORY_NAME = "tests" PROTOCOL_GENERATOR_DOCSTRING_REGEX = "It was created with protocol buffer compiler version `libprotoc .*` and aea protocol generator version `.*`." logging.basicConfig(format="[%(asctime)s][%(levelname)s] %(message)s") @@ -157,9 +158,9 @@ def _fix_generated_protocol(package_path: Path) -> None: :param package_path: path to the protocol package. Used also to recover the protocol name. """ - log(f"Restore original custom types in {package_path}") custom_types_module = package_path / CUSTOM_TYPE_MODULE_NAME if custom_types_module.exists(): + log(f"Restore original custom types in {package_path}") file_to_replace = Path(PROTOCOLS, package_path.name, CUSTOM_TYPE_MODULE_NAME) file_to_replace.write_text(custom_types_module.read_text()) @@ -171,6 +172,13 @@ def _fix_generated_protocol(package_path: Path) -> None: Path(PROTOCOLS, package_path.name, DEFAULT_README_FILE), ) + tests_module = package_path / TESTS_DIRECTORY_NAME + if tests_module.is_dir(): + log(f"Restore original `tests` directory in {package_path}") + shutil.copytree( + tests_module, Path(PROTOCOLS, package_path.name, TESTS_DIRECTORY_NAME) + ) + def _update_original_protocol(package_path: Path) -> None: """ From 75fa58e5621a11af28769f84ad958adfead26412 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Sun, 4 Sep 2022 16:12:54 +0200 Subject: [PATCH 91/93] chore: minor fixes and reintroduce protocol generator checks --- .github/workflows/workflow.yml | 4 ++-- HISTORY.md | 1 + Makefile | 4 ++-- aea/cli/generate_all_protocols.py | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 27870f4104..3baaf31031 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -139,8 +139,8 @@ jobs: run: tox -e package-version-checks - name: Check package dependencies run: tox -e package-dependencies-checks - # - name: Check generate protocols - # run: tox -e check-generate-all-protocols + - name: Check generate protocols + run: tox -e check-generate-all-protocols - name: Generate Documentation run: tox -e docs diff --git a/HISTORY.md b/HISTORY.md index 0942d1f00e..a29ca8e5c5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -9,6 +9,7 @@ AEA: - `aea test item_type public_id`: Run all tests of the AEA package specified by `item_type` and `public_id` - `aea test by-path package_dir`: Run all the tests of the AEA package located at `package_dir` - `aea test packages`: Runs all tests in the `packages` (local registry) folder. + - `aea test`: Runs tests in the `tests` folder, if present in the agent folder. Tests: - Ports tests for the following packages into their respective package folders diff --git a/Makefile b/Makefile index f7c25db230..146565c766 100644 --- a/Makefile +++ b/Makefile @@ -169,8 +169,8 @@ generators: tox -e fix-copyright python -m aea.cli hash all python -m aea.cli hash all --packages-dir=./tests/data/packages - # python -m aea.cli generate-all-protocols - # python -m aea.cli generate-all-protocols tests/data/packages + python -m aea.cli generate-all-protocols + python -m aea.cli generate-all-protocols tests/data/packages tox -e generate-api-documentation tox -e fix-doc-hashes diff --git a/aea/cli/generate_all_protocols.py b/aea/cli/generate_all_protocols.py index 981a0fae2c..77aad227d6 100644 --- a/aea/cli/generate_all_protocols.py +++ b/aea/cli/generate_all_protocols.py @@ -52,6 +52,7 @@ DEFAULT_PROTOCOL_CONFIG_FILE, DEFAULT_README_FILE, PROTOCOLS, + AEA_TEST_DIRNAME, ) from aea.configurations.data_types import PackageId, PublicId from aea.configurations.loader import ConfigLoaders, load_component_configuration @@ -64,7 +65,6 @@ SPECIFICATION_REGEX = re.compile(r"(---\nname.*\.\.\.)", re.DOTALL) LIBPROTOC_VERSION = "libprotoc 3.19.4" CUSTOM_TYPE_MODULE_NAME = "custom_types.py" -TESTS_DIRECTORY_NAME = "tests" PROTOCOL_GENERATOR_DOCSTRING_REGEX = "It was created with protocol buffer compiler version `libprotoc .*` and aea protocol generator version `.*`." logging.basicConfig(format="[%(asctime)s][%(levelname)s] %(message)s") @@ -172,11 +172,11 @@ def _fix_generated_protocol(package_path: Path) -> None: Path(PROTOCOLS, package_path.name, DEFAULT_README_FILE), ) - tests_module = package_path / TESTS_DIRECTORY_NAME + tests_module = package_path / AEA_TEST_DIRNAME if tests_module.is_dir(): log(f"Restore original `tests` directory in {package_path}") shutil.copytree( - tests_module, Path(PROTOCOLS, package_path.name, TESTS_DIRECTORY_NAME) + tests_module, Path(PROTOCOLS, package_path.name, AEA_TEST_DIRNAME) ) From 426e7ade4ecc44011b0a21b8a36bee9b52c10866 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Sun, 4 Sep 2022 16:20:48 +0200 Subject: [PATCH 92/93] chore: fix hash check script --- scripts/check_ipfs_hashes_pushed.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/check_ipfs_hashes_pushed.py b/scripts/check_ipfs_hashes_pushed.py index cea36a7fd2..398dd7b170 100644 --- a/scripts/check_ipfs_hashes_pushed.py +++ b/scripts/check_ipfs_hashes_pushed.py @@ -33,8 +33,8 @@ def check_ipfs_hash_pushed(ipfs_hash: str) -> bool: """Check that the given ipfs hash exists in the registry""" try: - url = f"{IPFS_ENDPOINT}/{ipfs_hash}" - res = requests.get(url, timeout=5) + url = f"{IPFS_ENDPOINT}/{ipfs_hash.strip()}" + res = requests.get(url, timeout=120) return res.status_code == 200 except requests.RequestException: return False From 35b9f1c3def334c13ae36033ef64f6c29f760038 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Sun, 4 Sep 2022 16:34:07 +0200 Subject: [PATCH 93/93] fix: linter --- aea/cli/generate_all_protocols.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aea/cli/generate_all_protocols.py b/aea/cli/generate_all_protocols.py index 77aad227d6..0defdacb5f 100644 --- a/aea/cli/generate_all_protocols.py +++ b/aea/cli/generate_all_protocols.py @@ -49,10 +49,10 @@ from aea.common import JSONLike from aea.configurations.base import ComponentType, ProtocolConfig from aea.configurations.constants import ( + AEA_TEST_DIRNAME, DEFAULT_PROTOCOL_CONFIG_FILE, DEFAULT_README_FILE, PROTOCOLS, - AEA_TEST_DIRNAME, ) from aea.configurations.data_types import PackageId, PublicId from aea.configurations.loader import ConfigLoaders, load_component_configuration