mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-12 22:52:47 +02:00
test: refactor: introduce generate_keypair
helper with WIF support
In functional tests it is a quite common scenario to generate fresh elliptic curve keypairs, which is currently a bit cumbersome as it involves multiple steps, e.g.: privkey = ECKey() privkey.generate() privkey_wif = bytes_to_wif(privkey.get_bytes()) pubkey = privkey.get_pubkey().get_bytes() Simplify this by providing a new `generate_keypair` helper function that returns the private key either as `ECKey` object or as WIF-string (depending on the boolean `wif` parameter) and the public key as byte-string; these formats are what we mostly need (currently we don't use `ECPubKey` objects from generated keypairs anywhere). With this, most of the affected code blocks following the pattern above can be replaced by one-liners, e.g.: privkey, pubkey = generate_keypair(wif=True) Note that after this commit, the only direct uses of `ECKey` remain in situations where we want to set the private key explicitly, e.g. in MiniWallet (test/functional/test_framework/wallet.py) or the test for the signet miner script (test/functional/tool_signet_miner.py).
This commit is contained in:
@ -10,11 +10,10 @@ from test_framework.address import (
|
||||
ADDRESS_BCRT1_UNSPENDABLE,
|
||||
ADDRESS_BCRT1_UNSPENDABLE_DESCRIPTOR,
|
||||
)
|
||||
from test_framework.key import ECKey
|
||||
from test_framework.util import (
|
||||
assert_equal,
|
||||
)
|
||||
from test_framework.wallet_util import bytes_to_wif
|
||||
from test_framework.wallet_util import generate_keypair
|
||||
|
||||
|
||||
class WalletBlankTest(BitcoinTestFramework):
|
||||
@ -50,10 +49,8 @@ class WalletBlankTest(BitcoinTestFramework):
|
||||
assert_equal(info["descriptors"], False)
|
||||
assert_equal(info["blank"], True)
|
||||
|
||||
eckey = ECKey()
|
||||
eckey.generate(compressed=comp)
|
||||
|
||||
wallet.importpubkey(eckey.get_pubkey().get_bytes().hex())
|
||||
_, pubkey = generate_keypair(compressed=comp)
|
||||
wallet.importpubkey(pubkey.hex())
|
||||
assert_equal(wallet.getwalletinfo()["blank"], False)
|
||||
|
||||
def test_importprivkey(self):
|
||||
@ -67,10 +64,7 @@ class WalletBlankTest(BitcoinTestFramework):
|
||||
assert_equal(info["descriptors"], False)
|
||||
assert_equal(info["blank"], True)
|
||||
|
||||
eckey = ECKey()
|
||||
eckey.generate(compressed=comp)
|
||||
wif = bytes_to_wif(eckey.get_bytes(), eckey.is_compressed)
|
||||
|
||||
wif, _ = generate_keypair(compressed=comp, wif=True)
|
||||
wallet.importprivkey(wif)
|
||||
assert_equal(wallet.getwalletinfo()["blank"], False)
|
||||
|
||||
|
Reference in New Issue
Block a user