[Refactor] Remove arith_uint256::GetCheapHash() and fix uint256 implem.

PIVX-Project · May 5, 2021 · 7bbbae3 · 7bbbae3
1 parent fa08530
commit 7bbbae3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/arith_uint256.h b/src/arith_uint256.h
@@ -291,15 +291,11 @@ class base_uint
         s.read((char*)pn, sizeof(pn));
     }
 
-    // Temporary for migration to blob160/256
-    uint64_t GetCheapHash() const
-    {
-        return GetLow64();
-    }
     void SetNull()
     {
         memset(pn, 0, sizeof(pn));
     }
+
     bool IsNull() const
     {
         for (int i = 0; i < WIDTH; i++)

diff --git a/src/coincontrol.h b/src/coincontrol.h
@@ -98,7 +98,7 @@ class CCoinControl
 
     struct SimpleOutpointHash {
         size_t operator() (const OutPointWrapper& obj) const {
-            return (UintToArith256(obj.outPoint.hash) + obj.outPoint.n).GetCheapHash();
+            return (UintToArith256(obj.outPoint.hash) + obj.outPoint.n).GetLow64();
         }
     };
 

diff --git a/src/uint256.h b/src/uint256.h
@@ -8,6 +8,8 @@
 #ifndef PIVX_UINT256_H
 #define PIVX_UINT256_H
 
+#include "crypto/common.h"
+
 #include <assert.h>
 #include <cstring>
 #include <stdexcept>
@@ -143,12 +145,7 @@ class uint256 : public base_blob<256> {
      * provide values to trigger worst-case behavior.
      * @note The result of this function is not stable between little and big endian.
      */
-    uint64_t GetCheapHash() const
-    {
-        uint64_t result;
-        memcpy((void*)&result, (void*)m_data, 8);
-        return result;
-    }
+    uint64_t GetCheapHash() const { return ReadLE64(begin()); }
 
 };