Update v30 files for changes from Core v29

Update v30 files which are copies of the v29 to apply the changes made
to Core between v29 and v30.

Add TODO to all v30 methods that have changes and need updating.

Feature gate the tests for methods that have been dropped or are TODO in
v30.

Author: jamillambert

client/src/client_sync/v30/mod.rs

@@ -138,13 +138,10 @@ crate::impl_client_v17__verify_message!();
 // == Wallet ==
 crate::impl_client_v17__abandon_transaction!();
 crate::impl_client_v17__abort_rescan!();
-crate::impl_client_v17__add_multisig_address!();
 crate::impl_client_v17__backup_wallet!();
 crate::impl_client_v17__bump_fee!();
 crate::impl_client_v23__create_wallet!();
 crate::impl_client_v28__create_wallet_descriptor!();
-crate::impl_client_v17__dump_priv_key!();
-crate::impl_client_v17__dump_wallet!();
 crate::impl_client_v17__encrypt_wallet!();
 crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
@@ -156,15 +153,9 @@ crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
 crate::impl_client_v17__get_received_by_address!();
 crate::impl_client_v17__get_transaction!();
-crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
-crate::impl_client_v17__import_address!();
 crate::impl_client_v21__import_descriptors!();
-crate::impl_client_v17__import_multi!();
-crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__import_pruned_funds!();
-crate::impl_client_v17__import_pubkey!();
-crate::impl_client_v17__import_wallet!();
 crate::impl_client_v17__key_pool_refill!();
 crate::impl_client_v17__list_address_groupings!();
 crate::impl_client_v22__list_descriptors!();
@@ -180,7 +171,6 @@ crate::impl_client_v17__list_wallets!();
 crate::impl_client_v22__load_wallet!();
 crate::impl_client_v17__lock_unspent!();
 crate::impl_client_v24__migrate_wallet!();
-crate::impl_client_v23__new_keypool!();
 crate::impl_client_v21__psbt_bump_fee!();
 crate::impl_client_v17__remove_pruned_funds!();
 crate::impl_client_v17__rescan_blockchain!();
@@ -190,14 +180,12 @@ crate::impl_client_v24__send_all!();
 crate::impl_client_v17__send_many!();
 crate::impl_client_v21__send_many_verbose!();
 crate::impl_client_v17__send_to_address!();
-crate::impl_client_v17__set_hd_seed!();
 crate::impl_client_v17__set_tx_fee!();
 crate::impl_client_v19__set_wallet_flag!();
 crate::impl_client_v17__sign_message!();
 crate::impl_client_v17__sign_raw_transaction_with_wallet!();
 crate::impl_client_v24__simulate_raw_transaction!();
 crate::impl_client_v21__unload_wallet!();
-crate::impl_client_v21__upgrade_wallet!();
 crate::impl_client_v17__wallet_create_funded_psbt!();
 crate::impl_client_v22__wallet_display_address!();
 crate::impl_client_v17__wallet_lock!();

integration_test/tests/blockchain.rs

@@ -332,6 +332,7 @@ fn blockchain__get_mempool_entry__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn blockchain__get_mempool_info__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.fund_wallet();

integration_test/tests/mining.rs

@@ -37,6 +37,7 @@ fn mining__get_block_template__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn mining__get_mining_info() {
     let node = Node::with_wallet(Wallet::Default, &[]);
 

integration_test/tests/wallet.rs

@@ -59,6 +59,7 @@ fn wallet__abort_rescan() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__add_multisig_address__modelled() {
     let nrequired = 2;
 
@@ -168,6 +169,7 @@ fn wallet__create_wallet_descriptor() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__dump_priv_key__modelled() {
     // As of Core v23 the default wallet is an native descriptor wallet which does not
     // support dumping private keys. Legacy wallets are supported upto v25 it seems.
@@ -200,6 +202,7 @@ fn wallet__dump_priv_key__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__dump_wallet() {
     // As of Core v23 the default wallet is an native descriptor wallet which does not
     // support dumping private keys. Legacy wallets are supported upto v25 it seems.
@@ -398,6 +401,7 @@ fn wallet__get_transaction__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__get_unconfirmed_balance__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     let json: GetUnconfirmedBalance =
@@ -407,6 +411,7 @@ fn wallet__get_unconfirmed_balance__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__get_wallet_info__modelled() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     node.mine_a_block();
@@ -433,6 +438,7 @@ fn wallet__get_wallet_info__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__import_address() {
     let node = match () {
         #[cfg(feature = "v22_and_below")]
@@ -517,6 +523,7 @@ fn wallet__import_pruned_funds() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__import_wallet() {
     let node = match () {
         #[cfg(feature = "v22_and_below")]
@@ -648,6 +655,7 @@ fn wallet__list_transactions__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__import_multi() {
     let node = match () {
         #[cfg(feature = "v22_and_below")]
@@ -711,6 +719,7 @@ fn wallet__import_multi() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__import_privkey() {
     let node = match () {
         #[cfg(feature = "v22_and_below")]
@@ -730,6 +739,7 @@ fn wallet__import_privkey() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__import_pubkey() {
     let node = match () {
         #[cfg(feature = "v22_and_below")]
@@ -805,7 +815,7 @@ fn wallet__list_unspent__modelled() {
 }
 
 #[test]
-#[cfg(not(feature = "v17"))]
+#[cfg(all(feature = "v29_and_below", not(feature = "v17")))]
 fn wallet__list_wallet_dir() {
     let wallet_name = "test-wallet";
     let node = Node::with_wallet(Wallet::None, &[]);
@@ -853,7 +863,7 @@ fn wallet__lock_unspent() {
 }
 
 #[test]
-#[cfg(not(feature = "v23_and_below"))]
+#[cfg(all(feature = "v29_and_below", not(feature = "v23_and_below")))]
 fn wallet__migrate_wallet() {
     let node = Node::with_wallet(Wallet::None, &["-deprecatedrpc=create_bdb"]);
     let wallet_name = "legacy_wallet";
@@ -865,7 +875,7 @@ fn wallet__migrate_wallet() {
 }
 
 #[test]
-#[cfg(not(feature = "v22_and_below"))]
+#[cfg(all(feature = "v29_and_below", 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");
@@ -1002,6 +1012,7 @@ fn wallet__send_to_address__modelled() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__set_tx_fee() {
     let node = Node::with_wallet(Wallet::Default, &[]);
     let fee_rate = FeeRate::from_sat_per_vb(2).expect("2 sat/vb is valid");
@@ -1021,6 +1032,7 @@ fn wallet__set_wallet_flag() {
 }
 
 #[test]
+#[cfg(feature = "v29_and_below")]
 fn wallet__set_hd_seed() {
     let node = match () {
         #[cfg(feature = "v22_and_below")]
@@ -1181,7 +1193,7 @@ fn create_load_unload_wallet() {
 }
 
 #[test]
-#[cfg(not(feature = "v20_and_below"))]
+#[cfg(all(feature = "v29_and_below", not(feature = "v20_and_below")))]
 fn wallet__upgrade_wallet() {
     let node = Node::with_wallet(Wallet::Default, &[]);