Feature/btc 200 (#16)

* change the endorsedBlock validation * fix
VeriBlock · Feb 3, 2020 · f58fc1f · f58fc1f
1 parent 594c36e
commit f58fc1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/vbk/pop_service/pop_service_impl.cpp b/src/vbk/pop_service/pop_service_impl.cpp
@@ -597,8 +597,8 @@ bool txPopValidation(PopServiceImpl& pop, const CTransactionRef& tx, const CBloc
 
         AssertLockHeld(cs_main);
         const CBlockIndex* popEndorsementIdnex = LookupBlockIndex(popEndorsementHeader.GetHash());
-        if (popEndorsementIdnex == nullptr || pindexPrev.GetAncestor(popEndorsementIdnex->nHeight) == nullptr) {
-            return state.Invalid(TxValidationResult::TX_BAD_POP_DATA, "pop-tx-endorsed-block-not-from-this-chain", strprintf("[%s] can not find endorsed block in this chain: %s", tx->GetHash().ToString(), popEndorsementHeader.GetHash().ToString()));
+        if (popEndorsementIdnex == nullptr || !ChainActive().Contains(popEndorsementIdnex)) {
+            return state.Invalid(TxValidationResult::TX_BAD_POP_DATA, "pop-tx-endorsed-block-not-from-this-main-chain", strprintf("[%s] can not find endorsed block in the main chain: %s", tx->GetHash().ToString(), popEndorsementHeader.GetHash().ToString()));
         }
 
         CBlock popEndorsementBlock;

diff --git a/src/vbk/test/unit/pop_service_tests.cpp b/src/vbk/test/unit/pop_service_tests.cpp
@@ -107,7 +107,7 @@ BOOST_FIXTURE_TEST_CASE(blockPopValidation_test_wrong_index, PopServiceFixture)
     Verify_Method(Method(pop_service_impl_mock, removePayloads)).Once();
 }
 
-BOOST_FIXTURE_TEST_CASE(blockPopValidation_test_wrong_ancestor, PopServiceFixture)
+BOOST_FIXTURE_TEST_CASE(blockPopValidation_test_endorsed_block_not_from_main_chain, PopServiceFixture)
 {
     CBlockIndex* endorsedBlockIndex = ChainActive().Tip()->pprev->pprev->pprev;
     CBlock endorsedBlock;
@@ -123,7 +123,6 @@ BOOST_FIXTURE_TEST_CASE(blockPopValidation_test_wrong_ancestor, PopServiceFixtur
     BlockValidationState state;
     InvalidateBlock(state, Params(), endorsedBlockIndex);
     ActivateBestChain(state, Params());
-    ChainstateActive().ActivateBestChain(state, Params(), nullptr);
     BOOST_CHECK(ChainActive().Height() < prevHeight);
 
     CBlock block = createBlockWithPopTx(*this);