Undo try_locks for miner

This commit is contained in:
Evan Duffield 2015-08-02 12:49:51 -07:00
parent 9a18014987
commit d1e6388ccc

View File

@ -129,14 +129,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
CAmount nFees = 0;
{
TRY_LOCK(cs_main, fLockMain);
if (!fLockMain) {
LogPrintf("CreateNewBlock : ERROR - failed to lock cs_main - disabled mining\n");
}
TRY_LOCK(mempool.cs, fLockMempool);
if (!fLockMempool) {
LogPrintf("CreateNewBlock : ERROR - failed to lock mempool.cs - disabled mining\n");
}
LOCK2(cs_main, mempool.cs);
CBlockIndex* pindexPrev = chainActive.Tip();
const int nHeight = pindexPrev->nHeight + 1;