suggestions

dashpay · Jan 29, 2024 · 2c150c6 · knst · Jan 29, 2024 · 2c150c6
1 parent c597fb4
commit 2c150c6
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -489,15 +489,14 @@ static UniValue getassetunlockstatuses(const JSONRPCRequest& request)
     }
 
     const auto pBlockIndexBestCL = [&]() -> const CBlockIndex* {
-        if (llmq_ctx.clhandler->GetBestChainLock().IsNull()) {
-            // If no CL info is available, try to use CbTx CL information
-            if (const auto cbtx_best_cl = GetNonNullCoinbaseChainlock(pTipBlockIndex)) {
-                return pTipBlockIndex->GetAncestor(pTipBlockIndex->nHeight - cbtx_best_cl->second - 1);
-            }
-        }
-        else {
+        if (!llmq_ctx.clhandler->GetBestChainLock().IsNull()) {
             return pTipBlockIndex->GetAncestor(llmq_ctx.clhandler->GetBestChainLock().getHeight());
         }
+        // If no CL info is available, try to use CbTx CL information
+        if (const auto cbtx_best_cl = GetNonNullCoinbaseChainlock(pTipBlockIndex)) {
+            return pTipBlockIndex->GetAncestor(pTipBlockIndex->nHeight - cbtx_best_cl->second - 1);
+        }
+        // no CL info, no CbTx CL
         return nullptr;
     }();