Remove transaction equality in favor of explicit hash equality checks.

Author: nuttycom

src/gtest/test_checktransaction.cpp

@@ -668,7 +668,7 @@ TEST(ChecktransactionTests, OverwinterConstructors) {
     EXPECT_EQ(tx2.fOverwintered, mtx.fOverwintered);
     EXPECT_EQ(tx2.nVersionGroupId, mtx.nVersionGroupId);
     EXPECT_EQ(tx2.nExpiryHeight, mtx.nExpiryHeight);
-    EXPECT_TRUE(tx2 == tx);
+    EXPECT_TRUE(tx2.GetHash() == tx.GetHash());
 }
 
 TEST(ChecktransactionTests, OverwinterSerialization) {

src/primitives/transaction.h

@@ -981,16 +981,6 @@ class CTransaction
         return (vin.size() == 1 && vin[0].prevout.IsNull());
     }
 
-    friend bool operator==(const CTransaction& a, const CTransaction& b)
-    {
-        return a.wtxid.hash == b.wtxid.hash;
-    }
-
-    friend bool operator!=(const CTransaction& a, const CTransaction& b)
-    {
-        return a.wtxid.hash != b.wtxid.hash;
-    }
-
     std::string ToString() const;
 };
 

src/test/serialize_tests.cpp

@@ -65,7 +65,7 @@ class CSerializeMethodsTestSingle
                 boolval == rhs.boolval && \
                 stringval == rhs.stringval && \
                 strcmp(charstrval, rhs.charstrval) == 0 && \
-                txval == rhs.txval;
+                txval.GetHash() == rhs.txval.GetHash();
     }
 };
 
@@ -300,8 +300,8 @@ static bool isCanonicalException(const std::ios_base::failure& ex)
 
     // The string returned by what() can be different for different platforms.
     // Instead of directly comparing the ex.what() with an expected string,
-    // create an instance of exception to see if ex.what() matches 
-    // the expected explanatory string returned by the exception instance. 
+    // create an instance of exception to see if ex.what() matches
+    // the expected explanatory string returned by the exception instance.
     return strcmp(expectedException.what(), ex.what()) == 0;
 }
 

src/txmempool.cpp

@@ -416,7 +416,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
         std::map<COutPoint, CInPoint>::iterator it = mapNextTx.find(txin.prevout);
         if (it != mapNextTx.end()) {
             const CTransaction &txConflict = *it->second.ptx;
-            if (txConflict != tx)
+            if (txConflict.GetHash() != tx.GetHash())
             {
                 remove(txConflict, removed, true);
             }
@@ -428,7 +428,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
             std::map<uint256, const CTransaction*>::iterator it = mapSproutNullifiers.find(nf);
             if (it != mapSproutNullifiers.end()) {
                 const CTransaction &txConflict = *it->second;
-                if (txConflict != tx) {
+                if (txConflict.GetHash() != tx.GetHash()) {
                     remove(txConflict, removed, true);
                 }
             }
@@ -438,7 +438,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
         std::map<uint256, const CTransaction*>::iterator it = mapSaplingNullifiers.find(spendDescription.nullifier);
         if (it != mapSaplingNullifiers.end()) {
             const CTransaction &txConflict = *it->second;
-            if (txConflict != tx) {
+            if (txConflict.GetHash() != tx.GetHash()) {
                 remove(txConflict, removed, true);
             }
         }
@@ -447,7 +447,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
         std::map<uint256, const CTransaction*>::iterator it = mapOrchardNullifiers.find(orchardNullifier);
         if (it != mapOrchardNullifiers.end()) {
             const CTransaction &txConflict = *it->second;
-            if (txConflict != tx) {
+            if (txConflict.GetHash() != tx.GetHash()) {
                 remove(txConflict, removed, true);
             }
         }

src/wallet/wallet.cpp

@@ -6482,7 +6482,7 @@ void CMerkleTx::SetMerkleBranch(const CBlock& block)
 
     // Locate the transaction
     for (nIndex = 0; nIndex < (int)block.vtx.size(); nIndex++)
-        if (block.vtx[nIndex] == *(CTransaction*)this)
+        if (block.vtx[nIndex].GetHash() == this->GetHash())
             break;
     if (nIndex == (int)block.vtx.size())
     {