refactor: testBlockValidity make out argument last

Tdhun · Jun 26, 2024 · 75ce763 · 75ce763
1 parent 83a9bef
commit 75ce763
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/interfaces/mining.h b/src/interfaces/mining.h
@@ -45,6 +45,7 @@ class Mining
      * @returns a block template
      */
     virtual std::unique_ptr<node::CBlockTemplate> createNewBlock(const CScript& script_pub_key, bool use_mempool = true) = 0;
+
     /**
      * Processes new block. A valid new block is automatically relayed to peers.
      *
@@ -63,12 +64,12 @@ class Mining
      * Only works on top of our current best block.
      * Does not check proof-of-work.
      *
-     * @param[out] state details of why a block failed to validate
      * @param[in] block the block to validate
      * @param[in] check_merkle_root call CheckMerkleRoot()
+     * @param[out] state details of why a block failed to validate
      * @returns false if any of the checks fail
      */
-    virtual bool testBlockValidity(BlockValidationState& state, const CBlock& block, bool check_merkle_root = true) = 0;
+    virtual bool testBlockValidity(const CBlock& block, bool check_merkle_root, BlockValidationState& state) = 0;
 
     //! Get internal node context. Useful for RPC and testing,
     //! but not accessible across processes.

diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
@@ -870,7 +870,7 @@ class MinerImpl : public Mining
         return context()->mempool->GetTransactionsUpdated();
     }
 
-    bool testBlockValidity(BlockValidationState& state, const CBlock& block, bool check_merkle_root) override
+    bool testBlockValidity(const CBlock& block, bool check_merkle_root, BlockValidationState& state) override
     {
         LOCK(::cs_main);
         return TestBlockValidity(state, chainman().GetParams(), chainman().ActiveChainstate(), block, chainman().ActiveChain().Tip(), /*fCheckPOW=*/false, check_merkle_root);

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -390,7 +390,7 @@ static RPCHelpMan generateblock()
         LOCK(cs_main);
 
         BlockValidationState state;
-        if (!miner.testBlockValidity(state, block, /*check_merkle_root=*/false)) {
+        if (!miner.testBlockValidity(block, /*check_merkle_root=*/false, state)) {
             throw JSONRPCError(RPC_VERIFY_ERROR, strprintf("testBlockValidity failed: %s", state.ToString()));
         }
     }
@@ -713,7 +713,7 @@ static RPCHelpMan getblocktemplate()
                 return "inconclusive-not-best-prevblk";
             }
             BlockValidationState state;
-            miner.testBlockValidity(state, block);
+            miner.testBlockValidity(block, /*check_merkle_root=*/true, state);
             return BIP22ValidationResult(state);
         }