highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-24 23:52:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixes Bug in Transaction generation in ComplexMempool benchmark"

Browse Source 
This reverts commit 29e983386b0aecf99cdb7d0e08ba6b450bed313e.
This commit is contained in:
MarcoFalke 2021-12-07 14:33:42 +01:00
parent 29e983386b
commit faa185bb3a
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bench/mempool_stress.cpp
View File

@ -56,7 +56,7 @@ static void ComplexMemPool(benchmark::Bench& bench)
size_t n_ancestors = det_rand.randrange(10)+1;
for (size_t ancestor = 0; ancestor < n_ancestors && !available_coins.empty(); ++ancestor){
size_t idx = det_rand.randrange(available_coins.size());
Available& coin = available_coins[idx];
Available coin = available_coins[idx];
uint256 hash = coin.ref->GetHash();
// biased towards taking just one ancestor, but maybe more
size_t n_to_take = det_rand.randrange(2) == 0 ? 1 : 1+det_rand.randrange(coin.ref->vout.size() - coin.vin_left);
@ -66,17 +66,15 @@ static void ComplexMemPool(benchmark::Bench& bench)
tx.vin.back().scriptSig = CScript() << coin.tx_count;
tx.vin.back().scriptWitness.stack.push_back(CScriptNum(coin.tx_count).getvch());
}
if (coin.vin_left == coin.ref->vout.size()) {
if(available_coins.size()-1!=idx){ // if idx is not the last index swap it with the end index
std::swap(available_coins[idx], available_coins.back());
}
if (coin.vin_left == coin.ref->vin.size()) {
coin = available_coins.back();
available_coins.pop_back();
}
}
tx.vout.resize(det_rand.randrange(10)+2);
for (auto& out : tx.vout) {
out.scriptPubKey = CScript() << CScriptNum(tx_counter) << OP_EQUAL;
out.nValue = 10 * COIN;
tx.vout.resize(det_rand.randrange(10)+2);
for (auto& out : tx.vout) {
out.scriptPubKey = CScript() << CScriptNum(tx_counter) << OP_EQUAL;
out.nValue = 10 * COIN;
}
}
ordered_coins.emplace_back(MakeTransactionRef(tx));
available_coins.emplace_back(ordered_coins.back(), tx_counter++);