Don't do mempool lookups for "mempool" command without a filter

Coming from btc@96918a2f0990a8207d7631b8de73af8ae5d24aeb
PIVX-Project · Jan 18, 2021 · 68bc68f · 68bc68f
1 parent 7624823
commit 68bc68f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1640,12 +1640,13 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         std::vector<CInv> vInv;
         for (uint256& hash : vtxid) {
             CInv inv(MSG_TX, hash);
-            CTransaction tx;
-            bool fInMemPool = mempool.lookup(hash, tx);
-            if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
-            if ((pfrom->pfilter && pfrom->pfilter->IsRelevantAndUpdate(tx)) ||
-                (!pfrom->pfilter))
-                vInv.push_back(inv);
+            if (pfrom->pfilter) {
+                CTransaction tx;
+                bool fInMemPool = mempool.lookup(hash, tx);
+                if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
+                if (!pfrom->pfilter->IsRelevantAndUpdate(tx)) continue;
+            }
+            vInv.emplace_back(inv);
             if (vInv.size() == MAX_INV_SZ) {
                 connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::INV, vInv));
                 vInv.clear();