Merge fd8ab08558 into merged_master (Bitcoin PR bitcoin/bitcoin#28557)

This commit is contained in:
Byron Hambly 2025-08-05 15:26:50 +02:00
commit f59251f87b
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697

View file

@ -98,7 +98,7 @@ static void AddAndRemoveDisconnectedBlockTransactionsAll(benchmark::Bench& bench
const auto chains{CreateBlocks(/*num_not_shared=*/1)};
assert(chains.num_shared == BLOCK_VTX_COUNT - 1);
bench.minEpochIterations(10).run([&]() NO_THREAD_SAFETY_ANALYSIS {
bench.minEpochIterations(10).run([&]() {
Reorg(chains);
});
}
@ -109,7 +109,7 @@ static void AddAndRemoveDisconnectedBlockTransactions90(benchmark::Bench& bench)
const auto chains{CreateBlocks(/*num_not_shared=*/BLOCK_VTX_COUNT_10PERCENT)};
assert(chains.num_shared == BLOCK_VTX_COUNT - BLOCK_VTX_COUNT_10PERCENT);
bench.minEpochIterations(10).run([&]() NO_THREAD_SAFETY_ANALYSIS {
bench.minEpochIterations(10).run([&]() {
Reorg(chains);
});
}
@ -120,7 +120,7 @@ static void AddAndRemoveDisconnectedBlockTransactions10(benchmark::Bench& bench)
const auto chains{CreateBlocks(/*num_not_shared=*/BLOCK_VTX_COUNT - BLOCK_VTX_COUNT_10PERCENT)};
assert(chains.num_shared == BLOCK_VTX_COUNT_10PERCENT);
bench.minEpochIterations(10).run([&]() NO_THREAD_SAFETY_ANALYSIS {
bench.minEpochIterations(10).run([&]() {
Reorg(chains);
});
}