aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Falbesoner <sebastian.falbesoner@gmail.com>2022-04-05 20:04:20 +0200
committerSebastian Falbesoner <sebastian.falbesoner@gmail.com>2022-04-05 20:07:33 +0200
commit65c49ac750ba39801b349d0a59c27471dfa9868e (patch)
tree594b34981ecee869733d159a3e0ea759d64b5f9d
parent219d2c7ee1d35a353a96c55d4c411d43fe39548a (diff)
test: throw `ValueError` for invalid base58 checksum
-rwxr-xr-xcontrib/testgen/gen_key_io_test_vectors.py2
-rw-r--r--test/functional/test_framework/address.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/testgen/gen_key_io_test_vectors.py b/contrib/testgen/gen_key_io_test_vectors.py
index 8017fad461..4aa7dc200b 100755
--- a/contrib/testgen/gen_key_io_test_vectors.py
+++ b/contrib/testgen/gen_key_io_test_vectors.py
@@ -111,7 +111,7 @@ def is_valid(v):
try:
payload, version = base58_to_byte(v)
result = bytes([version]) + payload
- except AssertionError: # thrown if checksum doesn't match
+ except ValueError: # thrown if checksum doesn't match
return is_valid_bech32(v)
for template in templates:
prefix = bytearray(template[0])
diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py
index 9ac3f847b7..fcea24655b 100644
--- a/test/functional/test_framework/address.py
+++ b/test/functional/test_framework/address.py
@@ -91,8 +91,8 @@ def base58_to_byte(s):
break
res = b'\x00' * pad + res
- # Assert if the checksum is invalid
- assert_equal(hash256(res[:-4])[:4], res[-4:])
+ if hash256(res[:-4])[:4] != res[-4:]:
+ raise ValueError('Invalid Base58Check checksum')
return res[1:-4], int(res[0])