Skip to content

Commit bbc9fc0

Browse files
committed
more pr comments, fix test to catch assertion
1 parent 82d3252 commit bbc9fc0

File tree

3 files changed

+13
-33
lines changed

3 files changed

+13
-33
lines changed

chia/_tests/plotting/test_prover.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_v2_prover_get_qualities_for_challenge_raises_error(self) -> None:
4343

4444
def test_v2_prover_get_full_proof_raises_error(self) -> None:
4545
prover = V2Prover("/nonexistent/path/test.plot2")
46-
with pytest.raises(NotImplementedError, match="V2 plot format require solver to get full proof"):
46+
with pytest.raises(AssertionError, match="V2 plot format require solver to get full proof"):
4747
prover.get_full_proof(bytes32(b"1" * 32), 0)
4848

4949
def test_v2_prover_bytes_raises_error(self) -> None:

chia/cmds/solver.py

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def get_state_cmd(
3333
asyncio.run(get_state(ChiaCliContext.set_default(ctx), solver_rpc_port))
3434

3535

36-
@solver_cmd.command("solve", help="Solve a quality string")
36+
@solver_cmd.command("solve", help="Solve a partial proof of space, turning it into a full proof")
3737
@click.option(
3838
"-sp",
3939
"--solver-rpc-port",
@@ -43,38 +43,20 @@ def get_state_cmd(
4343
show_default=True,
4444
)
4545
@click.option(
46-
"-q",
47-
"--quality",
48-
help="Quality string to solve (hex format)",
46+
"-p",
47+
"--partial_proof",
48+
help="partial proof string to solve (hex format)",
4949
type=str,
5050
required=True,
5151
)
52-
@click.option(
53-
"-k",
54-
"--plot-size",
55-
help="Plot size (k value, default: 32)",
56-
type=int,
57-
default=32,
58-
show_default=True,
59-
)
60-
@click.option(
61-
"-d",
62-
"--difficulty",
63-
help="Plot difficulty (default: 1000)",
64-
type=int,
65-
default=1000,
66-
show_default=True,
67-
)
6852
@click.pass_context
6953
def solve_cmd(
7054
ctx: click.Context,
7155
solver_rpc_port: Optional[int],
72-
quality: str,
73-
plot_size: int,
74-
difficulty: int,
56+
partial_proof: str,
7557
) -> None:
7658
import asyncio
7759

78-
from chia.cmds.solver_funcs import solve_quality
60+
from chia.cmds.solver_funcs import solve_partial_proof
7961

80-
asyncio.run(solve_quality(ChiaCliContext.set_default(ctx), solver_rpc_port, quality, plot_size, difficulty))
62+
asyncio.run(solve_partial_proof(ChiaCliContext.set_default(ctx), solver_rpc_port, partial_proof))

chia/cmds/solver_funcs.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,15 @@ async def get_state(
2121
print(f"Failed to get solver state: {e}")
2222

2323

24-
async def solve_quality(
24+
async def solve_partial_proof(
2525
ctx: ChiaCliContext,
2626
solver_rpc_port: Optional[int],
27-
quality_hex: str,
28-
plot_size: int = 32,
29-
difficulty: int = 1000,
27+
partial_proof: str,
3028
) -> None:
31-
"""Solve a quality string via RPC."""
29+
"""Solve a partial proof via RPC."""
3230
try:
3331
async with get_any_service_client(SolverRpcClient, ctx.root_path, solver_rpc_port) as (client, _):
34-
response = await client.solve(quality_hex)
32+
response = await client.solve(partial_proof)
3533
print(json.dumps(response, indent=2))
3634
except Exception as e:
37-
print(f"Failed to solve quality: {e}")
35+
print(f"Failed to solve partial proof: {e}")

0 commit comments

Comments
 (0)