Skip to content

Commit 7d755bb

Browse files
committed
contrib: testgen: avoid need for manually setting PYTHONPATH
1 parent 7b83c7d commit 7d755bb

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

contrib/testgen/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ Utilities to generate test vectors for the data-driven Bitcoin tests.
44

55
Usage:
66

7-
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py valid 70 > ../../src/test/data/key_io_valid.json
8-
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py invalid 70 > ../../src/test/data/key_io_invalid.json
7+
./gen_key_io_test_vectors.py valid 70 > ../../src/test/data/key_io_valid.json
8+
./gen_key_io_test_vectors.py invalid 70 > ../../src/test/data/key_io_invalid.json

contrib/testgen/gen_key_io_test_vectors.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2012-2021 The Bitcoin Core developers
2+
# Copyright (c) 2012-2022 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
'''
66
Generate valid and invalid base58/bech32(m) address and private key test vectors.
77
88
Usage:
9-
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py valid 70 > ../../src/test/data/key_io_valid.json
10-
PYTHONPATH=../../test/functional/test_framework ./gen_key_io_test_vectors.py invalid 70 > ../../src/test/data/key_io_invalid.json
9+
./gen_key_io_test_vectors.py valid 70 > ../../src/test/data/key_io_valid.json
10+
./gen_key_io_test_vectors.py invalid 70 > ../../src/test/data/key_io_invalid.json
1111
'''
12-
# 2012 Wladimir J. van der Laan
13-
# Released under MIT License
12+
1413
import os
1514
from itertools import islice
1615
from base58 import b58encode_chk, b58decode_chk, b58chars
1716
import random
18-
from segwit_addr import bech32_encode, decode_segwit_address, convertbits, CHARSET, Encoding
17+
import sys
18+
19+
sys.path.append(os.path.join(os.path.dirname(__file__), '../../test/functional'))
20+
21+
from test_framework.segwit_addr import bech32_encode, decode_segwit_address, convertbits, CHARSET, Encoding # noqa: E402
1922

2023
# key types
2124
PUBKEY_ADDRESS = 0
@@ -250,7 +253,6 @@ def gen_invalid_vectors():
250253
yield val,
251254

252255
if __name__ == '__main__':
253-
import sys
254256
import json
255257
iters = {'valid':gen_valid_vectors, 'invalid':gen_invalid_vectors}
256258
try:

0 commit comments

Comments
 (0)