Skip to content

Commit 521b599

Browse files
committed
fix(lint): functional tests
1 parent 5d343be commit 521b599

11 files changed

+50
-38
lines changed

functional-tests/tests/prover/prover_checkpoint_latest.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import time
2-
31
import flexitest
42

53
from envs import testenv
@@ -29,5 +27,7 @@ def main(self, ctx: flexitest.RunContext):
2927
assert task_id is not None
3028

3129
time_out = 30
32-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=time_out)
33-
assert(is_proof_generation_completed)
30+
is_proof_generation_completed = wait_for_proof_with_time_out(
31+
prover_client_rpc, task_id, time_out=time_out
32+
)
33+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_checkpoint_manual.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
import time
2-
3-
from bitcoinlib.services.bitcoind import BitcoindClient
41
import flexitest
2+
from bitcoinlib.services.bitcoind import BitcoindClient
53

64
from envs import testenv
7-
from utils import wait_for_proof_with_time_out, wait_until, bytes_to_big_endian, cl_slot_to_block_id
5+
from utils import bytes_to_big_endian, cl_slot_to_block_id, wait_for_proof_with_time_out, wait_until
86

97
CHECKPOINT_PROVER_PARAMS = {
108
"checkpoint_idx": 1,
11-
"l1_range": (1, 2),
12-
"l2_range": (1, 2),
9+
"l1_range": (1, 1),
10+
"l2_range": (1, 1),
1311
}
1412

1513

@@ -54,14 +52,18 @@ def main(self, ctx: flexitest.RunContext):
5452
l2_end_block_commitment = {"slot": slot, "blkid": block_id}
5553

5654
task_ids = prover_client_rpc.dev_strata_proveCheckpointRaw(
57-
CHECKPOINT_PROVER_PARAMS["checkpoint_idx"], (l1_start_block_commitment, l1_end_block_commitment), (l2_start_block_commitment, l2_end_block_commitment)
55+
CHECKPOINT_PROVER_PARAMS["checkpoint_idx"],
56+
(l1_start_block_commitment, l1_end_block_commitment),
57+
(l2_start_block_commitment, l2_end_block_commitment),
5858
)
5959
self.debug(f"got the task ids: {task_ids}")
6060
assert task_ids is not None
6161

6262
time_out = 30
63-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_ids[0], time_out=time_out)
63+
is_proof_generation_completed = wait_for_proof_with_time_out(
64+
prover_client_rpc, task_ids[0], time_out=time_out
65+
)
6466

6567
# Proof generation is expected to fail because the range will not match
6668
# CL STF Proof will fail, which in turns fails the checkpoint proof
67-
assert(not is_proof_generation_completed)
69+
assert not is_proof_generation_completed

functional-tests/tests/prover/prover_cl_dispatch.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import time
2-
31
import flexitest
42

53
from envs import testenv
@@ -46,5 +44,7 @@ def main(self, ctx: flexitest.RunContext):
4644
assert task_id is not None
4745

4846
time_out = 30
49-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=time_out)
50-
assert(is_proof_generation_completed)
47+
is_proof_generation_completed = wait_for_proof_with_time_out(
48+
prover_client_rpc, task_id, time_out=time_out
49+
)
50+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_client_restart.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,7 @@ def prove_latest_checkpoint(self, prover_client_rpc):
6767
assert task_id is not None
6868

6969
time_out = 30
70-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=time_out)
71-
assert(is_proof_generation_completed)
70+
is_proof_generation_completed = wait_for_proof_with_time_out(
71+
prover_client_rpc, task_id, time_out=time_out
72+
)
73+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_el_deposit_withdraw.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,7 @@ def test_checkpoint(self, l1_block, l2_block, prover_client_rpc, rethrpc):
161161
self.debug(f"using task id: {task_id}")
162162
assert task_id is not None
163163

164-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=30)
165-
assert(is_proof_generation_completed)
164+
is_proof_generation_completed = wait_for_proof_with_time_out(
165+
prover_client_rpc, task_id, time_out=30
166+
)
167+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_el_dispatch.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,7 @@ def main(self, ctx: flexitest.RunContext):
6464
task_id = task_ids[0]
6565
self.debug(f"Using task ID: {task_id}")
6666

67-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=30)
68-
assert(is_proof_generation_completed)
67+
is_proof_generation_completed = wait_for_proof_with_time_out(
68+
prover_client_rpc, task_id, time_out=30
69+
)
70+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_el_precompiles.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,7 @@ def main(self, ctx: flexitest.RunContext):
6666
task_id = task_ids[0]
6767
self.debug(f"Using task ID: {task_id}")
6868

69-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=30)
70-
assert(is_proof_generation_completed)
69+
is_proof_generation_completed = wait_for_proof_with_time_out(
70+
prover_client_rpc, task_id, time_out=30
71+
)
72+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_l1_batch_dispatch.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import time
2-
31
import flexitest
42
from bitcoinlib.services.bitcoind import BitcoindClient
53

@@ -46,5 +44,7 @@ def main(self, ctx: flexitest.RunContext):
4644
assert task_id is not None
4745

4846
proof_timeout_seconds = 30
49-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=proof_timeout_seconds)
50-
assert(is_proof_generation_completed)
47+
is_proof_generation_completed = wait_for_proof_with_time_out(
48+
prover_client_rpc, task_id, time_out=proof_timeout_seconds
49+
)
50+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_l1_dispatch.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import time
2-
31
import flexitest
42
from bitcoinlib.services.bitcoind import BitcoindClient
53

@@ -39,5 +37,7 @@ def main(self, ctx: flexitest.RunContext):
3937
assert task_id is not None
4038

4139
time_out = 30
42-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=time_out)
43-
assert(is_proof_generation_completed)
40+
is_proof_generation_completed = wait_for_proof_with_time_out(
41+
prover_client_rpc, task_id, time_out=time_out
42+
)
43+
assert is_proof_generation_completed

functional-tests/tests/prover/prover_schnorr_precompile.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,7 @@ def main(self, ctx: flexitest.RunContext):
6262
assert task_id is not None
6363

6464
time_out = 30
65-
is_proof_generation_completed = wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=time_out)
66-
assert(is_proof_generation_completed)
65+
is_proof_generation_completed = wait_for_proof_with_time_out(
66+
prover_client_rpc, task_id, time_out=time_out
67+
)
68+
assert is_proof_generation_completed

functional-tests/utils/utils.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,14 @@ def check_already_sent_proof(seqrpc, sent_batch: int):
450450
raise AssertionError("Expected rpc error")
451451

452452

453-
def wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=3600) -> bool :
453+
def wait_for_proof_with_time_out(prover_client_rpc, task_id, time_out=3600) -> bool:
454454
"""
455455
Waits for a proof task to complete/fail within a specified timeout period.
456456
457457
This function continuously polls the status of a proof task identified by `task_id` using
458458
the `prover_client_rpc` client. It checks the status every 2 seconds and waits until the
459-
proof task status is either "Completed" where it returns True, or "Failed" where it return False.
460-
If the specified `time_out` (in seconds) is reached, it throws TimeoutError.
459+
proof task status is either "Completed" where it returns True, or "Failed" where it return
460+
False. If the specified `time_out` (in seconds) is reached, it throws TimeoutError.
461461
"""
462462

463463
start_time = time.time()

0 commit comments

Comments
 (0)