chore: review comments

docs/p2p-connection.md

@@ -26,7 +26,7 @@ Create one AEA as follows:
 ``` bash
 aea create my_genesis_aea
 cd my_genesis_aea
-aea add connection valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma --remote
+aea add connection valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m --remote
 aea config set agent.default_connection valory/p2p_libp2p:0.1.0
 aea install
 aea build
@@ -58,7 +58,7 @@ Create a second AEA:
 ``` bash
 aea create my_other_aea
 cd my_other_aea
-aea add connection valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma --remote
+aea add connection valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m --remote
 aea config set agent.default_connection valory/p2p_libp2p:0.1.0
 aea install
 aea build

docs/package_list.md

@@ -14,24 +14,24 @@
 | contract/fetchai/erc1155/0.22.0                               | `bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4` |
 | connection/fetchai/gym/0.19.0                                 | `bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y` |
 | connection/fetchai/stub/0.21.0                                | `bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy` |
-| connection/valory/ledger/0.19.0                               | `bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi` |
+| connection/valory/ledger/0.19.0                               | `bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm` |
 | connection/valory/http_server/0.22.0                          | `bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m` |
-| connection/valory/p2p_libp2p/0.1.0                            | `bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma` |
+| connection/valory/p2p_libp2p/0.1.0                            | `bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m` |
 | connection/valory/p2p_libp2p_client/0.1.0                     | `bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne` |
 | connection/valory/p2p_libp2p_mailbox/0.1.0                    | `bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq` |
 | connection/fetchai/local/0.20.0                               | `bafybeiema4rnxi54luhzbrccb27pfrwlohemka45eqf4nidgmtkwwmxeyi` |
 | connection/valory/http_client/0.23.0                          | `bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u` |
-| connection/valory/test_libp2p/0.1.0                           | `bafybeibjjdc3sj326rvtjjrzpbvshjp6nu6zqm4m7wswpo2ei7dzsmhecm` |
+| connection/valory/test_libp2p/0.1.0                           | `bafybeieht65ikcdnfevqzh7xsxfijgnu354wfwwi744cqio52ocsyxpojy` |
 | skill/fetchai/echo/0.19.0                                     | `bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya` |
 | skill/fetchai/error_test_skill/0.1.0                          | `bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu` |
 | skill/fetchai/gym/0.20.0                                      | `bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4` |
 | skill/fetchai/http_echo/0.20.0                                | `bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm` |
-| skill/fetchai/erc1155_client/0.28.0                           | `bafybeibmvrmpssviyujeyqfddbgnl4iu644sq4xyhavsm34oxntoez4r7q` |
-| skill/fetchai/erc1155_deploy/0.30.0                           | `bafybeiczeyks4gkne4ja32pvsresqvnjhv3gd5b4nyqr2vuzoawnyi7ipi` |
+| skill/fetchai/erc1155_client/0.28.0                           | `bafybeiasrz6iflvwwyurssdxn2uxtdf2fjpsuamthic4fsdpdt4bhqtqam` |
+| skill/fetchai/erc1155_deploy/0.30.0                           | `bafybeibvwbjv4dvjmuj6cziafghitqtuuscrfig5r5nkfkfzn3l7wm2mjy` |
 | skill/fetchai/error/0.17.0                                    | `bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm` |
 | skill/fetchai/fipa_dummy_buyer/0.2.0                          | `bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm` |
-| skill/fetchai/generic_buyer/0.26.0                            | `bafybeigyritphnqnejt6j7txrghruzkmztqobc4sp65cirlsgexeyxnzua` |
-| skill/fetchai/generic_seller/0.27.0                           | `bafybeifji5wgzwukexlwvhbbvsspyj7fpkaebsa3vm3i3ke4jyenhjszvq` |
+| skill/fetchai/generic_buyer/0.26.0                            | `bafybeietldbnmgiegadjvzj6jrlvo5z3t5oaqsvhbrp32cq2nn775ykfgq` |
+| skill/fetchai/generic_seller/0.27.0                           | `bafybeicdwfe5avdsfj3nftkdxeeeadndoagvw4r4p6hgxjxskogu6sxozq` |
 | skill/fetchai/task_test_skill/0.1.0                           | `bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble` |
 | agent/fetchai/error_test/0.1.0                                | `bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq` |
 | agent/fetchai/gym_aea/0.25.0                                  | `bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm` |

packages/fetchai/skills/erc1155_client/skill.yaml

@@ -21,7 +21,7 @@ fingerprint:
   tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
+- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

packages/fetchai/skills/erc1155_deploy/skill.yaml

@@ -21,7 +21,7 @@ fingerprint:
   tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
+- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

packages/fetchai/skills/generic_buyer/skill.yaml

@@ -19,7 +19,7 @@ fingerprint:
   tests/test_models.py: bafybeibh72j3n72yseqvmpppucpu5wtidf6ebxbxkfnmrnlh4zv5y5apei
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
+- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24

packages/fetchai/skills/generic_seller/skill.yaml

