foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
Code Issues Activity

Merge #21512: fuzz: Fix tx_pool target to properly fuzz immature outpoints

Browse source 
fac921f23f fuzz: Fix tx_pool target to properly fuzz immature outpoints (MarcoFalke)
fa2b95f861 fuzz: Style fixups (MarcoFalke)

Pull request description:

  Also includes a commit for minor style fixups

ACKs for top commit:
  glozow:
    utACK fac921f23f this fixes it 👍

Tree-SHA512: 1575ba115b2009b653921511c163bd846cd381d6fc92b04a899c0686d23a02bdcdd95c81776b515b80ae187bcec3ccaca3aa88fcecbec888f73ca2d875eef506
This commit is contained in:
MarcoFalke 2021-03-23 16:04:17 +01:00
commit 681c21be9a
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/test/fuzz/process_message.cpp
View file

@ -68,8 +68,8 @@ void fuzz_target(FuzzBufferType buffer, const std::string& LIMIT_TO_MESSAGE_TYPE
{ {
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size()); FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
ConnmanTestMsg& connman = *(ConnmanTestMsg*)g_setup->m_node.connman.get(); ConnmanTestMsg& connman = *static_cast<ConnmanTestMsg*>(g_setup->m_node.connman.get());
TestChainState& chainstate = *(TestChainState*)&g_setup->m_node.chainman->ActiveChainstate(); TestChainState& chainstate = *static_cast<TestChainState*>(&g_setup->m_node.chainman->ActiveChainstate());
SetMockTime(1610000000); // any time to successfully reset ibd SetMockTime(1610000000); // any time to successfully reset ibd
chainstate.ResetIbd(); chainstate.ResetIbd();

4
src/test/fuzz/process_messages.cpp
View file

@ -35,8 +35,8 @@ FUZZ_TARGET_INIT(process_messages, initialize_process_messages)
{ {
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size()); FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
ConnmanTestMsg& connman = *(ConnmanTestMsg*)g_setup->m_node.connman.get(); ConnmanTestMsg& connman = *static_cast<ConnmanTestMsg*>(g_setup->m_node.connman.get());
TestChainState& chainstate = *(TestChainState*)&g_setup->m_node.chainman->ActiveChainstate(); TestChainState& chainstate = *static_cast<TestChainState*>(&g_setup->m_node.chainman->ActiveChainstate());
SetMockTime(1610000000); // any time to successfully reset ibd SetMockTime(1610000000); // any time to successfully reset ibd
chainstate.ResetIbd(); chainstate.ResetIbd();

21
src/test/fuzz/tx_pool.cpp
View file

@ -16,7 +16,8 @@
namespace { namespace {
const TestingSetup* g_setup; 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 { struct MockedTxPool : public CTxMemPool {
void RollingFeeUpdate() void RollingFeeUpdate()
@ -34,7 +35,10 @@ void initialize_tx_pool()
for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) { for (int i = 0; i < 2 * COINBASE_MATURITY; ++i) {
CTxIn in = MineBlock(g_setup->m_node, P2WSH_OP_TRUE); CTxIn in = MineBlock(g_setup->m_node, P2WSH_OP_TRUE);
// Remember the txids to avoid expensive disk acess later on // 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(); SyncWithValidationInterfaceQueue();
} }
@ -86,9 +90,8 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool)
std::set<COutPoint> outpoints_rbf; std::set<COutPoint> outpoints_rbf;
// All outpoints counting toward the total supply (subset of outpoints_rbf) // All outpoints counting toward the total supply (subset of outpoints_rbf)
std::set<COutPoint> outpoints_supply; 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); Assert(outpoints_supply.insert(outpoint).second);
if (outpoints_supply.size() >= COINBASE_MATURITY) break;
} }
outpoints_rbf = outpoints_supply; outpoints_rbf = outpoints_supply;
@ -96,14 +99,13 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool)
constexpr CAmount SUPPLY_TOTAL{COINBASE_MATURITY * 50 * COIN}; constexpr CAmount SUPPLY_TOTAL{COINBASE_MATURITY * 50 * COIN};
CTxMemPool tx_pool_{/* estimator */ nullptr, /* check_ratio */ 1}; CTxMemPool tx_pool_{/* estimator */ nullptr, /* check_ratio */ 1};
MockedTxPool& tx_pool = *(MockedTxPool*)&tx_pool_; MockedTxPool& tx_pool = *static_cast<MockedTxPool*>(&tx_pool_);
// Helper to query an amount // Helper to query an amount
const CCoinsViewMemPool amount_view{WITH_LOCK(::cs_main, return &chainstate.CoinsTip()), tx_pool}; const CCoinsViewMemPool amount_view{WITH_LOCK(::cs_main, return &chainstate.CoinsTip()), tx_pool};
const auto GetAmount = [&](const COutPoint& outpoint) { const auto GetAmount = [&](const COutPoint& outpoint) {
Coin c; Coin c;
amount_view.GetCoin(outpoint, c); Assert(amount_view.GetCoin(outpoint, c));
Assert(!c.IsSpent());
return c.out.nValue; return c.out.nValue;
}; };
@ -254,13 +256,12 @@ FUZZ_TARGET_INIT(tx_pool, initialize_tx_pool)
const auto& node = g_setup->m_node; const auto& node = g_setup->m_node;
std::vector<uint256> txids; 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); txids.push_back(outpoint.hash);
if (txids.size() >= COINBASE_MATURITY) break;
} }
for (int i{0}; i <= 3; ++i) { for (int i{0}; i <= 3; ++i) {
// Add some immature and non-existent outpoints // 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)); txids.push_back(ConsumeUInt256(fuzzed_data_provider));
} }