fix functional test gatings

Author: willcl-ark

test/functional_tests.cmake

@@ -98,7 +98,6 @@ endif()
 
 # Long-running base tests (~2-5 minutes) - COST 200-299
 add_functional_test(feature_fee_estimation "feature_fee_estimation.py" COST 280)
-add_functional_test(feature_taproot "feature_taproot.py" COST 270)
 add_functional_test(feature_block "feature_block.py" COST 260)
 add_functional_test(mempool_ephemeral_dust "mempool_ephemeral_dust.py" COST 250)
 add_functional_test(p2p_opportunistic_1p1c "p2p_opportunistic_1p1c.py" COST 240)
@@ -120,6 +119,7 @@ add_functional_test(p2p_dns_seeds "p2p_dns_seeds.py" COST 100)
 
 # Wallet tests (conditional on wallet support)
 if(ENABLE_WALLET)
+    add_functional_test(feature_taproot "feature_taproot.py" COST 270 LABELS "wallet")
     add_functional_test(wallet_conflicts "wallet_conflicts.py" COST 200 LABELS "wallet")
     add_functional_test(rpc_psbt "rpc_psbt.py" COST 120 LABELS "wallet")
     add_functional_test(wallet_fundrawtransaction "wallet_fundrawtransaction.py" COST 115 LABELS "wallet")
@@ -190,7 +190,6 @@ if(ENABLE_WALLET)
     add_functional_test(wallet_musig "wallet_musig.py" COST 5 LABELS "wallet")
     add_functional_test(wallet_timelock "wallet_timelock.py" COST 5 LABELS "wallet")
     add_functional_test(wallet_startup "wallet_startup.py" COST 5 LABELS "wallet")
-    add_functional_test(wallet_migration "wallet_migration.py" COST 5 LABELS "wallet")
     add_functional_test(tool_signet_miner "tool_signet_miner.py" COST 5 LABELS "wallet")
 endif()
 
@@ -407,6 +406,7 @@ if(ENABLE_PREVIOUS_RELEASES_TESTS)
     add_functional_test(feature_coinstatsindex_compatibility "feature_coinstatsindex_compatibility.py" COST 40 LABELS "previous_releases")
     if(ENABLE_WALLET)
         add_functional_test(wallet_backwards_compatibility "wallet_backwards_compatibility.py" COST 35 LABELS "previous_releases;wallet")
+        add_functional_test(wallet_migration "wallet_migration.py" COST 5 LABELS "previous_releases;wallet")
     endif()
 endif()