@@ -20,7 +20,7 @@ fingerprint:
   tests/test_models.py: bafybeihabrc22zqssit3fmqhxptosy6qz6mx65ukhf5iayvirfv42xrhoq
 fingerprint_ignore_patterns: []
 connections:
-- valory/ledger:0.19.0:bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi
+- valory/ledger:0.19.0:bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24

packages/packages.json

@@ -14,24 +14,24 @@
         "contract/fetchai/erc1155/0.22.0": "bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4",
         "connection/fetchai/gym/0.19.0": "bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y",
         "connection/fetchai/stub/0.21.0": "bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy",
-        "connection/valory/ledger/0.19.0": "bafybeicuewzr7i3glop3g626wxncywggdr6rewu65czgezhy2dmmjezmmi",
+        "connection/valory/ledger/0.19.0": "bafybeidon5zpvd2tke2z3fsxw3bf4g2i3m67r7yl5fzb7uoli7z5nnmoqm",
         "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m",
-        "connection/valory/p2p_libp2p/0.1.0": "bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma",
+        "connection/valory/p2p_libp2p/0.1.0": "bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne",
         "connection/valory/p2p_libp2p_mailbox/0.1.0": "bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq",
         "connection/fetchai/local/0.20.0": "bafybeiema4rnxi54luhzbrccb27pfrwlohemka45eqf4nidgmtkwwmxeyi",
         "connection/valory/http_client/0.23.0": "bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u",
-        "connection/valory/test_libp2p/0.1.0": "bafybeibjjdc3sj326rvtjjrzpbvshjp6nu6zqm4m7wswpo2ei7dzsmhecm",
+        "connection/valory/test_libp2p/0.1.0": "bafybeieht65ikcdnfevqzh7xsxfijgnu354wfwwi744cqio52ocsyxpojy",
         "skill/fetchai/echo/0.19.0": "bafybeicoawiackcbgqo3na3e56tpdc62atag4yxknur77py37caqq4mmya",
         "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu",
         "skill/fetchai/gym/0.20.0": "bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4",
         "skill/fetchai/http_echo/0.20.0": "bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm",
-        "skill/fetchai/erc1155_client/0.28.0": "bafybeibmvrmpssviyujeyqfddbgnl4iu644sq4xyhavsm34oxntoez4r7q",
-        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeiczeyks4gkne4ja32pvsresqvnjhv3gd5b4nyqr2vuzoawnyi7ipi",
+        "skill/fetchai/erc1155_client/0.28.0": "bafybeiasrz6iflvwwyurssdxn2uxtdf2fjpsuamthic4fsdpdt4bhqtqam",
+        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeibvwbjv4dvjmuj6cziafghitqtuuscrfig5r5nkfkfzn3l7wm2mjy",
         "skill/fetchai/error/0.17.0": "bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm",
         "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm",
-        "skill/fetchai/generic_buyer/0.26.0": "bafybeigyritphnqnejt6j7txrghruzkmztqobc4sp65cirlsgexeyxnzua",
-        "skill/fetchai/generic_seller/0.27.0": "bafybeifji5wgzwukexlwvhbbvsspyj7fpkaebsa3vm3i3ke4jyenhjszvq",
+        "skill/fetchai/generic_buyer/0.26.0": "bafybeietldbnmgiegadjvzj6jrlvo5z3t5oaqsvhbrp32cq2nn775ykfgq",
+        "skill/fetchai/generic_seller/0.27.0": "bafybeicdwfe5avdsfj3nftkdxeeeadndoagvw4r4p6hgxjxskogu6sxozq",
         "skill/fetchai/task_test_skill/0.1.0": "bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble",
         "agent/fetchai/error_test/0.1.0": "bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq",
         "agent/fetchai/gym_aea/0.25.0": "bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm",

packages/valory/connections/ledger/connection.yaml

@@ -16,7 +16,7 @@ fingerprint:
   tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou
   tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq
   tests/test_ledger.py: bafybeigcedfr3yv3jse3xwrerrgwbelgb56uhgrvdus527d3daekh6dx4m
-  tests/test_ledger_api.py: bafybeibdhjxhsavs2fax4rgvsptd6a2tcnv6fq75wqqxpcwwk6zujw3e7e
+  tests/test_ledger_api.py: bafybeiaicxq56bujtdqxy5czakzr5wpnf23q7ya4fc6oaimh5b5ydjhahi
 fingerprint_ignore_patterns: []
 connections: []
 protocols:

packages/valory/connections/ledger/tests/test_ledger_api.py

