backport: adapt assumeutxo hardening tests for Dash

Author: PastaPastaPasta

test/functional/feature_assumeutxo.py

@@ -518,7 +518,12 @@ def check_for_final_height():
 
         for reindex_arg in ['-reindex=1', '-reindex-chainstate=1']:
             self.log.info(f"Check that restarting with {reindex_arg} will delete the snapshot chainstate")
-            self.restart_node(2, extra_args=[reindex_arg, *self.extra_args[2]])
+            reindex_args = [reindex_arg, *self.extra_args[2]]
+            if reindex_arg == '-reindex-chainstate=1':
+                # Dash forbids chainstate-only reindex while optional indexes
+                # are enabled because they cannot be rebuilt out of order.
+                reindex_args += ['-txindex=0', '-blockfilterindex=0', '-coinstatsindex=0']
+            self.restart_node(2, extra_args=reindex_args)
             assert_equal(1, len(n2.getchainstates()["chainstates"]))
             for i in range(1, 300):
                 block = n0.getblock(n0.getblockhash(i), 0)
@@ -527,6 +532,11 @@ def check_for_final_height():
             assert_equal(loaded['coins_loaded'], SNAPSHOT_BASE_HEIGHT)
             assert_equal(loaded['base_height'], SNAPSHOT_BASE_HEIGHT)
 
+        # The final -reindex-chainstate run disables optional indexes because
+        # Dash cannot rebuild them out of order. Re-enable them for the
+        # snapshot sync and index-completion checks below.
+        self.restart_node(2, extra_args=self.extra_args[2])
+
         normal, snapshot = n2.getchainstates()['chainstates']
         assert_equal(normal['blocks'], START_HEIGHT)
         assert_equal(normal.get('snapshot_blockhash'), None)

test/functional/feature_assumeutxo_dash.py

@@ -247,6 +247,8 @@ def run_test(self):
         node0.invalidateblock(extra_hash)
         assert_equal(node0.getblockcount(), base_height)
         node0.setnetworkactive(True)
+        for node_index in range(1, len(self.nodes)):
+            self.connect_nodes(0, node_index)
         force_finish_mnsync(node0)
         self.sync_all()
         self.wait_for_sporks_same()
@@ -418,7 +420,13 @@ def assert_unfaked_snapshot_counts(background_height):
         self.disconnect_nodes(snapshot_index, 0)
 
         completed, = snapshot_node.getchainstates()["chainstates"]
-        assert_equal(completed["blocks"], base_height)
+        # The rollback helper rolls the isolated block forward before writing.
+        # Once its header is later announced to the reconnected network, the
+        # quorum can ChainLock it and override the local invalidation used to
+        # hold the fixture at the snapshot base.
+        final_height = base_height + 1
+        assert_equal(completed["blocks"], final_height)
+        assert_equal(snapshot_node.getbestblockhash(), extra_hash)
         assert_equal(completed["validated"], True)
         assert_equal(completed["snapshot_blockhash"], base_hash)
         assert_equal(
@@ -438,7 +446,7 @@ def assert_unfaked_snapshot_counts(background_height):
         ):
             self.restart_node(snapshot_index, extra_args=snapshot_args)
         cleaned, = snapshot_node.getchainstates()["chainstates"]
-        assert_equal(cleaned["blocks"], base_height)
+        assert_equal(cleaned["blocks"], final_height)
         assert_equal(cleaned["validated"], True)
         assert "snapshot_blockhash" not in cleaned
         assert not (snapshot_node.chain_path / "chainstate_snapshot").exists()
@@ -447,7 +455,7 @@ def assert_unfaked_snapshot_counts(background_height):
         self.log.info("Restart once more after cleanup")
         self.restart_node(snapshot_index, extra_args=snapshot_args)
         final_state, = snapshot_node.getchainstates()["chainstates"]
-        assert_equal(final_state["blocks"], base_height)
+        assert_equal(final_state["blocks"], final_height)
         assert_equal(final_state["validated"], True)
         assert "snapshot_blockhash" not in final_state
 

test/lint/lint-shell.py

@@ -70,7 +70,7 @@ def main():
     reg = re.compile(r'src/[dashbls,immer,leveldb,secp256k1,minisketch]')
 
     def should_exclude(fname: str) -> bool:
-        return bool(reg.match(fname)) or 'test_utxo_snapshots.sh' in fname
+        return bool(reg.match(fname))
 
     # remove everything that doesn't match this regex
     files[:] = [file for file in files if not should_exclude(file)]