Fix

VeriBlock · Apr 20, 2020 · 36e8bc2 · 36e8bc2
1 parent 809f134
commit 36e8bc2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -180,14 +180,15 @@ TestChain100Setup::TestChain100Setup(): RegTestingSetup()
     assert(ChainActive().Tip()->nHeight == 100);
 }
 
-// Create a new block with just given transactions, coinbase paying to
-// scriptPubKey, and try to add it to the current chain.
-CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey) {
-    return this->CreateAndProcessBlock(txns, scriptPubKey, nullptr);
-}
+CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, uint256 prevBlock,
+                             const CScript& scriptPubKey, bool* isBlockValid) {
+    CBlockIndex* pPrev = nullptr;
+    {
+        LOCK(cs_main);
+        pPrev = LookupBlockIndex(prevBlock);
+        assert(pPrev && "CreateAndProcessBlock called with unknown prev block");
+    }
 
-CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey, bool* isBlockValid)
-{
     const CChainParams& chainparams = Params();
     std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
     CBlock& block = pblocktemplate->block;
@@ -200,7 +201,7 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa
     {
         LOCK(cs_main);
         unsigned int extraNonce = 0;
-        IncrementExtraNonce(&block, ::ChainActive().Tip(), extraNonce);
+        IncrementExtraNonce(&block, pPrev, extraNonce);
     }
 
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
@@ -216,6 +217,13 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa
     return result;
 }
 
+// Create a new block with just given transactions, coinbase paying to
+// scriptPubKey, and try to add it to the current chain.
+CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey, bool* isBlockValid)
+{
+    return CreateAndProcessBlock(txns, ChainActive().Tip()->GetBlockHash(), scriptPubKey, isBlockValid);
+}
+
 TestChain100Setup::~TestChain100Setup()
 {
     gArgs.ForceSetArg("-segwitheight", "0");

diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
@@ -110,10 +110,11 @@ struct TestChain100Setup : public RegTestingSetup {
     // Create a new block with just given transactions, coinbase paying to
     // scriptPubKey, and try to add it to the current chain.
     CBlock CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns,
-                                 const CScript& scriptPubKey);
+                                 const CScript& scriptPubKey, bool* isBlockValid = nullptr);
+
+    CBlock CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, uint256 prevBlock,
+                                 const CScript& scriptPubKey, bool* isBlockValid = nullptr);
 
-    CBlock CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns,
-                                 const CScript& scriptPubKey, bool* isBlockValid);
 
     ~TestChain100Setup();
 

diff --git a/src/vbk/test/unit/e2e_poptx.cpp b/src/vbk/test/unit/e2e_poptx.cpp
@@ -26,7 +26,13 @@ struct E2eFixture : public TestChain100Setup {
         pop = &VeriBlock::getService<VeriBlock::PopService>();
     }
 
+
     CBlock endorseAltBlock(uint256 hash, size_t generateVtbs = 0)
+    {
+        return endorseAltBlock(hash, ChainActive().Tip()->GetBlockHash(), generateVtbs);
+    }
+
+    CBlock endorseAltBlock(uint256 hash, uint256 prevBlock, size_t generateVtbs = 0)
     {
         CBlockIndex* endorsed = nullptr;
         {
@@ -55,7 +61,7 @@ struct E2eFixture : public TestChain100Setup {
 
         auto tx = VeriBlock::MakePopTx(sig);
         bool isValid = false;
-        return CreateAndProcessBlock({tx}, cbKey, &isValid);
+        return CreateAndProcessBlock({tx}, prevBlock, cbKey, &isValid);
     }
 
     VTB endorseVbkTip()
@@ -130,7 +136,7 @@ struct E2eFixture : public TestChain100Setup {
 
 BOOST_AUTO_TEST_SUITE(e2e_poptx_tests)
 
-BOOST_FIXTURE_TEST_CASE(BlockWith10ValidPopTxes, E2eFixture)
+BOOST_FIXTURE_TEST_CASE(ValidBlockIsAccepted, E2eFixture)
 {
     // altintegration and popminer configured to use BTC/VBK/ALT regtest.
     auto tip = ChainActive().Tip();
@@ -157,9 +163,11 @@ BOOST_FIXTURE_TEST_CASE(BlockWith10ValidPopTxes, E2eFixture)
         BOOST_CHECK(vbk == popminer.vbk().getBestChain().tip()->getHash());
     }
 
+    // create block that is not on main chain
+    auto fork1tip = CreateAndProcessBlock({}, ChainActive().Tip()->pprev->pprev->GetBlockHash(), cbKey);
+
     // endorse block that is not on main chain
-    // TODO:
-    block = endorseAltBlock(uint256(), 1);
+    block = endorseAltBlock(fork1tip.GetHash(), 1);
     BOOST_CHECK(ChainActive().Tip()->GetBlockHash() == lastHash);
 }