From 4155b48eebfb96be6146bd26a986774b37583099 Mon Sep 17 00:00:00 2001 From: random-zebra Date: Sun, 25 Jul 2021 17:40:19 +0200 Subject: [PATCH] [Tests] Fix ProcessNewBlock signature in budget_tests.cpp broken due to merges of #2438 + #2464 --- src/test/budget_tests.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/test/budget_tests.cpp b/src/test/budget_tests.cpp index efaea9bb788e..8cad870d4dcb 100644 --- a/src/test/budget_tests.cpp +++ b/src/test/budget_tests.cpp @@ -241,8 +241,7 @@ BOOST_FIXTURE_TEST_CASE(budget_blocks_payee_test, TestChain100Setup) // Now create the good block block.vtx[0] = MakeTransactionRef(goodMtx); pblock = FinalizeBlock(std::make_shared(block)); - CValidationState state; - ProcessNewBlock(state, pblock, nullptr); + ProcessNewBlock(pblock, nullptr); BOOST_CHECK_EQUAL(WITH_LOCK(cs_main, return chainActive.Tip()->GetBlockHash();), pblock->GetHash()); } @@ -284,9 +283,8 @@ BOOST_FIXTURE_TEST_CASE(budget_blocks_reorg_test, TestChain100Setup) BOOST_CHECK(payeeOut.scriptPubKey == payee); // Now let's process BlockA: - CValidationState stateA; auto pblockA = std::make_shared(blockA); - ProcessNewBlock(stateA, pblockA, nullptr); + ProcessNewBlock(pblockA, nullptr); BOOST_CHECK(WITH_LOCK(cs_main, return chainActive.Tip()->GetBlockHash()) == blockA.GetHash()); // Now let's create blockC on top of BlockA, blockD on top of blockB @@ -296,20 +294,19 @@ BOOST_FIXTURE_TEST_CASE(budget_blocks_reorg_test, TestChain100Setup) CBlock blockD = CreateBlock({}, forkCoinbaseScript, false); // Process and connect blockC - ProcessNewBlock(stateA, std::make_shared(blockC), nullptr); + ProcessNewBlock(std::make_shared(blockC), nullptr); BOOST_CHECK(WITH_LOCK(cs_main, return chainActive.Tip()->GetBlockHash()) == blockC.GetHash()); // Now let's process the secondary chain blockD.hashPrevBlock = blockB.GetHash(); std::shared_ptr pblockD = FinalizeBlock(std::make_shared(blockD)); - CValidationState stateB; - ProcessNewBlock(stateB, std::make_shared(blockB), nullptr); - ProcessNewBlock(stateB, pblockD, nullptr); + ProcessNewBlock(std::make_shared(blockB), nullptr); + ProcessNewBlock(pblockD, nullptr); CBlock blockE = CreateBlock({}, forkCoinbaseScript, false); blockE.hashPrevBlock = pblockD->GetHash(); std::shared_ptr pblockE = FinalizeBlock(std::make_shared(blockE)); - ProcessNewBlock(stateB, pblockE, nullptr); + ProcessNewBlock(pblockE, nullptr); BOOST_CHECK(WITH_LOCK(cs_main, return chainActive.Tip()->GetBlockHash()) == pblockE->GetHash()); }