fix test

Author: almogdepaz

chia/_tests/conftest.py

@@ -1307,10 +1307,13 @@ async def farmer_harvester_2_simulators_zero_bits_plot_filter(
             )
             for index in range(len(bts))
         ]
-
-        [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)
-        )
+        async with setup_solver(tmp_path / "solver", bt, bt.constants) as solver_service:
+            solver_peer = UnresolvedPeerInfo(bt.config["self_hostname"], solver_service._server.get_port())
+            [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, solver_peer=solver_peer
+                )
+            )
 
         yield farmer_service, harvester_service, simulators[0], simulators[1], bt
 

chia/_tests/core/test_farmer_harvester_rpc.py

@@ -30,11 +30,15 @@
     plot_matches_filter,
 )
 from chia.farmer.farmer_rpc_client import FarmerRpcClient
+from chia.farmer.farmer_service import FarmerService
+from chia.harvester.harvester_service import HarvesterService
 from chia.plot_sync.receiver import Receiver, get_list_or_len
 from chia.plotting.util import add_plot_directory
 from chia.protocols import farmer_protocol
 from chia.protocols.harvester_protocol import Plot
-from chia.simulator.block_tools import get_plot_dir
+from chia.rpc.rpc_client import ResponseFailureError
+from chia.simulator.block_tools import BlockTools, get_plot_dir
+from chia.solver.solver_service import SolverService
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
 from chia.util.config import load_config, lock_and_load_config, save_config
 from chia.util.hash import std_hash
@@ -503,3 +507,32 @@ async def assert_added(path: Path) -> None:
     added_directories = await harvester_rpc_client.get_plot_directories()
     assert str(test_path) in added_directories
     assert str(test_path_other) in added_directories
+
+
+@pytest.mark.anyio
+async def test_farmer_connect_to_solver(
+    farmer_one_harvester_solver: tuple[list[HarvesterService], FarmerService, SolverService, BlockTools],
+) -> None:
+    _, farmer_service, solver_service, bt = farmer_one_harvester_solver
+    assert farmer_service.rpc_server is not None
+    farmer_rpc_client = await FarmerRpcClient.create(
+        bt.config["self_hostname"],
+        farmer_service.rpc_server.listen_port,
+        farmer_service.root_path,
+        farmer_service.config,
+    )
+
+    try:
+        # Test successful connection to existing solver
+        solver_host = bt.config["self_hostname"]
+        solver_port = solver_service._server.get_port()
+        result = await farmer_rpc_client.connect_to_solver(solver_host, solver_port)
+        assert result["success"] is True
+
+        # Test connection failure to non-existent solver
+        with pytest.raises(ResponseFailureError) as exc_info:
+            await farmer_rpc_client.connect_to_solver("localhost", 65000)
+        assert "Could not connect to solver" in exc_info.value.response["error"]
+    finally:
+        farmer_rpc_client.close()
+        await farmer_rpc_client.await_closed()

chia/_tests/farmer_harvester/test_third_party_harvesters.py

@@ -84,17 +84,16 @@ async def test_harvester_receive_source_signing_data(
     full_node_1: FullNode = full_node_service_1._node
     full_node_2: FullNode = full_node_service_2._node
 
+    await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.HARVESTER)
     # Connect peers to each other
     farmer_service.add_peer(
         UnresolvedPeerInfo(str(full_node_service_2.self_hostname), full_node_service_2._server.get_port())
     )
+    await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.FULL_NODE)
     full_node_service_2.add_peer(
         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, full_node_1.server, NodeType.FULL_NODE)
 
     # Prepare test data
     blocks: list[FullBlock]
@@ -429,12 +428,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(