This PR speeds up a few unit tests, as a partial fix to issue #10026, with some optimizations and reducing some number of validations to sane levels:
More details in each commit.
No changes should affect executable production code (though there is a change in interpreter.h, including a constant).
448@@ -449,10 +449,17 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction) {
449 mtx.vout[i].scriptPubKey = CScript() << OP_1;
450 }
451
452+ // create a single CTransaction to be used in generating all signatures
453+ CTransaction txToConst(mtx);
test_big_witness_transaction was spending most of time converting CMutableTransaction to Transaction, which involves recalculating hashes. This means the time complexity for providing witnesses for the 4500 inputs had a O(n2) component. This change replaces the call to SignSignature (which always creates a new CTransaction) with calls to lower level functions ProduceSignature and UpdateTransaction, which allows for reuse of a single CTransaction. This reduces execution time in about 70%.
This commit uses the a similar strategy as used for speeding up test_big_witness_transaction, that is, reusing the same CTransaction for several calls. Attains a speed up of about 15%.
Following a suggestion in the comments, changed `ValidateCheckInputsForAllFlags` from testing all possible flag combinations to testing a random subset. Also created a new enum constant for the highest flag, so that this test doesn’t keep testing an incomplete subset in case a new flag is added.
The two tests that check for the sigops limit with 1001 multisig transactions now reuse the same transactions, instead of creating the exact same two times.
Moved the code for creating the wallet out of the 100-times repetition loop, for the most time-consuming tests.
test_CheckQueue_Correct_Random was taking too long a time, and concentrating most tests in ranges close to 100,000. Changed to a more evenly distribution between 0 and 100,000 and reduced to about 40 random amounts of checks.
This reverts commit 525b2f0117e0469a6154defd985019395b53dfb5.
This reverts commit 0d1a6ab4cad23e147189302ce8d85794d698f1a7.
289+ hash = cTx.GetHash();
290 bool spendsCoinbase = i == 0; // only first tx spends coinbase
291 // If we don't set the # of sig ops in the CTxMemPoolEntry, template creation fails
292- mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx));
293- tx.vin[0].prevout.hash = hash;
294+ mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(cTx));
CMutableTransaction is converted to a CTransaction just once, and then the hash is cached and copying the CTransaction just copies the cached hash. Removing the method that accepts CTransaction makes that optimization impossible.
Anyway, since the method is no longer there, I’ll remove this commit and think of some other way of speeding up things in a separate PR.
multisig_txs instead your patch should work just fine?
104@@ -105,6 +105,8 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
105 static void ValidateCheckInputsForAllFlags(CMutableTransaction &tx, uint32_t failing_flags, bool add_to_cache)
106 {
107 PrecomputedTransactionData txdata(tx);
108+ CTransaction cTx(tx);
in commit 384bcd116c7bdfbe7ed851a739a8d8c8809d4d12 ( speed up of tx_validationcache_tests by reusing of CTransaction), it seems you can instead just adjust the signature:
0-static void ValidateCheckInputsForAllFlags(CMutableTransaction &tx, uint32_t failing_flags, bool add_to_cache)
1+static void ValidateCheckInputsForAllFlags(const CTransaction &tx, uint32_t failing_flags, bool add_to_cache)
(Might need a rebase on master)
Also, to I suggest splitting up the commits into separate pull request to make it easier to review and merge the changes independently. (You could start with this change, since it seems a clear and trivial win)
Labels
Tests