debug

Author: almogdepaz

chia/_tests/conftest.py

@@ -92,7 +92,7 @@
 from chia_rs.sized_ints import uint128
 
 from chia._tests.environments.wallet import WalletEnvironment, WalletState, WalletTestFramework
-from chia._tests.util.setup_nodes import setup_farmer_solver_multi_harvester
+from chia._tests.util.setup_nodes import setup_farmer_multi_harvester
 from chia.full_node.full_node_rpc_client import FullNodeRpcClient
 from chia.simulator.block_tools import BlockTools, create_block_tools_async, test_constants
 from chia.simulator.keyring import TempKeyring
@@ -866,7 +866,7 @@ async def farmer_one_harvester_simulator_wallet(
     ]
 ]:
     async with setup_simulators_and_wallets_service(1, 1, blockchain_constants) as (nodes, wallets, bt):
-        async with setup_farmer_solver_multi_harvester(bt, 1, tmp_path, bt.constants, start_services=True) as (
+        async with setup_farmer_multi_harvester(bt, 1, tmp_path, bt.constants, start_services=True) as (
             harvester_services,
             farmer_service,
             _,
@@ -879,7 +879,7 @@ async def farmer_one_harvester_simulator_wallet(
 
 @pytest.fixture(scope="function")
 async def farmer_one_harvester(tmp_path: Path, get_b_tools: BlockTools) -> AsyncIterator[FarmerOneHarvester]:
-    async with setup_farmer_solver_multi_harvester(
+    async with setup_farmer_multi_harvester(
         get_b_tools, 1, tmp_path, get_b_tools.constants, start_services=True
     ) as _:
         yield _
@@ -894,7 +894,7 @@ async def farmer_one_harvester_solver(
 ) -> AsyncIterator[FarmerOneHarvesterSolver]:
     async with setup_solver(tmp_path / "solver", get_b_tools, get_b_tools.constants) as solver_service:
         solver_peer = UnresolvedPeerInfo(get_b_tools.config["self_hostname"], solver_service._server.get_port())
-        async with setup_farmer_solver_multi_harvester(
+        async with setup_farmer_multi_harvester(
             get_b_tools, 1, tmp_path, get_b_tools.constants, start_services=True, solver_peer=solver_peer
         ) as (harvester_services, farmer_service, bt):
             yield harvester_services, farmer_service, solver_service, bt
@@ -904,7 +904,7 @@ async def farmer_one_harvester_solver(
 async def farmer_one_harvester_not_started(
     tmp_path: Path, get_b_tools: BlockTools
 ) -> AsyncIterator[tuple[list[HarvesterService], FarmerService, BlockTools]]:
-    async with setup_farmer_solver_multi_harvester(
+    async with setup_farmer_multi_harvester(
         get_b_tools, 1, tmp_path, get_b_tools.constants, start_services=False
     ) as _:
         yield _
@@ -914,7 +914,7 @@ async def farmer_one_harvester_not_started(
 async def farmer_two_harvester_not_started(
     tmp_path: Path, get_b_tools: BlockTools
 ) -> AsyncIterator[tuple[list[HarvesterService], FarmerService, BlockTools]]:
-    async with setup_farmer_solver_multi_harvester(
+    async with setup_farmer_multi_harvester(
         get_b_tools, 2, tmp_path, get_b_tools.constants, start_services=False
     ) as _:
         yield _
@@ -924,7 +924,7 @@ async def farmer_two_harvester_not_started(
 async def farmer_three_harvester_not_started(
     tmp_path: Path, get_b_tools: BlockTools
 ) -> AsyncIterator[tuple[list[HarvesterService], FarmerService, BlockTools]]:
-    async with setup_farmer_solver_multi_harvester(
+    async with setup_farmer_multi_harvester(
         get_b_tools, 3, tmp_path, get_b_tools.constants, start_services=False
     ) as _:
         yield _
@@ -1309,7 +1309,7 @@ async def farmer_harvester_2_simulators_zero_bits_plot_filter(
         ]
 
         [harvester_service], farmer_service, _ = await async_exit_stack.enter_async_context(
-            setup_farmer_solver_multi_harvester(bt, 1, tmp_path, bt.constants, start_services=True)
+            setup_farmer_multi_harvester(bt, 1, tmp_path, bt.constants, start_services=True)
         )
 
         yield farmer_service, harvester_service, simulators[0], simulators[1], bt

chia/_tests/farmer_harvester/test_filter_prefix_bits.py

@@ -11,7 +11,7 @@
 
 from chia._tests.conftest import ConsensusMode
 from chia._tests.core.test_farmer_harvester_rpc import wait_for_plot_sync
-from chia._tests.util.setup_nodes import setup_farmer_solver_multi_harvester
+from chia._tests.util.setup_nodes import setup_farmer_multi_harvester
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.farmer.farmer_api import FarmerAPI
 from chia.farmer.farmer_rpc_client import FarmerRpcClient
@@ -60,7 +60,7 @@ async def have_connections() -> bool:
     )
     new_config = local_b_tools._config
     local_b_tools.change_config(new_config)
-    async with setup_farmer_solver_multi_harvester(
+    async with setup_farmer_multi_harvester(
         local_b_tools, 1, tmp_path, local_b_tools.constants, start_services=True
     ) as (harvesters, farmer_service, _):
         harvester_service = harvesters[0]

chia/_tests/farmer_harvester/test_third_party_harvesters.py

@@ -92,9 +92,9 @@ async def test_harvester_receive_source_signing_data(
         UnresolvedPeerInfo(str(full_node_service_1.self_hostname), full_node_service_1._server.get_port())
     )
 
-    await wait_until_node_type_connected(farmer.server, NodeType.FULL_NODE)
-    await wait_until_node_type_connected(farmer.server, NodeType.HARVESTER)  # Should already be connected
-    await wait_until_node_type_connected(full_node_1.server, NodeType.FULL_NODE)
+    await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.FULL_NODE)
+    await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.HARVESTER)
+    await time_out_assert(60, node_type_connected, True, full_node_1.server, NodeType.FULL_NODE)
 
     # Prepare test data
     blocks: list[FullBlock]
@@ -429,12 +429,11 @@ def log_has_new_text() -> bool:
     return False
 
 
-async def wait_until_node_type_connected(server: ChiaServer, node_type: NodeType) -> WSChiaConnection:
-    while True:
-        for peer in server.all_connections.values():
-            if peer.connection_type == node_type.value:
-                return peer
-        await asyncio.sleep(1)
+def node_type_connected(server: ChiaServer, node_type: NodeType) -> bool:
+    for peer in server.all_connections.values():
+        if peer.connection_type == node_type.value:
+            return True
+    return False
 
 
 def decode_sp(

chia/_tests/util/setup_nodes.py

@@ -303,7 +303,7 @@ async def setup_simulators_and_wallets_inner(
 
 
 @asynccontextmanager
-async def setup_farmer_solver_multi_harvester(
+async def setup_farmer_multi_harvester(
     block_tools: BlockTools,
     harvester_count: int,
     temp_dir: Path,

chia/server/start_service.py

@@ -151,26 +151,31 @@ async def _connect_peers_task_handler(self) -> None:
         prefer_ipv6 = self.config.get("prefer_ipv6", False)
         while True:
             for unresolved in self._connect_peers:
+                print(f"try peer {unresolved}")
                 resolved = resolved_peers.get(unresolved)
                 if resolved is None:
                     try:
                         resolved = PeerInfo(await resolve(unresolved.host, prefer_ipv6=prefer_ipv6), unresolved.port)
                     except Exception as e:
+                        print(f"Failed to resolve {unresolved.host}: {e}")
                         self._log.warning(f"Failed to resolve {unresolved.host}: {e}")
                         continue
                     self._log.info(f"Add resolved {resolved}")
                     resolved_peers[unresolved] = resolved
 
                 if any(connection.peer_info == resolved for connection in self._server.all_connections.values()):
+                    print("step 1")
                     continue
                 if any(
                     connection.peer_info.host == resolved.host and connection.peer_server_port == resolved.port
                     for connection in self._server.all_connections.values()
                 ):
+                    print("step 2")
                     continue
 
                 if not await self._server.start_client(resolved, None):
                     self._log.info(f"Failed to connect to {resolved}")
+                    print(f"Failed to connect to {resolved}")
                     # Re-resolve to make sure the IP didn't change, this helps for example to keep dyndns hostnames
                     # up to date.
                     try:
@@ -179,9 +184,11 @@ async def _connect_peers_task_handler(self) -> None:
                         )
                     except Exception as e:
                         self._log.warning(f"Failed to resolve after connection failure {unresolved.host}: {e}")
+                        print(f"Failed to resolve after connection failure {unresolved.host}: {e}")
                         continue
                     if resolved_new != resolved:
                         self._log.info(f"Host {unresolved.host} changed from {resolved} to {resolved_new}")
+                        print(f"Host {unresolved.host} changed from {resolved} to {resolved_new}")
                         resolved_peers[unresolved] = resolved_new
             await asyncio.sleep(self.reconnect_retry_seconds)