Slightly refactor ProcessInstantSendLock (#2767)

Rewrite `if (var = func())` in a less confusing way
dashpay · Mar 13, 2019 · 6350adf · 6350adf
1 parent 3a1aeb0
commit 6350adf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/llmq/quorums_instantsend.cpp b/src/llmq/quorums_instantsend.cpp
@@ -659,12 +659,14 @@ void CInstantSendManager::ProcessInstantSendLock(NodeId from, const uint256& has
         if (db.GetInstantSendLockByHash(hash)) {
             return;
         }
-        if (otherIsLock = db.GetInstantSendLockByTxid(islock.txid)) {
+        otherIsLock = db.GetInstantSendLockByTxid(islock.txid);
+        if (otherIsLock != nullptr) {
             LogPrint("instantsend", "CInstantSendManager::%s -- txid=%s, islock=%s: duplicate islock, other islock=%s, peer=%d\n", __func__,
                      islock.txid.ToString(), hash.ToString(), ::SerializeHash(*otherIsLock).ToString(), from);
         }
         for (auto& in : islock.inputs) {
-            if (otherIsLock = db.GetInstantSendLockByInput(in)) {
+            otherIsLock = db.GetInstantSendLockByInput(in);
+            if (otherIsLock != nullptr) {
                 LogPrint("instantsend", "CInstantSendManager::%s -- txid=%s, islock=%s: conflicting input in islock. input=%s, other islock=%s, peer=%d\n", __func__,
                          islock.txid.ToString(), hash.ToString(), in.ToStringShort(), ::SerializeHash(*otherIsLock).ToString(), from);
             }