Skip to content

Commit fac921f

Browse files
author
MarcoFalke
committed
fuzz: Fix tx_pool target to properly fuzz immature outpoints
1 parent fa2b95f commit fac921f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/test/fuzz/tx_pool.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
namespace {
1717

1818
const TestingSetup* g_setup;
19-
std::vector<COutPoint> g_outpoints_coinbase_init;
19+
std::vector<COutPoint> g_outpoints_coinbase_init_mature;
20+
std::vector<COutPoint> g_outpoints_coinbase_init_immature;
2021

2122
struct MockedTxPool : public CTxMemPool {
2223
void RollingFeeUpdate()
@@ -34,7 +35,10 @@ void initialize_tx_pool()
3435
for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
3536
CTxIn in = MineBlock(g_setup->m_node, P2WSH_OP_TRUE);
3637
// Remember the txids to avoid expensive disk acess later on
37-
g_outpoints_coinbase_init.push_back(in.prevout);
38+
auto& outpoints = i < COINBASE_MATURITY ?
39+
g_outpoints_coinbase_init_mature :
40+
g_outpoints_coinbase_init_immature;
41+
outpoints.push_back(in.prevout);
3842
}
3943
SyncWithValidationInterfaceQueue();
4044
}
@@ -86,9 +90,8 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool)
8690
std::set<COutPoint> outpoints_rbf;
8791
// All outpoints counting toward the total supply (subset of outpoints_rbf)
8892
std::set<COutPoint> outpoints_supply;
89-
for (const auto& outpoint : g_outpoints_coinbase_init) {
93+
for (const auto& outpoint : g_outpoints_coinbase_init_mature) {
9094
Assert(outpoints_supply.insert(outpoint).second);
91-
if (outpoints_supply.size() >= COINBASE_MATURITY) break;
9295
}
9396
outpoints_rbf = outpoints_supply;
9497

@@ -253,13 +256,12 @@ FUZZ_TARGET_INIT(tx_pool, initialize_tx_pool)
253256
const auto& node = g_setup->m_node;
254257

255258
std::vector<uint256> txids;
256-
for (const auto& outpoint : g_outpoints_coinbase_init) {
259+
for (const auto& outpoint : g_outpoints_coinbase_init_mature) {
257260
txids.push_back(outpoint.hash);
258-
if (txids.size() >= COINBASE_MATURITY) break;
259261
}
260262
for (int i{0}; i <= 3; ++i) {
261263
// Add some immature and non-existent outpoints
262-
txids.push_back(g_outpoints_coinbase_init.at(i).hash);
264+
txids.push_back(g_outpoints_coinbase_init_immature.at(i).hash);
263265
txids.push_back(ConsumeUInt256(fuzzed_data_provider));
264266
}
265267

0 commit comments

Comments
 (0)