GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 95fe477fd1 into merged_master (Bitcoin PR bitcoin/bitcoin#23693)

Browse source
This commit is contained in:
James Dorfman 2023-06-02 15:17:50 +00:00
commit 360bf6eb36
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/bench/mempool_stress.cpp
View file

@ -53,7 +53,7 @@ static std::vector<CTransactionRef> CreateOrderedCoins(FastRandomContext& det_ra
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 min_ancestors parents, but maybe more
size_t n_to_take = det_rand.randrange(2) == 0 ?
@ -66,17 +66,15 @@ static std::vector<CTransactionRef> CreateOrderedCoins(FastRandomContext& det_ra
tx.witness.vtxinwit.emplace_back();
tx.witness.vtxinwit.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++);