Fix CreateNewBlock_validity by not holding cs_main when calling creat…

…eAndProcessEmptyBlock
dashpay · Mar 12, 2019 · 72af215 · 72af215
1 parent 95192d5
commit 72af215
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -257,6 +257,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         createAndProcessEmptyBlock();
     }
 
+    {
     LOCK(cs_main);
 
     // Just to make sure we can still make simple blocks
@@ -507,9 +508,13 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     for (int i = 0; i < CBlockIndex::nMedianTimeSpan; i++)
         chainActive.Tip()->GetAncestor(chainActive.Tip()->nHeight - i)->nTime += 512; //Trick the MedianTimePast
 
+    } // unlock cs_main while calling createAndProcessEmptyBlock
+
     // Mine an empty block
     createAndProcessEmptyBlock();
 
+    LOCK(cs_main);
+
     SetMockTime(chainActive.Tip()->GetMedianTimePast() + 1);
 
     BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey));