Skip to content

Commit 3cc9272

Browse files
RandomLatticeandozw
andcommitted
tests: lint wycheproof's python script
This PR lints tests_wycheproof_generate.py according to bitcoin's python linting scripts. This is a follow-up to PR bitcoin-core#1245. Co-authored-by: Sean Andersen <[email protected]>
1 parent 3bab71c commit 3cc9272

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

tools/tests_wycheproof_generate.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
'''
88

99
import json
10-
import hashlib
11-
import urllib.request
1210
import sys
1311

1412
filename_input = sys.argv[1]
@@ -19,7 +17,8 @@
1917
num_groups = len(doc['testGroups'])
2018

2119
def to_c_array(x):
22-
if x == "": return ""
20+
if x == "":
21+
return ""
2322
s = ',0x'.join(a+b for a,b in zip(x[::2], x[1::2]))
2423
return "0x" + s
2524

@@ -43,18 +42,23 @@ def to_c_array(x):
4342
sig_size = len(test_vector['sig']) // 2
4443
msg_size = len(test_vector['msg']) // 2
4544

46-
if test_vector['result'] == "invalid": expected_verify = 0
47-
elif test_vector['result'] == "valid": expected_verify = 1
48-
else: raise ValueError("invalid result field")
45+
if test_vector['result'] == "invalid":
46+
expected_verify = 0
47+
elif test_vector['result'] == "valid":
48+
expected_verify = 1
49+
else:
50+
raise ValueError("invalid result field")
4951

50-
if num_vectors != 0 and sig_size != 0: signatures += ",\n "
52+
if num_vectors != 0 and sig_size != 0:
53+
signatures += ",\n "
5154

5255
new_msg = False
5356
msg = to_c_array(test_vector['msg'])
5457
msg_offset = offset_msg_running
5558
# check for repeated msg
5659
if msg not in cache_msgs.keys():
57-
if num_vectors != 0 and msg_size != 0: messages += ",\n "
60+
if num_vectors != 0 and msg_size != 0:
61+
messages += ",\n "
5862
cache_msgs[msg] = offset_msg_running
5963
messages += msg
6064
new_msg = True
@@ -66,7 +70,8 @@ def to_c_array(x):
6670
pk_offset = offset_pk_running
6771
# check for repeated pk
6872
if pk not in cache_public_keys.keys():
69-
if num_vectors != 0: public_keys += ",\n "
73+
if num_vectors != 0:
74+
public_keys += ",\n "
7075
cache_public_keys[pk] = offset_pk_running
7176
public_keys += pk
7277
new_pk = True
@@ -83,8 +88,10 @@ def to_c_array(x):
8388
offset_sig,
8489
sig_size,
8590
expected_verify) + " },\n"
86-
if new_msg: offset_msg_running += msg_size
87-
if new_pk: offset_pk_running += 65
91+
if new_msg:
92+
offset_msg_running += msg_size
93+
if new_pk:
94+
offset_pk_running += 65
8895
offset_sig += sig_size
8996
num_vectors += 1
9097

0 commit comments

Comments
 (0)