Make CheckMerkleBranch private in CAuxPow.

domob1812 · domob1812 · commit 52dba35d97a4 · 2018-06-25T19:58:11.000+02:00
CheckMerkleBranch is a utility method that was previously removed in
upstream Bitcoin, but is still needed for auxpow's.  For that reason,
it was moved to be a static function in CAuxPow.  It can, however, be
private to explicitly enforce that it is only used there.
diff --git a/src/auxpow.h b/src/auxpow.h
@@ -130,6 +130,14 @@ class CAuxPow
   /** Parent block header (on which the real PoW is done).  */
   CPureBlockHeader parentBlock;
 
+  /**
+   * Check a merkle branch.  This used to be in CBlock, but was removed
+   * upstream.  Thus include it here now.
+   */
+  static uint256 CheckMerkleBranch (uint256 hash,
+                                    const std::vector<uint256>& vMerkleBranch,
+                                    int nIndex);
+
   friend UniValue AuxpowToJSON(const CAuxPow& auxpow);
   friend class auxpow_tests::CAuxPowForTest;
 
@@ -185,14 +193,6 @@ class CAuxPow
    */
   static int getExpectedIndex (uint32_t nNonce, int nChainId, unsigned h);
 
-  /**
-   * Check a merkle branch.  This used to be in CBlock, but was removed
-   * upstream.  Thus include it here now.
-   */
-  static uint256 CheckMerkleBranch (uint256 hash,
-                                    const std::vector<uint256>& vMerkleBranch,
-                                    int nIndex);
-
   /**
    * Constructs a minimal CAuxPow object for the given block header and
    * returns it.  The caller should make sure to set the auxpow flag on the
diff --git a/src/test/auxpow_tests.cpp b/src/test/auxpow_tests.cpp
@@ -60,6 +60,8 @@ class CAuxPowForTest : public CAuxPow
   using CAuxPow::nChainIndex;
   using CAuxPow::parentBlock;
 
+  using CAuxPow::CheckMerkleBranch;
+
 };
 
 /**
@@ -178,7 +180,8 @@ CAuxpowBuilder::buildAuxpowChain (const uint256& hashAux, unsigned h, int index)
     auxpowChainMerkleBranch.push_back (ArithToUint256 (arith_uint256 (i)));
 
   const uint256 hash
-    = CAuxPow::CheckMerkleBranch (hashAux, auxpowChainMerkleBranch, index);
+    = CAuxPowForTest::CheckMerkleBranch (hashAux, auxpowChainMerkleBranch,
+                                         index);
 
   valtype res = ToByteVector (hash);
   std::reverse (res.begin (), res.end ());
