aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2022-12-21 09:05:59 +0100
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2022-12-21 09:06:24 +0100
commit0139a0d5c02a8099a774aa7f94019bc816f01221 (patch)
tree6bc1b00fc96652b273c9026803ba177dce7c1347 /test
parent8456bfac6ba2dcca42a03d3374c12e1a3f009106 (diff)
parent31fdc54dba92fe9d7d8289f1e4380082838a74a9 (diff)
downloadbitcoin-0139a0d5c02a8099a774aa7f94019bc816f01221.tar.xz
Merge bitcoin/bitcoin#26722: test: speed up the two slowest functional tests by 18-35% via `keypoolrefill()`
31fdc54dba92fe9d7d8289f1e4380082838a74a9 test: speed up wallet_fundrawtransaction.py and wallet_sendall.py (kdmukai) Pull request description: ## Problem `wallet_fundrawtransaction.py` and `wallet_sendall.py` are the two slowest functional tests *when running without a RAM disk*. ``` # M1 MacBook Pro timings wallet_fundrawtransaction.py --descriptors | ✓ Passed | 55 s wallet_fundrawtransaction.py --legacy-wallet | ✓ Passed | 381 s wallet_sendall.py --descriptors | ✓ Passed | 43 s wallet_sendall.py --legacy-wallet | ✓ Passed | 327 s ``` In each case, the majority of the time is spent iterating through 1500 to 1600 `getnewaddress()` calls. This is particularly slow in the `--legacy-wallet` runs. see: https://github.com/bitcoin/bitcoin/blob/master/test/functional/wallet_fundrawtransaction.py#L986-L987 see: https://github.com/bitcoin/bitcoin/blob/master/test/functional/wallet_sendall.py#L324 ## Solution Pre-fill the keypool before iterating through those `getnewaddress()` calls. With this change, the execution time drops to: ``` wallet_fundrawtransaction.py --descriptors | ✓ Passed | 52 s # -3s diff wallet_fundrawtransaction.py --legacy-wallet | ✓ Passed | 291 s # -90s diff wallet_sendall.py --descriptors | ✓ Passed | 27 s # -16s diff wallet_sendall.py --legacy-wallet | ✓ Passed | 228 s # -99s diff ``` --- Tagging @ Sjors as he had encouraged me to take a look at speeding up the tests. ACKs for top commit: achow101: ACK 31fdc54dba92fe9d7d8289f1e4380082838a74a9 Tree-SHA512: e8dd89323551779832a407d068977c827c09dff55c1079d3c19aab39fcce6957df22b1da797ed7aa3bc2f6dd22fdf9e6f5e1a9a0200fdb16ed6042fc5f6dd992
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/wallet_fundrawtransaction.py2
-rwxr-xr-xtest/functional/wallet_sendall.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/test/functional/wallet_fundrawtransaction.py b/test/functional/wallet_fundrawtransaction.py
index bf218bfee9..915640dc4e 100755
--- a/test/functional/wallet_fundrawtransaction.py
+++ b/test/functional/wallet_fundrawtransaction.py
@@ -983,6 +983,8 @@ class RawTransactionsTest(BitcoinTestFramework):
# are selected, the transaction will end up being too large, so it
# shouldn't use BnB and instead fall back to Knapsack but that behavior
# is not implemented yet. For now we just check that we get an error.
+ # First, force the wallet to bulk-generate the addresses we'll need.
+ recipient.keypoolrefill(1500)
for _ in range(1500):
outputs[recipient.getnewaddress()] = 0.1
wallet.sendmany("", outputs)
diff --git a/test/functional/wallet_sendall.py b/test/functional/wallet_sendall.py
index 2221c39588..778c8a5b9e 100755
--- a/test/functional/wallet_sendall.py
+++ b/test/functional/wallet_sendall.py
@@ -320,6 +320,10 @@ class SendallTest(BitcoinTestFramework):
# This tests needs to be the last one otherwise @cleanup will fail with "Transaction too large" error
def sendall_fails_with_transaction_too_large(self):
self.log.info("Test that sendall fails if resulting transaction is too large")
+
+ # Force the wallet to bulk-generate the addresses we'll need
+ self.wallet.keypoolrefill(1600)
+
# create many inputs
outputs = {self.wallet.getnewaddress(): 0.000025 for _ in range(1600)}
self.def_wallet.sendmany(amounts=outputs)