refactor: Deduplicate connectblock benchmark

Author: fjahr

src/bench/check_connectblock.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2022 The Bitcoin Core developers
+// Copyright (c) 2025 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -58,50 +58,9 @@ CBlock CreateTestBlock(TestChain100Setup* test_setup, std::vector<CKey>& keys, s
     return test_setup->CreateBlock(txs, coinbase_spk, chainstate);
 }
 
-static void ConnectBlockAllSchnorr(benchmark::Bench& bench)
-{
-    const auto test_setup{MakeNoLogFileContext<TestChain100Setup>()};
-
-    size_t num_keys{4};
-    std::vector<CKey> keys{test_setup->coinbaseKey};
-    keys.reserve(num_keys + 1);
-
-    std::vector<CScript> taproot_spks;
-    taproot_spks.reserve(num_keys);
-
-    for (size_t i{0}; i < num_keys; i++) {
-        const CKey key{GenerateRandomKey()};
-        keys.push_back(key);
-        const CScript scriptpubkey{GetScriptForDestination(WitnessV1Taproot{XOnlyPubKey(key.GetPubKey())})};
-        taproot_spks.push_back(scriptpubkey);
-    }
-
-    const auto test_block{CreateTestBlock(test_setup.get(), keys, taproot_spks)};
-    auto pindex{std::make_unique<CBlockIndex>(test_block)};
-    auto test_blockhash{std::make_unique<uint256>(test_block.GetHash())};
-
-    Chainstate& chainstate{test_setup->m_node.chainman->ActiveChainstate()};
-
-    pindex->nHeight = chainstate.m_chain.Height() + 1;
-    pindex->phashBlock = test_blockhash.get();
-    pindex->pprev = chainstate.m_chain.Tip();
-
-    BlockValidationState test_block_state;
-    bench.unit("block").run([&] {
-        LOCK(cs_main);
-        CCoinsViewCache viewNew{&chainstate.CoinsTip()};
-        assert(chainstate.ConnectBlock(test_block, test_block_state, pindex.get(), viewNew, false));
-    });
-}
-
-static void ConnectBlockMixed(benchmark::Bench& bench)
+std::pair<std::vector<CKey>, std::vector<CScript>> CreateKeysAndScripts(const CKey& coinbaseKey, size_t num_taproot, size_t num_nontaproot, bool use_schnorr)
 {
-    const auto test_setup{MakeNoLogFileContext<TestChain100Setup>()};
-
-    size_t num_taproot{2};
-    size_t num_nontaproot{2};
-
-    std::vector<CKey> keys{test_setup->coinbaseKey};
+    std::vector<CKey> keys{coinbaseKey};
     keys.reserve(num_taproot + num_nontaproot + 1);
 
     std::vector<CScript> spks;
@@ -114,16 +73,23 @@ static void ConnectBlockMixed(benchmark::Bench& bench)
         spks.push_back(scriptpubkey);
     }
 
-    for (size_t i{0}; i < num_taproot; i++) {
-        const CKey key{GenerateRandomKey()};
-        keys.push_back(key);
-        const CScript scriptpubkey{GetScriptForDestination(WitnessV1Taproot{XOnlyPubKey(key.GetPubKey())})};
-        spks.push_back(scriptpubkey);
+    if (use_schnorr) {
+        for (size_t i{0}; i < num_taproot; i++) {
+            CKey key{GenerateRandomKey()};
+            keys.push_back(key);
+            const CScript scriptpubkey{GetScriptForDestination(WitnessV1Taproot{XOnlyPubKey(key.GetPubKey())})};
+            spks.push_back(scriptpubkey);
+        }
     }
 
-    const auto test_block{CreateTestBlock(test_setup.get(), keys, spks)};
-    auto pindex{std::make_unique<CBlockIndex>(test_block)};
-    auto test_blockhash{std::make_unique<uint256>(test_block.GetHash())};
+    return {keys, spks};
+}
+
+void BenchmarkConnectBlock(benchmark::Bench& bench, std::vector<CKey>& keys, std::vector<CScript>& spks, TestChain100Setup* test_setup)
+{
+    const auto test_block = CreateTestBlock(test_setup, keys, spks);
+    auto pindex = std::make_unique<CBlockIndex>(test_block);
+    auto test_blockhash = std::make_unique<uint256>(test_block.GetHash());
 
     Chainstate& chainstate{test_setup->m_node.chainman->ActiveChainstate()};
 
@@ -139,40 +105,25 @@ static void ConnectBlockMixed(benchmark::Bench& bench)
     });
 }
 
-static void ConnectBlockNoSchnorr(benchmark::Bench& bench)
+static void ConnectBlockAllSchnorr(benchmark::Bench& bench)
 {
-    const auto test_setup{MakeNoLogFileContext<TestChain100Setup>()};
-
-    size_t num_keys{4};
-    std::vector<CKey> keys{test_setup->coinbaseKey};
-    keys.reserve(num_keys + 1);
-
-    std::vector<CScript> spks;
-    spks.reserve(num_keys);
-
-    for (size_t i{0}; i < num_keys; i++) {
-        const CKey key{GenerateRandomKey()};
-        keys.push_back(key);
-        const CScript scriptpubkey{GetScriptForDestination(WitnessV0KeyHash{key.GetPubKey()})};
-        spks.push_back(scriptpubkey);
-    }
-
-    const auto test_block{CreateTestBlock(test_setup.get(), keys, spks)};
-    auto pindex{std::make_unique<CBlockIndex>(test_block)};
-    auto test_blockhash{std::make_unique<uint256>(test_block.GetHash())};
-
-    Chainstate& chainstate{test_setup->m_node.chainman->ActiveChainstate()};
+    const auto test_setup = MakeNoLogFileContext<TestChain100Setup>();
+    auto [keys, spks] = CreateKeysAndScripts(test_setup->coinbaseKey, 4, 0, true);
+    BenchmarkConnectBlock(bench, keys, spks, test_setup.get());
+}
 
-    pindex->nHeight = chainstate.m_chain.Height() + 1;
-    pindex->phashBlock = test_blockhash.get();
-    pindex->pprev = chainstate.m_chain.Tip();
+static void ConnectBlockMixed(benchmark::Bench& bench)
+{
+    const auto test_setup = MakeNoLogFileContext<TestChain100Setup>();
+    auto [keys, spks] = CreateKeysAndScripts(test_setup->coinbaseKey, 2, 2, true);
+    BenchmarkConnectBlock(bench, keys, spks, test_setup.get());
+}
 
-    BlockValidationState test_block_state;
-    bench.unit("block").run([&] {
-        LOCK(cs_main);
-        CCoinsViewCache viewNew{&chainstate.CoinsTip()};
-        assert(chainstate.ConnectBlock(test_block, test_block_state, pindex.get(), viewNew, false));
-    });
+static void ConnectBlockNoSchnorr(benchmark::Bench& bench)
+{
+    const auto test_setup = MakeNoLogFileContext<TestChain100Setup>();
+    auto [keys, spks] = CreateKeysAndScripts(test_setup->coinbaseKey, 0, 4, false);
+    BenchmarkConnectBlock(bench, keys, spks, test_setup.get());
 }
 
 BENCHMARK(ConnectBlockAllSchnorr, benchmark::PriorityLevel::HIGH);