test and comments

Author: almogdepaz

chia/_tests/farmer_harvester/test_farmer_harvester.py

@@ -420,7 +420,7 @@ async def test_v2_partial_proofs_with_existing_sp(
     harvester_peer = await get_harvester_peer(farmer)
     await farmer_api.partial_proofs(partial_proofs, harvester_peer)
 
-    # should store 2 pending requests (one per quality)
+    # should store 2 pending requests (one per partial proof)
     assert len(farmer.pending_solver_requests) == 2
     assert sp_hash in farmer.cache_add_time
 
@@ -434,7 +434,6 @@ async def test_solution_response_handler(
     farmer = farmer_api.farmer
 
     # set up a pending request
-    quality = bytes32(b"3" * 32)
     sp_hash = bytes32(b"1" * 32)
     challenge_hash = bytes32(b"2" * 32)
 
@@ -453,13 +452,15 @@ async def test_solution_response_handler(
     harvester_peer = await get_harvester_peer(farmer)
 
     # manually add pending request
-    farmer.pending_solver_requests[quality] = {
+    farmer.pending_solver_requests[partial_proofs.partial_proofs[0]] = {
         "proof_data": partial_proofs,
         "peer": harvester_peer,
     }
 
     # create solution response
-    solution_response = solver_protocol.SolverResponse(partial_proof=quality, proof=b"test_proof_from_solver")
+    solution_response = solver_protocol.SolverResponse(
+        partial_proof=partial_proofs.partial_proofs[0], proof=b"test_proof_from_solver"
+    )
     solver_peer = Mock()
     solver_peer.peer_node_id = "solver_peer"
 
@@ -476,7 +477,7 @@ async def test_solution_response_handler(
         assert original_peer == harvester_peer
 
         # verify pending request was removed
-        assert quality not in farmer.pending_solver_requests
+        assert partial_proofs.partial_proofs[0] not in farmer.pending_solver_requests
 
 
 @pytest.mark.anyio
@@ -510,7 +511,6 @@ async def test_solution_response_empty_proof(
     farmer = farmer_api.farmer
 
     # set up a pending request
-    quality = bytes32(b"3" * 32)
     sp_hash = bytes32(b"1" * 32)
     challenge_hash = bytes32(b"2" * 32)
 
@@ -530,16 +530,16 @@ async def test_solution_response_empty_proof(
     harvester_peer.peer_node_id = "harvester_peer"
 
     # manually add pending request
-    farmer.pending_solver_requests[quality] = {
-        "proof_data": partial_proofs,
+    farmer.pending_solver_requests[partial_proofs.partial_proofs[0]] = {
+        "proof_data": partial_proofs.partial_proofs[0],
         "peer": harvester_peer,
     }
 
     # get real solver peer connection
     solver_peer = await get_solver_peer(farmer)
 
     # create solution response with empty proof
-    solution_response = solver_protocol.SolverResponse(partial_proof=quality, proof=b"")
+    solution_response = solver_protocol.SolverResponse(partial_proof=partial_proofs.partial_proofs[0], proof=b"")
 
     with unittest.mock.patch.object(farmer_api, "new_proof_of_space", new_callable=AsyncMock) as mock_new_proof:
         await farmer_api.solution_response(solution_response, solver_peer)
@@ -548,7 +548,7 @@ async def test_solution_response_empty_proof(
         mock_new_proof.assert_not_called()
 
         # verify pending request was removed (cleanup still happens)
-        assert quality not in farmer.pending_solver_requests
+        assert partial_proofs.partial_proofs[0] not in farmer.pending_solver_requests
 
 
 @pytest.mark.anyio
@@ -594,5 +594,4 @@ async def test_v2_partial_proofs_solver_exception(
         await farmer_api.partial_proofs(partial_proofs, harvester_peer)
 
         # verify pending request was cleaned up after exception
-        quality = bytes32(b"3" * 32)
-        assert quality not in farmer.pending_solver_requests
+        assert partial_proofs.partial_proofs[0] not in farmer.pending_solver_requests

chia/farmer/farmer_api.py

@@ -503,7 +503,7 @@ async def partial_proofs(self, partial_proof_data: PartialProofsData, peer: WSCh
             f"for plot {partial_proof_data.plot_identifier[:10]}... from {peer.peer_node_id}"
         )
 
-        # Process each quality chain through solver service to get full proofs
+        # Process each partial proof chain through solver service to get full proofs
         for partial_proof in partial_proof_data.partial_proofs:
             solver_info = SolverInfo(partial_proof=partial_proof)
 

chia/solver/solver_rpc_api.py

@@ -19,18 +19,12 @@ def __init__(self, solver: Solver):
 
     def get_routes(self) -> dict[str, Endpoint]:
         return {
-            "/solve": self.solve,
             "/get_state": self.get_state,
         }
 
     async def _state_changed(self, change: str, change_data: Optional[dict[str, Any]] = None) -> list[WsRpcMessage]:
         return []
 
-    async def solve(self, request: dict[str, Any]) -> EndpointResult:
-        partial_proof = request["partial_proof"]
-        proof = self.service.solve(partial_proof=partial_proof)
-        return {"proof": proof.hex() if proof else None}
-
     async def get_state(self, _: dict[str, Any]) -> EndpointResult:
         return {
             "started": self.service.started,