refactor: remove CKey overload for Create{,AndProcess}Block()

Author: kwvg

src/test/block_reward_reallocation_tests.cpp

@@ -149,7 +149,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
     auto& dmnman = *Assert(m_node.dmnman);
     const auto& consensus_params = Params().GetConsensus();
 
-    CScript coinbasePubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+    CScript coinbasePubKey = GetScriptForRawPubKey(coinbaseKey.GetPubKey());
 
     BOOST_REQUIRE(DeploymentDIP0003Enforced(WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Height()),
                                             consensus_params));
@@ -160,7 +160,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
     auto utxos = BuildSimpleUtxoMap(m_coinbase_txns);
     auto tx = CreateProRegTx(m_node.chainman->ActiveChain(), *m_node.mempool, utxos, 1, GenerateRandomAddress(), coinbaseKey, ownerKey, operatorKey);
 
-    CreateAndProcessBlock({tx}, coinbaseKey);
+    CreateAndProcessBlock({tx}, coinbasePubKey);
 
     {
         LOCK(cs_main);
@@ -173,7 +173,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
         BOOST_CHECK(tip->nHeight < Params().GetConsensus().BRRHeight);
     }
 
-    CreateAndProcessBlock({}, coinbaseKey);
+    CreateAndProcessBlock({}, coinbasePubKey);
 
     {
         LOCK(cs_main);
@@ -186,12 +186,12 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
         const auto pblocktemplate = BlockAssembler(m_node.chainman->ActiveChainstate(), m_node, m_node.mempool.get(), Params()).CreateNewBlock(coinbasePubKey);
     }
     for ([[maybe_unused]] auto _ : irange::range(499)) {
-        CreateAndProcessBlock({}, coinbaseKey);
+        CreateAndProcessBlock({}, coinbasePubKey);
         LOCK(cs_main);
         dmnman.UpdatedBlockTip(m_node.chainman->ActiveChain().Tip());
     }
     BOOST_CHECK(m_node.chainman->ActiveChain().Height() < Params().GetConsensus().BRRHeight);
-    CreateAndProcessBlock({}, coinbaseKey);
+    CreateAndProcessBlock({}, coinbasePubKey);
 
     {
         // Advance to ACTIVE at height = (BRRHeight - 1)
@@ -218,7 +218,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
     }
 
     for ([[maybe_unused]] auto _ : irange::range(consensus_params.nSuperblockCycle - 1)) {
-        CreateAndProcessBlock({}, coinbaseKey);
+        CreateAndProcessBlock({}, coinbasePubKey);
     }
 
     {
@@ -237,7 +237,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
     for ([[maybe_unused]] auto i : irange::range(19)) {
         for ([[maybe_unused]] auto j : irange::range(3)) {
             for ([[maybe_unused]] auto k : irange::range(consensus_params.nSuperblockCycle)) {
-                CreateAndProcessBlock({}, coinbaseKey);
+                CreateAndProcessBlock({}, coinbasePubKey);
             }
             LOCK(cs_main);
             const CBlockIndex* const tip{m_node.chainman->ActiveChain().Tip()};
@@ -274,7 +274,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
     // check 10 next superblocks
     for ([[maybe_unused]] auto i : irange::range(10)) {
         for ([[maybe_unused]] auto k : irange::range(consensus_params.nSuperblockCycle)) {
-            CreateAndProcessBlock({}, coinbaseKey);
+            CreateAndProcessBlock({}, coinbasePubKey);
         }
         LOCK(cs_main);
         const CBlockIndex* const tip{m_node.chainman->ActiveChain().Tip()};

src/test/dynamic_activation_thresholds_tests.cpp

@@ -35,16 +35,17 @@ struct TestChainDATSetup : public TestChainSetup
     void signal(int num_blocks, bool expected_lockin)
     {
         const auto& consensus_params = Params().GetConsensus();
+        CScript coinbasePubKey = GetScriptForRawPubKey(coinbaseKey.GetPubKey());
         // Mine non-signalling blocks
         gArgs.ForceSetArg("-blockversion", "536870912");
         for (int i = 0; i < window - num_blocks; ++i) {
-            CreateAndProcessBlock({}, coinbaseKey);
+            CreateAndProcessBlock({}, coinbasePubKey);
         }
         gArgs.ForceRemoveArg("blockversion");
         if (num_blocks > 0) {
             // Mine signalling blocks
             for (int i = 0; i < num_blocks; ++i) {
-                CreateAndProcessBlock({}, coinbaseKey);
+                CreateAndProcessBlock({}, coinbasePubKey);
             }
         }
         LOCK(cs_main);
@@ -58,15 +59,15 @@ struct TestChainDATSetup : public TestChainSetup
     void test(int activation_index, bool check_activation_at_min)
     {
         const auto& consensus_params = Params().GetConsensus();
-        CScript coinbasePubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+        CScript coinbasePubKey = GetScriptForRawPubKey(coinbaseKey.GetPubKey());
 
         {
             LOCK(cs_main);
             BOOST_CHECK_EQUAL(m_node.chainman->ActiveChain().Height(), window - 2);
             BOOST_CHECK_EQUAL(g_versionbitscache.State(m_node.chainman->ActiveChain().Tip(), consensus_params, deployment_id), ThresholdState::DEFINED);
         }
 
-        CreateAndProcessBlock({}, coinbaseKey);
+        CreateAndProcessBlock({}, coinbasePubKey);
 
         {
             LOCK(cs_main);
@@ -105,7 +106,7 @@ struct TestChainDATSetup : public TestChainSetup
         // activate
         signal(threshold(activation_index), true);
         for (int i = 0; i < window; ++i) {
-            CreateAndProcessBlock({}, coinbaseKey);
+            CreateAndProcessBlock({}, coinbasePubKey);
         }
         {
             LOCK(cs_main);

src/test/evo_assetlocks_tests.cpp

@@ -45,9 +45,9 @@ SetupDummyInputs(FillableSigningProvider& keystoreRet, CCoinsViewCache& coinsRet
     // Create some dummy input transactions
     dummyTransactions[0].vout.resize(2);
     dummyTransactions[0].vout[0].nValue = 11*CENT;
-    dummyTransactions[0].vout[0].scriptPubKey << ToByteVector(key[0].GetPubKey()) << OP_CHECKSIG;
+    dummyTransactions[0].vout[0].scriptPubKey = GetScriptForRawPubKey(key[0].GetPubKey());
     dummyTransactions[0].vout[1].nValue = 50*CENT;
-    dummyTransactions[0].vout[1].scriptPubKey << ToByteVector(key[1].GetPubKey()) << OP_CHECKSIG;
+    dummyTransactions[0].vout[1].scriptPubKey = GetScriptForRawPubKey(key[1].GetPubKey());
     AddCoins(coinsRet, CTransaction(dummyTransactions[0]), 0);
 
     dummyTransactions[1].vout.resize(2);