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
@@ -10,7 +10,6 @@ from itertools import product
|
||||
from math import ceil
|
||||
|
||||
from test_framework.descriptors import descsum_create
|
||||
from test_framework.key import ECKey
|
||||
from test_framework.messages import (
|
||||
COIN,
|
||||
)
|
||||
@@ -25,7 +24,7 @@ from test_framework.util import (
|
||||
count_bytes,
|
||||
find_vout_for_address,
|
||||
)
|
||||
from test_framework.wallet_util import bytes_to_wif
|
||||
from test_framework.wallet_util import generate_keypair
|
||||
|
||||
ERR_NOT_ENOUGH_PRESET_INPUTS = "The preselected coins total amount does not cover the transaction target. " \
|
||||
"Please allow other inputs to be automatically selected or include more coins manually"
|
||||
@@ -999,11 +998,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||
|
||||
def test_external_inputs(self):
|
||||
self.log.info("Test funding with external inputs")
|
||||
|
||||
eckey = ECKey()
|
||||
eckey.generate()
|
||||
privkey = bytes_to_wif(eckey.get_bytes())
|
||||
|
||||
privkey, _ = generate_keypair(wif=True)
|
||||
self.nodes[2].createwallet("extfund")
|
||||
wallet = self.nodes[2].get_wallet_rpc("extfund")
|
||||
|
||||
|
||||
Reference in new issue
Block a user