test: enable v31 integration tests

Drop the v30_and_below gates from tests covering RPCs unchanged in v31.

Author: satsfy

delta

@@ -4,7 +4,6 @@
 
 #![allow(non_snake_case)] // Test names intentionally use double underscore.
 
-#[cfg(feature = "v30_and_below")]
 use bitcoin::consensus::encode;
 use bitcoin::hex;
 use bitcoind::vtype::*; // All the version specific types.
@@ -238,7 +237,6 @@ fn blockchain__get_block_filter__modelled() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v22_and_below"))]
 fn blockchain__get_block_from_peer() {
     use bitcoin::hashes::Hash;
@@ -887,7 +885,6 @@ fn blockchain__wait_for_block_height__modelled() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn blockchain__wait_for_new_block__modelled() {
     let (node1, node2, _node3) = integration_test::three_node_network();
     node1.fund_wallet();

integration_test/tests/blockchain.rs

@@ -4,7 +4,6 @@
 //! rpc_txoutproof.py, rpc_scantxoutset.py, rpc_gettxspendingprevout.py,
 //! rpc_dumptxoutset.py and rpc_getblockstats.py
 
-#[cfg(feature = "v30_and_below")]
 use bitcoind::mtype;
 use bitcoind::vtype::*;
 use integration_test::{BitcoinD, BitcoinDExt as _, Wallet};
@@ -22,7 +21,6 @@ fn get_blockchain_info_pruned_node_has_prune_fields() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_chain_tx_stats_default_window_has_optional_fields() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     let addr = node.client.new_address().unwrap();
@@ -39,7 +37,6 @@ fn get_chain_tx_stats_default_window_has_optional_fields() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_chain_tx_stats_pinned_to_block1_has_no_window_fields() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     let addr = node.client.new_address().unwrap();
@@ -148,7 +145,6 @@ fn get_block_hash_at_tip_matches_best() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_block_verbose_one_tx_count_matches_n_tx() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -177,7 +173,6 @@ fn get_chain_tips_active_tip_matches_best() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_mempool_entry_height_and_no_parents() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -221,7 +216,6 @@ fn scan_tx_out_set_best_block_matches_tip() {
 
 #[test]
 #[cfg(not(feature = "v22_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_deployment_info_genesis_vs_tip() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -259,7 +253,6 @@ fn get_tx_spending_prevout_for_unspent_output() {
 
 #[test]
 #[cfg(not(feature = "v28_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_block_verbose_two_non_coinbase_has_fee() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -275,7 +268,6 @@ fn get_block_verbose_two_non_coinbase_has_fee() {
 
 #[test]
 #[cfg(not(feature = "v28_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_block_verbose_three_non_coinbase_has_prevouts() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -291,7 +283,6 @@ fn get_block_verbose_three_non_coinbase_has_prevouts() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_mempool_entry_spent_by_contains_child() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -317,7 +308,6 @@ fn get_raw_mempool_sequence_includes_tx() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_mempool_ancestors_verbose_keyed_by_parent_txid() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -331,7 +321,6 @@ fn get_mempool_ancestors_verbose_keyed_by_parent_txid() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_block_verbose_one_stripped_size_le_size() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -345,7 +334,6 @@ fn get_block_verbose_one_stripped_size_le_size() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_block_verbose_one_next_block_hash_some_for_non_tip() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();
@@ -416,7 +404,6 @@ fn get_block_stats_v25_actual_utxo_fields() {
     assert!(json.utxo_size_increase_actual.is_some());
 }
 
-#[cfg(feature = "v30_and_below")]
 fn create_child_spending_parent(node: &BitcoinD, parent: bitcoin::Txid) -> bitcoin::Txid {
     use bitcoind::{Input, Output};
     let inputs = vec![Input { txid: parent, vout: 0, sequence: None }];

integration_test/tests/blockchain_core.rs

@@ -4,31 +4,25 @@
 
 #![allow(non_snake_case)] // Test names intentionally use double underscore.
 
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v28_and_below"))]
 use std::collections::HashMap;
 
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v28_and_below"))]
 use bitcoin::hashes::Hash;
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v28_and_below"))]
 use bitcoin::hex::DisplayHex;
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v28_and_below"))]
 use bitcoin::{
     absolute, consensus, transaction, Amount, OutPoint, ScriptBuf, Sequence, Transaction, TxIn,
     TxOut, Txid, Witness,
 };
 use bitcoind::mtype;
 use bitcoind::vtype::*; // All the version specific types.
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v21_and_below"))]
 use bitcoind::P2P;
 use integration_test::{BitcoinD, BitcoinDExt as _, Wallet};
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v21_and_below"))]
 fn hidden__add_connection() {
     let (listener, dialer, _node3) = integration_test::three_node_network();
@@ -104,7 +98,6 @@ fn hidden__estimate_raw_fee__modelled() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 #[cfg(not(feature = "v28_and_below"))]
 fn hidden__get_orphan_txs__modelled() {
     // We use node1 to send node2 orphan transactions via a P2P `tx` message.

integration_test/tests/hidden.rs

@@ -5,14 +5,11 @@
 #![allow(non_snake_case)] // Test names intentionally use double underscore.
 
 use bitcoin::SignedAmount;
-use bitcoind::mtype;
 use bitcoind::vtype::*;
-#[cfg(feature = "v30_and_below")]
-use bitcoind::{TemplateRequest, TemplateRules};
+use bitcoind::{mtype, TemplateRequest, TemplateRules};
 use integration_test::{BitcoinD, BitcoinDExt as _, Wallet}; // All the version specific types.
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn mining__get_block_template__modelled() {
     // Requires connected nodes otherwise the RPC call errors.
     let (node1, node2, node3) = integration_test::three_node_network();

integration_test/tests/mining.rs

@@ -5,7 +5,6 @@
 #[cfg(not(feature = "v25_and_below"))]
 use bitcoin::SignedAmount;
 use bitcoind::vtype::*;
-#[cfg(feature = "v30_and_below")]
 use bitcoind::{TemplateRequest, TemplateRules};
 use integration_test::{BitcoinD, BitcoinDExt as _, Wallet};
 
@@ -53,7 +52,6 @@ fn generate_block_with_empty_tx_list() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_block_template_has_optional_fields() {
     let (node1, _node2, _node3) = integration_test::three_node_network();
     node1.fund_wallet();
@@ -74,7 +72,6 @@ fn get_block_template_has_optional_fields() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn get_block_template_includes_mempool_tx() {
     let (node1, _node2, _node3) = integration_test::three_node_network();
     node1.fund_wallet();

integration_test/tests/mining_core.rs

@@ -4,10 +4,8 @@
 
 #![allow(non_snake_case)] // Test names intentionally use double underscore.
 
-#[cfg(feature = "v30_and_below")]
-use bitcoind::mtype;
 use bitcoind::vtype::*; // All the version specific types.
-use bitcoind::{AddNodeCommand, SetBanCommand};
+use bitcoind::{mtype, AddNodeCommand, SetBanCommand};
 use integration_test::{BitcoinD, BitcoinDExt as _, Wallet};
 
 #[test]
@@ -36,7 +34,6 @@ fn network__clear_banned() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn network__disconnect_node() {
     let (_node1, node2, _node3) = integration_test::three_node_network();
 
@@ -78,7 +75,6 @@ fn network__get_net_totals() {
 }
 
 #[test]
-#[cfg(feature = "v30_and_below")]
 fn network__get_network_info__modelled() {
     let node = BitcoinD::with_wallet(Wallet::None, &[]);
     let json: GetNetworkInfo = node.client.get_network_info().expect("getnetworkinfo");

integration_test/tests/network.rs

@@ -10,7 +10,6 @@ use integration_test::{BitcoinD, BitcoinDExt as _, Wallet};
 
 #[test]
 #[cfg(not(feature = "v20_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_peer_info_has_connection_type() {
     let (node1, _node2, _node3) = integration_test::three_node_network();
 
@@ -31,7 +30,6 @@ fn get_net_totals_time_millis_is_non_zero() {
 
 #[test]
 #[cfg(not(feature = "v20_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_peer_info_bytes_per_msg_non_empty() {
     let (node1, _node2, _node3) = integration_test::three_node_network();
 
@@ -44,7 +42,6 @@ fn get_peer_info_bytes_per_msg_non_empty() {
 
 #[test]
 #[cfg(not(feature = "v22_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_peer_info_synced_blocks_le_headers() {
     let (node1, _node2, _node3) = integration_test::three_node_network();
 
@@ -73,7 +70,6 @@ fn get_network_info_local_services_names_non_empty() {
 
 #[test]
 #[cfg(not(feature = "v20_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_network_info_connections_sum_matches_total() {
     let (node1, _node2, _node3) = integration_test::three_node_network();
 

integration_test/tests/network_core.rs

@@ -31,7 +31,6 @@ fn get_transaction_block_fields_present_after_mining() {
 
 #[test]
 #[cfg(not(feature = "v25_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_wallet_info_has_birthtime() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
 
@@ -170,7 +169,6 @@ fn bump_fee_original_fee_rename_and_cross_field() {
 
 #[test]
 #[cfg(not(feature = "v25_and_below"))]
-#[cfg(feature = "v30_and_below")]
 fn get_wallet_info_has_last_processed_block() {
     let node = BitcoinD::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();