test: adapt AssumeUTXO fixtures after txindex removal

Author: PastaPastaPasta

src/test/util/setup_common.cpp

@@ -69,6 +69,7 @@
 #include <evo/specialtx.h>
 #include <evo/specialtxman.h>
 #include <flat-database.h>
+#include <governance/governance.h>
 #include <llmq/context.h>
 #include <llmq/signing.h>
 #include <masternode/meta.h>
@@ -431,6 +432,11 @@ TestingSetup::~TestingSetup()
         m_node.connman->Stop();
     }
 
+    // govman holds a reference to chain_helper->superblocks, so it must be reset
+    // before DashChainstateSetupClose() destroys chain_helper (matches PrepareShutdown
+    // ordering in init.cpp). Keep this defensive for fixtures that construct govman.
+    m_node.govman.reset();
+
     // DashChainstateSetup() is called by LoadChainstate() internally but
     // winding them down is our responsibility
     DashChainstateSetupClose(m_node);

src/test/validation_chainstatemanager_tests.cpp

@@ -10,7 +10,6 @@
 #include <rpc/blockchain.h>
 #include <sync.h>
 #include <test/util/chainstate.h>
-#include <test/util/index.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
 #include <timedata.h>
@@ -759,9 +758,6 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_evodb_snapshot_only_flush_restart, Sna
 
     ChainstateManager& restarted = this->SimulateNodeRestart(/*flush_chainstates=*/false);
     this->LoadVerifyActivateChainstate();
-    g_txindex = std::make_unique<TxIndex>(1 << 20, /*memory=*/true);
-    BOOST_REQUIRE(g_txindex->Start(restarted.ActiveChainstate()));
-    IndexWaitSynced(*g_txindex);
 
     BOOST_CHECK(m_node.evodb->VerifyBestBlock(EvoDbIdentity::SNAPSHOT, snapshot_marker));
     BOOST_CHECK(m_node.evodb->VerifyBestBlock(EvoDbIdentity::NORMAL, normal_marker));
@@ -808,9 +804,6 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_snapshot_init_missing_evodb_marker, Sn
     WITH_LOCK(::cs_main, restarted.ResetChainstates());
     fs::remove_all(gArgs.GetDataDirNet() / "chainstate_snapshot");
     this->LoadVerifyActivateChainstate();
-    g_txindex = std::make_unique<TxIndex>(1 << 20, /*memory=*/true);
-    BOOST_REQUIRE(g_txindex->Start(restarted.ActiveChainstate()));
-    IndexWaitSynced(*g_txindex);
 }
 
 BOOST_AUTO_TEST_SUITE_END()