Merge pull request #867 from Bushstar/move-redundant-lock

Move redundant lock to blockOnchainActive
qtumproject · Oct 13, 2020 · 34fd05c · 34fd05c
2 parents c2d59a3 + a20ab93
commit 34fd05c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -569,9 +569,6 @@ UniValue getblockhashes(const JSONRPCRequest& request)
 
     std::vector<std::pair<uint256, unsigned int> > blockHashes;
 
-    if (fActiveOnly)
-        LOCK(cs_main);
-
     if (!GetTimestampIndex(high, low, fActiveOnly, blockHashes)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available for block hashes");
     }

diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -653,6 +653,7 @@ bool CBlockTreeDB::UpdateSpentIndex(const std::vector<std::pair<CSpentIndexKey,
 }
 
 bool CBlockTreeDB::blockOnchainActive(const uint256 &hash) {
+    LOCK(cs_main);
     CBlockIndex* pblockindex = ::BlockIndex()[hash];
 
     if (!::ChainActive().Contains(pblockindex)) {