Index: Return early from failed coinstatsindex init

1 files changed, 19 insertions, 21 deletions

diff --git a/src/index/coinstatsindex.cpp b/src/index/coinstatsindex.cpp
index 084e6b9925..b3f5d75fb3 100644
--- a/src/index/coinstatsindex.cpp
+++ b/src/index/coinstatsindex.cpp
@@ -344,33 +344,31 @@ bool CoinStatsIndex::Init()
         }
     }
 
-    if (BaseIndex::Init()) {
-        const CBlockIndex* pindex{CurrentIndex()};
+    if (!BaseIndex::Init()) return false;
 
-        if (pindex) {
-            DBVal entry;
-            if (!LookUpOne(*m_db, pindex, entry)) {
-                return false;
-            }
+    const CBlockIndex* pindex{CurrentIndex()};
 
-            m_transaction_output_count = entry.transaction_output_count;
-            m_bogo_size = entry.bogo_size;
-            m_total_amount = entry.total_amount;
-            m_total_subsidy = entry.total_subsidy;
-            m_total_unspendable_amount = entry.total_unspendable_amount;
-            m_total_prevout_spent_amount = entry.total_prevout_spent_amount;
-            m_total_new_outputs_ex_coinbase_amount = entry.total_new_outputs_ex_coinbase_amount;
-            m_total_coinbase_amount = entry.total_coinbase_amount;
-            m_total_unspendables_genesis_block = entry.total_unspendables_genesis_block;
-            m_total_unspendables_bip30 = entry.total_unspendables_bip30;
-            m_total_unspendables_scripts = entry.total_unspendables_scripts;
-            m_total_unspendables_unclaimed_rewards = entry.total_unspendables_unclaimed_rewards;
+    if (pindex) {
+        DBVal entry;
+        if (!LookUpOne(*m_db, pindex, entry)) {
+            return false;
         }
 
-        return true;
+        m_transaction_output_count = entry.transaction_output_count;
+        m_bogo_size = entry.bogo_size;
+        m_total_amount = entry.total_amount;
+        m_total_subsidy = entry.total_subsidy;
+        m_total_unspendable_amount = entry.total_unspendable_amount;
+        m_total_prevout_spent_amount = entry.total_prevout_spent_amount;
+        m_total_new_outputs_ex_coinbase_amount = entry.total_new_outputs_ex_coinbase_amount;
+        m_total_coinbase_amount = entry.total_coinbase_amount;
+        m_total_unspendables_genesis_block = entry.total_unspendables_genesis_block;
+        m_total_unspendables_bip30 = entry.total_unspendables_bip30;
+        m_total_unspendables_scripts = entry.total_unspendables_scripts;
+        m_total_unspendables_unclaimed_rewards = entry.total_unspendables_unclaimed_rewards;
     }
 
-    return false;
+    return true;
 }
 
 // Reverse a single block as part of a reorg