cleanup

Author: almogdepaz

chia/_tests/conftest.py

@@ -65,12 +65,10 @@
     setup_full_node,
     setup_introducer,
     setup_seeder,
-    setup_solver,
     setup_timelord,
 )
 from chia.simulator.start_simulator import SimulatorFullNodeService
 from chia.simulator.wallet_tools import WalletTool
-from chia.solver.solver_service import SolverService
 from chia.timelord.timelord_service import TimelordService
 from chia.types.peer_info import PeerInfo
 from chia.util.config import create_default_chia_config, lock_and_load_config
@@ -1114,12 +1112,6 @@ async def seeder_service(root_path_populated_with_config: Path, database_uri: st
         yield seeder
 
 
-@pytest.fixture(scope="function")
-async def solver_service(bt: BlockTools) -> AsyncIterator[SolverService]:
-    async with setup_solver(bt.root_path, bt.constants) as _:
-        yield _
-
-
 @pytest.fixture(scope="function")
 def tmp_chia_root(tmp_path):
     """

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -223,7 +223,7 @@ def test_calculate_plot_difficulty(height: uint32, difficulty: uint8) -> None:
 
 class TestProofOfSpace:
     @pytest.mark.parametrize("prefix_bits", [DEFAULT_CONSTANTS.NUMBER_ZERO_BITS_PLOT_FILTER_V1, 8, 7, 6, 5, 1, 0])
-    def test_can_create_proof(self, prefix_bits: uint8, seeded_random: random.Random) -> None:
+    def test_can_create_proof(self, prefix_bits: int, seeded_random: random.Random) -> None:
         """
         Tests that the change of getting a correct proof is exactly 1/target_filter.
         """

chia/_tests/harvester/__init__.py

@@ -4,7 +4,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from chia_rs import ProofOfSpace
+from chia_rs import FullBlock, ProofOfSpace
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint64
 
@@ -17,15 +17,8 @@
 from chia.simulator.block_tools import BlockTools
 
 
-def signage_point_from_block(bt: BlockTools) -> harvester_protocol.NewSignagePointHarvester:
-    """Create a real NewSignagePointHarvester from actual blockchain blocks."""
-    # generate real blocks using BlockTools
-    blocks = bt.get_consecutive_blocks(
-        num_blocks=3,
-        guarantee_transaction_block=True,
-        farmer_reward_puzzle_hash=bt.farmer_ph,
-    )
-    block = blocks[-1]  # always use the last block
+def signage_point_from_block(block: FullBlock, bt: BlockTools) -> harvester_protocol.NewSignagePointHarvester:
+    """Create a real NewSignagePointHarvester from a blockchain block."""
     # extract real signage point data from the block
     sp_index = block.reward_chain_block.signage_point_index
     challenge_hash = block.reward_chain_block.pos_ss_cc_challenge_hash
@@ -63,21 +56,23 @@ def create_plot_info() -> PlotInfo:
 
 
 @pytest.mark.anyio
-async def test_new_signage_point_harvester(harvester_farmer_environment: HarvesterFarmerEnvironment) -> None:
+async def test_new_signage_point_harvester(
+    harvester_farmer_environment: HarvesterFarmerEnvironment, default_400_blocks: list[FullBlock], tmp_path: Path
+) -> None:
     """Test successful signage point processing with real blockchain data."""
     _, _, harvester_service, _, bt = harvester_farmer_environment
     harvester_api = harvester_service._server.api
     assert isinstance(harvester_api, HarvesterAPI)
     # use real signage point data from actual block
-    new_challenge = signage_point_from_block(bt)
+    block = default_400_blocks[2]  # use a transaction block
+    new_challenge = signage_point_from_block(block, bt)
     # harvester doesn't accept incoming connections, so use mock peer like other tests
     mock_peer = MagicMock(spec=WSChiaConnection)
     # create realistic plot info for testing
     mock_plot_info = create_plot_info()
-    plot_path = Path("/fake/plot.plot")
 
     with patch.object(harvester_api.harvester.plot_manager, "public_keys_available", return_value=True):
-        with patch.object(harvester_api.harvester.plot_manager, "plots", {plot_path: mock_plot_info}):
+        with patch.object(harvester_api.harvester.plot_manager, "plots", {tmp_path: mock_plot_info}):
             # let passes_plot_filter, calculate_pos_challenge, and calculate_sp_interval_iters use real implementations
             with patch("chia.harvester.harvester_api.calculate_iterations_quality", return_value=uint64(1000)):
                 with patch.object(mock_plot_info.prover, "get_full_proof") as mock_get_proof:
@@ -88,7 +83,7 @@ async def test_new_signage_point_harvester(harvester_farmer_environment: Harvest
 
 @pytest.mark.anyio
 async def test_new_signage_point_harvester_pool_difficulty(
-    harvester_farmer_environment: HarvesterFarmerEnvironment,
+    harvester_farmer_environment: HarvesterFarmerEnvironment, default_400_blocks: list[FullBlock], tmp_path: Path
 ) -> None:
     """Test pool difficulty overrides with real blockchain signage points."""
     _, _, harvester_service, _, bt = harvester_farmer_environment
@@ -102,15 +97,15 @@ async def test_new_signage_point_harvester_pool_difficulty(
     # create realistic plot info for testing
     mock_plot_info = create_plot_info()
     mock_plot_info.pool_contract_puzzle_hash = pool_puzzle_hash
-    plot_path = Path("/fake/pool_plot.plot")
     pool_difficulty = PoolDifficulty(
         pool_contract_puzzle_hash=pool_puzzle_hash,
         difficulty=uint64(500),  # lower than main difficulty
         sub_slot_iters=uint64(67108864),  # different from main
     )
 
     # create signage point from real block with pool difficulty
-    new_challenge = signage_point_from_block(bt)
+    block = default_400_blocks[2]  # use a transaction block
+    new_challenge = signage_point_from_block(block, bt)
     new_challenge = harvester_protocol.NewSignagePointHarvester(
         challenge_hash=new_challenge.challenge_hash,
         difficulty=new_challenge.difficulty,
@@ -123,7 +118,7 @@ async def test_new_signage_point_harvester_pool_difficulty(
     )
 
     with patch.object(harvester_api.harvester.plot_manager, "public_keys_available", return_value=True):
-        with patch.object(harvester_api.harvester.plot_manager, "plots", {plot_path: mock_plot_info}):
+        with patch.object(harvester_api.harvester.plot_manager, "plots", {tmp_path: mock_plot_info}):
             # mock passes_plot_filter to return True so we can test pool difficulty logic
             with patch("chia.harvester.harvester_api.passes_plot_filter", return_value=True):
                 with patch("chia.harvester.harvester_api.calculate_iterations_quality") as mock_calc_iter:
@@ -140,24 +135,24 @@ async def test_new_signage_point_harvester_pool_difficulty(
 
 @pytest.mark.anyio
 async def test_new_signage_point_harvester_prover_error(
-    harvester_farmer_environment: HarvesterFarmerEnvironment,
+    harvester_farmer_environment: HarvesterFarmerEnvironment, default_400_blocks: list[FullBlock], tmp_path: Path
 ) -> None:
     """Test error handling when prover fails using real blockchain data."""
     _, _, harvester_service, _, bt = harvester_farmer_environment
     harvester_api = harvester_service._server.api
     assert isinstance(harvester_api, HarvesterAPI)
 
     # create signage point from real block
-    new_challenge = signage_point_from_block(bt)
+    block = default_400_blocks[2]  # use a transaction block
+    new_challenge = signage_point_from_block(block, bt)
 
     mock_peer = MagicMock(spec=WSChiaConnection)
 
     # create realistic plot info for testing
     mock_plot_info = create_plot_info()
-    plot_path = Path("/fake/plot.plot")
 
     with patch.object(harvester_api.harvester.plot_manager, "public_keys_available", return_value=True):
-        with patch.object(harvester_api.harvester.plot_manager, "plots", {plot_path: mock_plot_info}):
+        with patch.object(harvester_api.harvester.plot_manager, "plots", {tmp_path: mock_plot_info}):
             # let passes_plot_filter and calculate_pos_challenge use real implementations
             # make the prover fail during quality check
             with patch.object(

chia/_tests/harvester/test_harvester_api.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
+from pathlib import Path
 from typing import Optional
 from unittest.mock import patch
 
 import pytest
+from chia_rs import FullBlock
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint64
 
@@ -19,11 +21,9 @@
 
 
 @pytest.mark.anyio
-async def test_solver_api_methods(bt: BlockTools) -> None:
+async def test_solver_api_methods(bt: BlockTools, tmp_path: Path) -> None:
     """Test solver api protocol methods with real requests."""
-    solver_temp_dir = bt.root_path / "solver_farmer_test"
-    solver_temp_dir.mkdir(exist_ok=True)
-    async with setup_solver(solver_temp_dir, bt.constants) as solver_service:
+    async with setup_solver(tmp_path, bt.constants) as solver_service:
         solver = solver_service._node
         solver_api = solver_service._api
 
@@ -56,26 +56,22 @@ async def test_solver_api_methods(bt: BlockTools) -> None:
 
 
 @pytest.mark.anyio
-async def test_non_overflow_genesis(empty_blockchain: Blockchain, bt: BlockTools) -> None:
-    blocks = bt.get_consecutive_blocks(
-        num_blocks=3,
-        guarantee_transaction_block=True,
-        farmer_reward_puzzle_hash=bt.farmer_ph,
-    )
+async def test_non_overflow_genesis(empty_blockchain: Blockchain, default_400_blocks: list[FullBlock]) -> None:
+    blocks = default_400_blocks[:3]
     for block in blocks:
         await _validate_and_add_block(empty_blockchain, block)
 
 
 @pytest.mark.anyio
 async def test_solver_with_real_blocks_and_signage_points(
-    bt: BlockTools, empty_blockchain: Blockchain, self_hostname: str
+    bt: BlockTools,
+    default_400_blocks: list[FullBlock],
+    empty_blockchain: Blockchain,
+    self_hostname: str,
+    tmp_path: Path,
 ) -> None:
     blockchain = empty_blockchain
-    blocks = bt.get_consecutive_blocks(
-        num_blocks=3,
-        guarantee_transaction_block=True,
-        farmer_reward_puzzle_hash=bt.farmer_ph,
-    )
+    blocks = default_400_blocks[:3]
     for block in blocks:
         await _validate_and_add_block(empty_blockchain, block)
     block = blocks[-1]  # always use the last block
@@ -104,9 +100,7 @@ async def test_solver_with_real_blocks_and_signage_points(
     plot_size = pos.size()
     k_size = plot_size.size_v1 if plot_size.size_v1 is not None else plot_size.size_v2
     assert k_size is not None
-    solver_temp_dir = bt.root_path / "solver_farmer_test"
-    solver_temp_dir.mkdir(exist_ok=True)
-    async with setup_solver(solver_temp_dir, bt.constants) as solver_service:
+    async with setup_solver(tmp_path, bt.constants) as solver_service:
         assert solver_service.rpc_server is not None
         solver_rpc_client = await SolverRpcClient.create(
             self_hostname, solver_service.rpc_server.listen_port, solver_service.root_path, solver_service.config
@@ -119,11 +113,9 @@ async def test_solver_with_real_blocks_and_signage_points(
 
 
 @pytest.mark.anyio
-async def test_solver_error_handling_and_edge_cases(bt: BlockTools, self_hostname: str) -> None:
+async def test_solver_error_handling_and_edge_cases(bt: BlockTools, self_hostname: str, tmp_path: Path) -> None:
     """Test solver error handling with invalid requests and edge cases."""
-    solver_temp_dir = bt.root_path / "solver_farmer_test"
-    solver_temp_dir.mkdir(exist_ok=True)
-    async with setup_solver(solver_temp_dir, bt.constants) as solver_service:
+    async with setup_solver(tmp_path, bt.constants) as solver_service:
         assert solver_service.rpc_server is not None
         solver_rpc_client = await SolverRpcClient.create(
             self_hostname, solver_service.rpc_server.listen_port, solver_service.root_path, solver_service.config

chia/_tests/solver/test_solver_service.py

@@ -43,6 +43,7 @@
 )
 from chia.simulator.socket import find_available_listen_port
 from chia.simulator.start_simulator import SimulatorFullNodeService
+from chia.solver.solver_service import SolverService
 from chia.timelord.timelord_service import TimelordService
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.hash import std_hash
@@ -65,6 +66,7 @@ class FullSystem:
     introducer: IntroducerAPI
     timelord: TimelordService
     timelord_bluebox: TimelordService
+    solver: SolverService
     daemon: WebSocketServer
 
 
@@ -474,14 +476,13 @@ async def setup_full_system_inner(
 
                 await asyncio.sleep(backoff)
 
-        setup_solver(
-            shared_b_tools.root_path / "harvester",
-            consensus_constants,
-            True,
+        solver_service = await async_exit_stack.enter_async_context(
+            setup_solver(
+                shared_b_tools.root_path / "solver",
+                consensus_constants,
+                True,
+            )
         )
-        # solver_service = await async_exit_stack.enter_async_context(
-
-        # )
 
         full_system = FullSystem(
             node_1=node_1,
@@ -491,6 +492,7 @@ async def setup_full_system_inner(
             introducer=introducer,
             timelord=timelord,
             timelord_bluebox=timelord_bluebox_service,
+            solver=solver_service,
             daemon=daemon_ws,
         )
         yield full_system

chia/_tests/util/setup_nodes.py

@@ -12,6 +12,7 @@
     pool_protocol,
     protocol_message_types,
     shared_protocol,
+    solver_protocol,
     timelord_protocol,
     wallet_protocol,
 )
@@ -136,6 +137,7 @@ def test_missing_messages() -> None:
         "NewSignagePoint",
         "RequestSignedValues",
         "SignedValues",
+        "SolutionResponse",
     }
 
     full_node_msgs = {
@@ -188,6 +190,7 @@ def test_missing_messages() -> None:
         "RequestSignatures",
         "RespondPlots",
         "RespondSignatures",
+        "V2Qualities",
     }
 
     introducer_msgs = {"RequestPeersIntroducer", "RespondPeersIntroducer"}
@@ -219,6 +222,8 @@ def test_missing_messages() -> None:
         "RespondCompactProofOfTime",
     }
 
+    solver_msgs = {"SolverInfo"}
+
     shared_msgs = {"Handshake", "Capability", "Error"}
 
     # if these asserts fail, make sure to add the new network protocol messages
@@ -252,6 +257,10 @@ def test_missing_messages() -> None:
         f"message types were added or removed from timelord_protocol. {STANDARD_ADVICE}"
     )
 
+    assert types_in_module(solver_protocol) == solver_msgs, (
+        f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"
+    )
+
     assert types_in_module(shared_protocol) == shared_msgs, (
         f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"
     )

chia/_tests/util/test_network_protocol_test.py

@@ -13,7 +13,17 @@
 from chia.cmds.cmd_classes import ChiaCliContext
 from chia.util.config import load_config
 
-services: list[str] = ["crawler", "daemon", "farmer", "full_node", "harvester", "timelord", "wallet", "data_layer", "solver"]
+services: list[str] = [
+    "crawler",
+    "daemon",
+    "farmer",
+    "full_node",
+    "harvester",
+    "timelord",
+    "wallet",
+    "data_layer",
+    "solver",
+]
 
 
 async def call_endpoint(

chia/cmds/rpc.py

@@ -27,7 +27,7 @@ def get_state_cmd(
     solver_rpc_port: Optional[int],
 ) -> None:
     import asyncio
-    
+
     from chia.cmds.solver_funcs import get_state
 
     asyncio.run(get_state(ChiaCliContext.set_default(ctx), solver_rpc_port))
@@ -36,7 +36,7 @@ def get_state_cmd(
 @solver_cmd.command("solve", help="Solve a quality string")
 @click.option(
     "-sp",
-    "--solver-rpc-port", 
+    "--solver-rpc-port",
     help="Set the port where the Solver is hosting the RPC interface. See the rpc_port under solver in config.yaml",
     type=int,
     default=None,
@@ -74,7 +74,7 @@ def solve_cmd(
     difficulty: int,
 ) -> None:
     import asyncio
-    
+
     from chia.cmds.solver_funcs import solve_quality
 
-    asyncio.run(solve_quality(ChiaCliContext.set_default(ctx), solver_rpc_port, quality, plot_size, difficulty))
+    asyncio.run(solve_quality(ChiaCliContext.set_default(ctx), solver_rpc_port, quality, plot_size, difficulty))