Unify test version feature gate placement

There is a variation in placing the version feature gate above or below
the test attribute.

Change them all to be consistent.

Author: jamillambert

integration_test/tests/blockchain.rs

@@ -479,8 +479,8 @@ fn blockchain__savemempool() {
     }
 }
 
-#[cfg(not(feature = "v24_and_below"))]
 #[test]
+#[cfg(not(feature = "v24_and_below"))]
 fn blockchain__scan_blocks_modelled() {
     let node = Node::with_wallet(Wallet::None, &["-blockfilterindex=1"]);
 

integration_test/tests/control.rs

@@ -13,8 +13,8 @@ fn control__get_memory_info() {
     let _: GetMemoryInfoStats = node.client.get_memory_info().unwrap();
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn control__get_rpc_info() {
     let node = Node::with_wallet(Wallet::None, &[]);
     let _ = node.client.get_rpc_info().unwrap();

integration_test/tests/generating.rs

@@ -9,8 +9,8 @@ use integration_test::{Node, NodeExt as _, Wallet};
 use node::vtype::*;             // All the version specific types.
 use node::mtype;
 
-#[cfg(not(feature = "v20_and_below"))]
 #[test]
+#[cfg(not(feature = "v20_and_below"))]
 fn generating__generate_block__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -44,7 +44,6 @@ fn generating__generate_block__modelled() {
 }
 
 #[test]
-// The `generate` method was deprecated in Core v0.18 and was removed in v0.19.
 #[cfg(feature = "v17")]
 fn generating__generate__modelled() {
     const NBLOCKS: usize = 10;
@@ -69,8 +68,8 @@ fn generating__generate_to_address__modelled() {
     model.unwrap();
 }
 
-#[cfg(not(feature = "v19_and_below"))]
 #[test]
+#[cfg(not(feature = "v19_and_below"))]
 fn generating__generate_to_descriptor__modelled() {
     const NBLOCKS: usize = 1;
 

integration_test/tests/mining.rs

@@ -62,7 +62,6 @@ fn mining__get_network_hash_ps() {
 }
 
 #[test]
-// Core version 26 onwards.
 #[cfg(not(feature = "v25_and_below"))]
 fn mining__get_prioritised_transactions() {
     let node = Node::with_wallet(Wallet::Default, &[]);
@@ -212,8 +211,8 @@ fn mining__submit_block_with_dummy_coinbase(node: &Node, bt: &mtype::GetBlockTem
     let _: () = node.client.submit_block(&block).expect("submitblock");
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn mining__submit_header() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();

integration_test/tests/util.rs

@@ -31,8 +31,8 @@ fn util__create_multisig__modelled() {
     model.unwrap();
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn util__derive_addresses__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
 
@@ -72,8 +72,8 @@ fn util__estimate_smart_fee__modelled() {
     model.unwrap();
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn util__get_descriptor_info() {
     let node = Node::with_wallet(Wallet::Default, &[]);
 
@@ -82,8 +82,8 @@ fn util__get_descriptor_info() {
     let _: GetDescriptorInfo = node.client.get_descriptor_info(descriptor).expect("getdescriptorinfo");
 }
 
-#[cfg(not(feature = "v20_and_below"))]
 #[test]
+#[cfg(not(feature = "v20_and_below"))]
 fn util__get_index_info() {
     let node = Node::with_wallet(Wallet::Default, &["-txindex"]);
     let index_info: GetIndexInfo = node.client.get_index_info().expect("getindexinfo");

integration_test/tests/wallet.rs

@@ -348,8 +348,8 @@ fn wallet__get_received_by_address__modelled() {
     assert_eq!(received_by_address.0, amount);
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn wallet__get_received_by_label__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -560,8 +560,8 @@ fn wallet__list_labels__modelled() {
     assert!(json.0.iter().any(|s| s == label));
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn wallet__list_received_by_label__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -787,8 +787,8 @@ fn wallet__list_unspent__modelled() {
     model.unwrap();
 }
 
-#[cfg(not(feature = "v17"))]
 #[test]
+#[cfg(not(feature = "v17"))]
 fn wallet__list_wallet_dir() {
     let wallet_name = "test-wallet";
     let node = Node::with_wallet(Wallet::None, &[]);
@@ -837,8 +837,8 @@ fn wallet__lock_unspent() {
     assert!(unlocked.0, "unlock_unspent");
 }
 
-#[cfg(not(feature = "v23_and_below"))]
 #[test]
+#[cfg(not(feature = "v23_and_below"))]
 fn wallet__migrate_wallet() {
     let node = Node::with_wallet(Wallet::None, &["-deprecatedrpc=create_bdb"]);
     let wallet_name = "legacy_wallet";
@@ -849,16 +849,16 @@ fn wallet__migrate_wallet() {
     assert_eq!(json.wallet_name, wallet_name);
 }
 
-#[cfg(not(feature = "v22_and_below"))]
 #[test]
+#[cfg(not(feature = "v22_and_below"))]
 fn wallet__new_keypool() {
     let node = Node::with_wallet(Wallet::None, &["-deprecatedrpc=create_bdb"]);
     node.client.create_legacy_wallet("legacy_wallet").expect("createlegacywallet");
     let _: () = node.client.new_keypool().expect("newkeypool");
 }
 
-#[cfg(not(feature = "v20_and_below"))]
 #[test]
+#[cfg(not(feature = "v20_and_below"))]
 fn wallet__psbt_bump_fee__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     let address = node.client.new_address().expect("failed to create new address");
@@ -907,8 +907,8 @@ fn wallet__rescan_blockchain__modelled() {
 }
 
 // This is tested in `backup_and_restore_wallet()`, called by wallet__backup_wallet()
-#[cfg(not(feature = "v22_and_below"))]
 #[test]
+#[cfg(not(feature = "v22_and_below"))]
 fn wallet__restore_wallet() {}
 
 // This is tested in raw_transactions.rs `create_sign_send()`.
@@ -948,8 +948,8 @@ fn wallet__send_many__modelled() {
     }
 }
 
-#[cfg(not(feature = "v20_and_below"))]
 #[test]
+#[cfg(not(feature = "v20_and_below"))]
 fn wallet__send__modelled() {
     use std::collections::BTreeMap;
 
@@ -965,8 +965,8 @@ fn wallet__send__modelled() {
     model.unwrap();
 }
 
-#[cfg(not(feature = "v23_and_below"))]
 #[test]
+#[cfg(not(feature = "v23_and_below"))]
 fn wallet__send_all__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -998,8 +998,8 @@ fn wallet__set_tx_fee() {
     assert!(json.0);
 }
 
-#[cfg(not(feature = "v18_and_below"))]
 #[test]
+#[cfg(not(feature = "v18_and_below"))]
 fn wallet__set_wallet_flag() {
     let node = Node::with_wallet(Wallet::Default, &[]);
 
@@ -1043,8 +1043,8 @@ fn wallet__sign_message__modelled() {
     model.unwrap();
 }
 
-#[cfg(not(feature = "v23_and_below"))]
 #[test]
+#[cfg(not(feature = "v23_and_below"))]
 fn wallet__simulate_raw_transaction() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -1180,8 +1180,8 @@ fn create_load_unload_wallet() {
     let _: LoadWallet = node.client.load_wallet(&wallet).expect("loadwallet");
 }
 
-#[cfg(not(feature = "v20_and_below"))]
 #[test]
+#[cfg(not(feature = "v20_and_below"))]
 fn wallet__upgrade_wallet() {
     let node = Node::with_wallet(Wallet::Default, &[]);