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:
1 parent
7f0b79ea13
commit
1a572ce7d6
18 files changed
+79
-130
No files matched your search
@@ -7,7 +7,6 @@ from decimal import Decimal
|
||||
|
||||
from test_framework.address import key_to_p2wpkh
|
||||
from test_framework.blocktools import COINBASE_MATURITY
|
||||
from test_framework.key import ECKey
|
||||
from test_framework.messages import (
|
||||
CMerkleBlock,
|
||||
from_hex,
|
||||
@@ -17,7 +16,7 @@ from test_framework.util import (
|
||||
assert_equal,
|
||||
assert_raises_rpc_error,
|
||||
)
|
||||
from test_framework.wallet_util import bytes_to_wif
|
||||
from test_framework.wallet_util import generate_keypair
|
||||
|
||||
|
||||
class ImportPrunedFundsTest(BitcoinTestFramework):
|
||||
@@ -40,10 +39,8 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
|
||||
# pubkey
|
||||
address2 = self.nodes[0].getnewaddress()
|
||||
# privkey
|
||||
eckey = ECKey()
|
||||
eckey.generate()
|
||||
address3_privkey = bytes_to_wif(eckey.get_bytes())
|
||||
address3 = key_to_p2wpkh(eckey.get_pubkey().get_bytes())
|
||||
address3_privkey, address3_pubkey = generate_keypair(wif=True)
|
||||
address3 = key_to_p2wpkh(address3_pubkey)
|
||||
self.nodes[0].importprivkey(address3_privkey)
|
||||
|
||||
# Check only one address
|
||||
|
||||
Reference in new issue
Block a user