test:p2p default agent eth & peernode fetch

valory-xyz · Mar 12, 2022 · eced693 · eced693
1 parent f98ba8d
commit eced693
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/packages/hashes.csv b/packages/hashes.csv
@@ -66,8 +66,8 @@ open_aea/agents/http_echo,QmcJewf19fn25iLdVZsXJMqpM9BQ17LBTS3TYpuy6XGUNL
 open_aea/agents/http_echo/aea-config.yaml,QmavyP2JqcrAK6EHvJTnPJZ3GAjPjSDigV868Pd12F4pNy
 open_aea/agents/my_first_aea,QmPZJPLDuiiXeKM1BsB3QRGiEoeqjS5hTXem5JAV2uiuSp
 open_aea/agents/my_first_aea/aea-config.yaml,QmRsNjTXsFVgdZg4LJyfwEAPDjCgJoLF2TnPJs6uXH2DNJ
-open_aea/connections/p2p_libp2p,Qmc6jdCXsWbATTyfLKk7vb2W8uNQcNFPRSeu7QuZ3ZrbwY
-open_aea/connections/p2p_libp2p/connection.yaml,QmR9WFefpexc2ifX8JbvaB7VYbyq8XsGAekstVSZC8czR6
+open_aea/connections/p2p_libp2p,QmYjjqzuLF6o4p7cHxakrDvKJYrWTScrqM3ui4WArj6dwQ
+open_aea/connections/p2p_libp2p/connection.yaml,QmWjzmT7f6JxJZm47WDVi7qj9KECChWcot4n2CBM96t63C
 open_aea/connections/p2p_libp2p_client,QmRcdrQ59dcn49pRvm4jPV1VC873VFNRBsFUkJUeBxqFCP
 open_aea/connections/p2p_libp2p_client/connection.yaml,QmYpi3m1RMSDVrvAUbnS52GTo63pfMApnVFCrmMyStT9eY
 open_aea/connections/p2p_libp2p_mailbox,QmXSJqE6gnHr5au2fUnNPSpBxv3N9Wyo6wNuzx2xytP7ar

diff --git a/packages/open_aea/connections/p2p_libp2p/connection.yaml b/packages/open_aea/connections/p2p_libp2p/connection.yaml
@@ -39,16 +39,6 @@ fingerprint:
   libp2p_node/dht/monitoring/file.go: QmZwH59RcraRfgYjugVafVojakv1oEcgBUKuMdFAoeZBhS
   libp2p_node/dht/monitoring/prometheus.go: QmQvXjEozVPMvRjda5WGRAU5b7cfUcRZUACQkTESG7Aewu
   libp2p_node/dht/monitoring/service.go: QmT47y2LHZECYcoE2uJ9QCGh3Kq8ePhYedo8dQE7X7v6YV
