Skip to content

Commit 0299439

Browse files
committed
fix failling test
1 parent dc04fda commit 0299439

File tree

4 files changed

+3
-71
lines changed

4 files changed

+3
-71
lines changed

chia/_tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ async def farmer_one_harvester_solver(
893893
tmp_path: Path, get_b_tools: BlockTools
894894
) -> AsyncIterator[FarmerOneHarvesterSolver]:
895895
async with setup_solver(tmp_path / "solver", get_b_tools, get_b_tools.constants) as solver_service:
896-
solver_peer = UnresolvedPeerInfo("127.0.0.1", solver_service._server.get_port())
896+
solver_peer = UnresolvedPeerInfo(get_b_tools.config["self_hostname"], solver_service._server.get_port())
897897
async with setup_farmer_solver_multi_harvester(
898898
get_b_tools, 1, tmp_path, get_b_tools.constants, start_services=True, solver_peer=solver_peer
899899
) as (harvester_services, farmer_service, bt):

chia/_tests/util/setup_nodes.py

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -344,73 +344,6 @@ async def setup_farmer_solver_multi_harvester(
344344
yield harvester_services, farmer_service, block_tools
345345

346346

347-
@asynccontextmanager
348-
async def setup_farmer_multi_harvester_with_solver(
349-
block_tools: BlockTools,
350-
harvester_count: int,
351-
temp_dir: Path,
352-
consensus_constants: ConsensusConstants,
353-
*,
354-
start_services: bool,
355-
) -> AsyncIterator[tuple[list[HarvesterService], FarmerService, SolverService, BlockTools]]:
356-
async with AsyncExitStack() as async_exit_stack:
357-
farmer_service = await async_exit_stack.enter_async_context(
358-
setup_farmer(
359-
block_tools,
360-
temp_dir / "farmer",
361-
block_tools.config["self_hostname"],
362-
consensus_constants,
363-
port=uint16(0),
364-
start_service=start_services,
365-
)
366-
)
367-
if start_services:
368-
farmer_peer = UnresolvedPeerInfo(block_tools.config["self_hostname"], farmer_service._server.get_port())
369-
else:
370-
farmer_peer = None
371-
harvester_services = [
372-
await async_exit_stack.enter_async_context(
373-
setup_harvester(
374-
block_tools,
375-
temp_dir / f"harvester_{i}",
376-
farmer_peer,
377-
consensus_constants,
378-
start_service=start_services,
379-
)
380-
)
381-
for i in range(harvester_count)
382-
]
383-
384-
# Setup solver with farmer peer - CRITICAL: use same BlockTools root path for SSL CA consistency
385-
solver_service = await async_exit_stack.enter_async_context(
386-
setup_solver(
387-
temp_dir / "solver", # Use temp_dir like harvester, not block_tools.root_path
388-
block_tools, # Pass BlockTools so SSL CA can be consistent
389-
consensus_constants,
390-
start_service=start_services,
391-
)
392-
)
393-
394-
# Wait for farmer to be fully started before expecting solver connection
395-
if start_services:
396-
import asyncio
397-
398-
# Wait for farmer to be fully initialized
399-
timeout = 30
400-
for i in range(timeout):
401-
if farmer_service._node.started:
402-
print(f"Farmer fully started after {i} seconds")
403-
break
404-
await asyncio.sleep(1)
405-
else:
406-
print(f"WARNING: Farmer not started after {timeout} seconds")
407-
408-
# Give solver additional time to connect
409-
await asyncio.sleep(3)
410-
411-
yield harvester_services, farmer_service, solver_service, block_tools
412-
413-
414347
@asynccontextmanager
415348
async def setup_full_system(
416349
consensus_constants: ConsensusConstants,

chia/server/server.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,12 @@ def create(
172172
private_cert_path, private_key_path = None, None
173173
public_cert_path, public_key_path = None, None
174174

175-
authenticated_client_types = {NodeType.HARVESTER, NodeType.FARMER, NodeType.SOLVER}
175+
authenticated_client_types = {NodeType.HARVESTER}
176176
authenticated_server_types = {
177177
NodeType.HARVESTER,
178178
NodeType.FARMER,
179179
NodeType.WALLET,
180180
NodeType.DATA_LAYER,
181-
NodeType.SOLVER,
182181
}
183182

184183
if local_type in authenticated_client_types:

chia/ssl/create_ssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"daemon",
2727
"solver",
2828
]
29-
_all_public_node_names: list[str] = ["full_node", "wallet", "farmer", "introducer", "timelord", "data_layer"]
29+
_all_public_node_names: list[str] = ["full_node", "wallet", "farmer", "introducer", "timelord", "data_layer", "solver"]
3030

3131

3232
def get_chia_ca_crt_key() -> tuple[Any, Any]:

0 commit comments

Comments
 (0)