@@ -667,16 +667,10 @@ async def test_attempts_get_transaction_receipt(
         assert dialogue is not None
         assert isinstance(dialogue, LedgerApiDialogue)
 
-        mock_api.is_transaction_settled.return_value = (
-            True if failing_ledger_method_name == "get_transaction" else False
-        )
         failing_ledger_method = getattr(mock_api, failing_ledger_method_name)
-        if (
-            ledger_raise_error
-            and failing_ledger_method_name != "is_transaction_settled"
-        ):
+        if ledger_raise_error:
             failing_ledger_method.side_effect = ValueError()
-        elif failing_ledger_method_name != "is_transaction_settled":
+        else:
             failing_ledger_method.return_value = None
 
         with patch.object(dispatcher, "retry_attempts", retries):

packages/valory/connections/p2p_libp2p/connection.yaml

@@ -55,7 +55,7 @@ fingerprint:
   libp2p_node/utils/utils.go: bafybeihbd2br74nm3pupy4qkijm2tnuyl7pbq3uwasidmql5znhbr575k4
   libp2p_node/utils/utils_test.go: bafybeig2kkgqy7miml66w2byomeqjp4czzv45gb4jas76cxildo3lxi4xq
   tests/__init__.py: bafybeieftcbmxxpe7okvm3ycualpyec6xys4nx5tihcjii7lqxd3w5lx7e
-  tests/base.py: bafybeif4bslxqlqz2xppqz6rx44ydh7v4i2n542muip6jzznu36cmn4iwi
+  tests/base.py: bafybeicep6nwabliuah65lfaloistoepnr3twvotw72kuzftooyvr2r34u
   tests/test_aea_cli.py: bafybeic3aczdlcvbzdi2l77m36dkbjqva3itv3kbmsiuxrk26va4qtfzli
   tests/test_build.py: bafybeigzxvb57sauddmb7t6pwwtxu476wceklktg42bidphl5zkcnghlfu
   tests/test_errors.py: bafybeigfwg7cmxbgo7j2pce5vy55wvqze7wv67d4v37k3wpcflwbgzege4

packages/valory/connections/p2p_libp2p/tests/base.py

@@ -47,6 +47,10 @@
     condition=(platform.system() == "Windows"),
     reason="https://github.com/golang/go/issues/51007",
 )
+SKIP_MACOS = pytest.mark.skipif(
+    condition=(platform.system() == "Darwin"),
+    reason="go-ethereum not working on macos-12+",
+)
 
 
 def libp2p_log_on_failure(fn: Callable) -> Callable:

packages/valory/connections/test_libp2p/connection.yaml

@@ -12,7 +12,7 @@ fingerprint:
   readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq
   tests/__init__.py: bafybeiarz6mhky6pnkdihibcuqrfpx3qo55roygneoaoq2mndi5lzdlcj4
   tests/acn_image.py: bafybeidkaavxkfocmg5c6y3i32fmbdf5i77jmqteoylmutifoh4zig3pr4
-  tests/base.py: bafybeibsotk3te523igjnkmioqikgor3iwd3vunwonsmuj7debwwv5mtri
+  tests/base.py: bafybeihk4x2opomphxttji6stortv6tzxll2aylk7ptlg7p65d4qajkkpa
   tests/conftest.py: bafybeifkjrvsysdb7ujp2wxurzgytzy3ecu6fv247zfszfymdvb7y7klpu
   tests/test_certificate_dates.py: bafybeif4t76wsvsfvvplkmi4gecgod6ijff3bbqgtaqmpep6ywfapfptfm
   tests/test_dht.py: bafybeienykwwpdjlbjzxzttxjhgas2edp2f657gbsexjtkztehoq4yfb7m
@@ -34,7 +34,7 @@ fingerprint:
   tests/test_p2p_libp2p_mailbox/test_mailbox_service.py: bafybeibp3bkwkrw57qahvuysjdlumywtlk3te5gsvusgrvhsc75k7rrk4u
 fingerprint_ignore_patterns: []
 connections:
-- valory/p2p_libp2p:0.1.0:bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma
+- valory/p2p_libp2p:0.1.0:bafybeidjwshzeknasoutd5jl2x5neesubrgwqptiwhz37w7m2zfps3g56m
 - valory/p2p_libp2p_client:0.1.0:bafybeihs5zlwa5wlozct3rjlxsirm3ve3e4buse5nfehiky6ymnnfrobne
 - valory/p2p_libp2p_mailbox:0.1.0:bafybeiecclc65ogngs3piaxpwhiyl77mlpqun5ejlyv4kamwzrrh746guq
 protocols:

packages/valory/connections/test_libp2p/tests/base.py

@@ -64,6 +64,7 @@
 )
 from packages.valory.connections.p2p_libp2p.tests.base import (
     MockDefaultMessageProtocol,
+    SKIP_MACOS,
     SKIP_WINDOWS,
     TEMP_LIBP2P_TEST_DIR,
     TIMEOUT,
@@ -276,6 +277,7 @@ def _make_libp2p_connection(
 
 
 @SKIP_WINDOWS
+@SKIP_MACOS
 class BaseP2PLibp2pTest:
     """Base class for ACN p2p libp2p tests"""
 

tests/test_connections/test_sync_connection.py

@@ -19,6 +19,7 @@
 # ------------------------------------------------------------------------------
 """This module contains the tests for the sync connection module."""
 import asyncio
+import platform
 import time
 from unittest.mock import MagicMock, Mock, patch
 
@@ -70,6 +71,10 @@ def on_disconnect(self):
 
 
 @pytest.mark.asyncio
+@pytest.mark.skipif(
+    condition=(platform.system() == "Darwin"),
+    reason="not working on macos-12+",
+)
 async def test_sync_connection():
     """Test sync connection example."""
     conf = Mock()