-  libp2p_node/ethereum/libp2p_node: QmbfY489gEMnxi9M1fDjC7BRpqX5fxL2WgsFL5fZSmYgvR
-  libp2p_node/ethereum/temp_dir/.env.libp2p: QmdQSETuBEqnK1Dn6Gf6PvA11Lt7eik84K9rddvLptjnFn
-  libp2p_node/ethereum/temp_dir/0x0B2F0C90222badbBC3C03b762FaB51c4192748F5_cert.txt: QmbKppqyb2QXg5xe1yjjAdnAtRrJZyLAFhP8Qd5zb46EYw
-  libp2p_node/ethereum/temp_dir/0x5355ba6a065dfe10619f080894d66343b952ca6768988112afd5f2228fbf813d331097564d8fb5ec9e8dbd8ff0f8d2b72e02a61956d2f89a731af4626ec3753c.txt: QmSrFu2Qsui6P5Xv41E7jUWFXdqJ8PqDxXNaKCr9RKWDra
-  libp2p_node/ethereum/temp_dir/libp2p_node_10234.log: QmWxcx5VnrT8Tv1qbNqmE3MFc2SttEyDE2Pef6zBGdG8c7
-  libp2p_node/fetchai/libp2p_node: QmfEJuo4mWfoJMRinnHz8ZvpnZwMgtXvPMiH3xP9G4Qeih
-  libp2p_node/fetchai/temp_dir/.env.libp2p: QmWE9JnomgbbDDyH7vpiefQhWM4MuGpGnCpW3xRt1Zi6Ey
-  libp2p_node/fetchai/temp_dir/021aed1ce78a449109de6cc7ef516602a60d76e771b0cc2fef448b81d234d5b06b.txt: QmUqWxR8pbgWKwfrxkf3ciVahLXXw2bWQTT1TpV4xhv9B7
-  libp2p_node/fetchai/temp_dir/fetch16k3x9vw8jraxxddkhmz6rh3j74xjjrsdvcs2gz_cert.txt: Qmdz8PvEDNLeJrTr1C7YpAbTFbihSSaiDpoBpttvHDPFi5
-  libp2p_node/fetchai/temp_dir/libp2p_node_10234.log: QmUAF7yqk4ctXA7Bp35iNhogXyM9FcAu8BbdNi5jmFMM8X
   libp2p_node/go.mod: QmREU96KzTa75gqHeTLtBzHnhHNPcEN6sW1zp59LgDLCBA
   libp2p_node/go.sum: QmY81CXMuRFgtJMDs4371QHp6PMGgvZPoZJM1CttuN4cKN
   libp2p_node/libp2p_node.go: QmcKnsrH27iqi8bVeQtBY9mHFfNNKYWQwzij9NnAfYXj6v

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -280,6 +280,8 @@
 PUBLIC_DHT_P2P_PUBLIC_KEY_1 = PUBLIC_STAGING_DHT_P2P_PUBLIC_KEY_1
 PUBLIC_DHT_P2P_PUBLIC_KEY_2 = PUBLIC_STAGING_DHT_P2P_PUBLIC_KEY_2
 
+DEFAULT_LEDGER_LIBP2P_NODE = "fetchai"  # Secp256k1 keys
+
 # testnets
 COSMOS_TESTNET_CONFIG = {"address": COSMOS_DEFAULT_ADDRESS}
 ETHEREUM_TESTNET_CONFIG = {
@@ -837,7 +839,6 @@ def _process_cert(key: Crypto, cert: CertRequest, path_prefix: str):
     )
 
 
-DEFAULT_LEDGER_LIBP2P_NODE = "fetchai"  # Sepc2561k keys
 def _make_libp2p_connection(
     data_dir: str,
     port: int = 10234,
@@ -952,7 +953,7 @@ def _make_libp2p_client_connection(
     node_port: int = 11234,
     node_host: str = "127.0.0.1",
     uri: Optional[str] = None,
-    ledger_api_id: Union[SimpleId, str] = DEFAULT_LEDGER_LIBP2P_NODE,
+    ledger_api_id: Union[SimpleId, str] = DEFAULT_LEDGER,
 ) -> P2PLibp2pClientConnection:
     if not os.path.isdir(data_dir) or not os.path.exists(data_dir):
         raise ValueError("Data dir must be directory and exist!")
@@ -999,7 +1000,7 @@ def _make_libp2p_mailbox_connection(
     node_port: int = 8888,
     node_host: str = "127.0.0.1",
     uri: Optional[str] = None,
-    ledger_api_id: Union[SimpleId, str] = DEFAULT_LEDGER_LIBP2P_NODE,
+    ledger_api_id: Union[SimpleId, str] = DEFAULT_LEDGER,
 ) -> P2PLibp2pMailboxConnection:
     """Get a libp2p mailbox connection."""
     if not os.path.isdir(data_dir) or not os.path.exists(data_dir):

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
@@ -29,10 +29,10 @@
 from packages.open_aea.connections.p2p_libp2p_client.connection import PUBLIC_ID
 
 from tests.conftest import (
+    DEFAULT_LEDGER,
     _make_libp2p_connection,
     libp2p_log_on_failure,
     libp2p_log_on_failure_all,
-    DEFAULT_LEDGER,
 )
 
 

diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_mailbox/test_aea_cli.py
@@ -29,10 +29,10 @@
 from packages.open_aea.connections.p2p_libp2p_mailbox.connection import PUBLIC_ID
 
 from tests.conftest import (
+    DEFAULT_LEDGER,
     _make_libp2p_connection,
     libp2p_log_on_failure,
     libp2p_log_on_failure_all,
-    DEFAULT_LEDGER,
 )