Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30980: fuzz: fix bug in p2p_headers_presync har…
Browse files Browse the repository at this point in the history
…ness

a7498cc Fix bug in p2p_headers_presync harness (marcofleon)

Pull request description:

  The calculation for the test chain's work (`total_work`) should be outside of the loop. Previously, `total_work` was being miscalculated due to multiple additions of work from the same headers. Now, each header's work is only counted once, providing an accurate total.

  bitcoin/bitcoin#30918 followup

ACKs for top commit:
  dergoegge:
    utACK a7498cc
  instagibbs:
    ACK a7498cc
  glozow:
    makes sense, utACK a7498cc
  mzumsande:
    ACK bitcoin/bitcoin@a7498cc

Tree-SHA512: b95f25dcf7ace220e30f1d72f50d85ee18777467927c0cc1ed8582b390cb7185ffc0e2f127309eb083044fb41f5a13fce5ebb15b7952718a899bafff26921be8
  • Loading branch information
glozow committed Oct 3, 2024
2 parents dda2613 + a7498cc commit cfb59da
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/test/fuzz/p2p_headers_presync.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,15 @@ FUZZ_TARGET(p2p_headers_presync, .init = initialize)
auto headers_msg = NetMsg::Make(NetMsgType::BLOCK, TX_WITH_WITNESS(block));
g_testing_setup->SendMessage(fuzzed_data_provider, std::move(headers_msg));
});
}

// This is a conservative overestimate, as base is only moved forward when sending headers. In theory,
// the longest chain generated by this test is 1600 (FUZZ_MAX_HEADERS_RESULTS * 100) headers. In that case,
// this variable will accurately reflect the chain's total work.
total_work += CalculateClaimedHeadersWork(all_headers);
// This is a conservative overestimate, as base is only moved forward when sending headers. In theory,
// the longest chain generated by this test is 1600 (FUZZ_MAX_HEADERS_RESULTS * 100) headers. In that case,
// this variable will accurately reflect the chain's total work.
total_work += CalculateClaimedHeadersWork(all_headers);

// This test should never create a chain with more work than MinimumChainWork.
assert(total_work < chainman.MinimumChainWork());
}
// This test should never create a chain with more work than MinimumChainWork.
assert(total_work < chainman.MinimumChainWork());

// The headers/blocks sent in this test should never be stored, as the chains don't have the work required
// to meet the anti-DoS work threshold. So, if at any point the block index grew in size, then there's a bug
Expand Down

0 comments on commit cfb59da

Please sign in to comment.