diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-03-23 10:58:33 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-03-23 10:58:36 +0100 |
commit | fac921f23f1a9cd1eb9da903e0b9a35aa391a1b8 (patch) | |
tree | a5c25057896873dbf1ac125e6bea2f09bb3d8fbe /src | |
parent | fa2b95f8615453cb1c2829292afed8d2fbd4f045 (diff) | |
download | bitcoin-fac921f23f1a9cd1eb9da903e0b9a35aa391a1b8.tar.xz |
fuzz: Fix tx_pool target to properly fuzz immature outpoints
Diffstat (limited to 'src')
-rw-r--r-- | src/test/fuzz/tx_pool.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index 799de3b9d2..f84d6702a7 100644 --- a/src/test/fuzz/tx_pool.cpp +++ b/src/test/fuzz/tx_pool.cpp @@ -16,7 +16,8 @@ namespace { const TestingSetup* g_setup; -std::vector<COutPoint> g_outpoints_coinbase_init; +std::vector<COutPoint> g_outpoints_coinbase_init_mature; +std::vector<COutPoint> g_outpoints_coinbase_init_immature; struct MockedTxPool : public CTxMemPool { void RollingFeeUpdate() @@ -34,7 +35,10 @@ void initialize_tx_pool() for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) { CTxIn in = MineBlock(g_setup->m_node, P2WSH_OP_TRUE); // Remember the txids to avoid expensive disk acess later on - g_outpoints_coinbase_init.push_back(in.prevout); + auto& outpoints = i < COINBASE_MATURITY ? + g_outpoints_coinbase_init_mature : + g_outpoints_coinbase_init_immature; + outpoints.push_back(in.prevout); } SyncWithValidationInterfaceQueue(); } @@ -86,9 +90,8 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool) std::set<COutPoint> outpoints_rbf; // All outpoints counting toward the total supply (subset of outpoints_rbf) std::set<COutPoint> outpoints_supply; - for (const auto& outpoint : g_outpoints_coinbase_init) { + for (const auto& outpoint : g_outpoints_coinbase_init_mature) { Assert(outpoints_supply.insert(outpoint).second); - if (outpoints_supply.size() >= COINBASE_MATURITY) break; } outpoints_rbf = outpoints_supply; @@ -253,13 +256,12 @@ FUZZ_TARGET_INIT(tx_pool, initialize_tx_pool) const auto& node = g_setup->m_node; std::vector<uint256> txids; - for (const auto& outpoint : g_outpoints_coinbase_init) { + for (const auto& outpoint : g_outpoints_coinbase_init_mature) { txids.push_back(outpoint.hash); - if (txids.size() >= COINBASE_MATURITY) break; } for (int i{0}; i <= 3; ++i) { // Add some immature and non-existent outpoints - txids.push_back(g_outpoints_coinbase_init.at(i).hash); + txids.push_back(g_outpoints_coinbase_init_immature.at(i).hash); txids.push_back(ConsumeUInt256(fuzzed_data_provider)); } |