Merge #237: Add missing v18 wallet methods

ef5dda8 Run the formatter (Jamil Lambert, PhD)
46760cd Add missing v18 wallet methods (Jamil Lambert, PhD)

Pull request description:

  Add `getreceivedbylabel`, `listreceivedbylabel` and `getdescriptorinfo` methods, models and tests.

ACKs for top commit:
  tcharding:
    ACK ef5dda8

Tree-SHA512: aa2869bc1d3d88fda60a18aa34a60ade068ba8199143de97963b58deb029de72b0e5406f652d4c70ca8e2806fda78ef613a07c2d9a5857cde503c17dfb321ab8

Author: tcharding

client/src/client_sync/v18/mod.rs

@@ -9,6 +9,7 @@ pub mod mining;
 pub mod network;
 pub mod raw_transactions;
 pub mod util;
+pub mod wallet;
 
 use std::collections::BTreeMap;
 use std::path::Path;
@@ -133,6 +134,7 @@ crate::impl_client_v17__get_balance!();
 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_v18__get_received_by_label!();
 crate::impl_client_v17__get_transaction!();
 crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
@@ -141,10 +143,12 @@ crate::impl_client_v17__list_address_groupings!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
 crate::impl_client_v17__list_wallets!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();
 crate::impl_client_v17__send_many!();

client/src/client_sync/v18/wallet.rs

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: CC0-1.0
+
+//! Macros for implementing JSON-RPC methods on a client.
+//!
+//! Specifically this is methods found under the `== Wallet ==` section of the
+//! API docs of Bitcoin Core `v0.18`.
+//!
+//! All macros require `Client` to be in scope.
+//!
+//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+/// Implements Bitcoin Core JSON-RPC API method `getreceivedbylabel`.
+#[macro_export]
+macro_rules! impl_client_v18__get_received_by_label {
+    () => {
+        impl Client {
+            pub fn get_received_by_label(&self, label: &str) -> Result<GetReceivedByLabel> {
+                self.call("getreceivedbylabel", &[label.into()])
+            }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `listreceivedbylabel`.
+#[macro_export]
+macro_rules! impl_client_v18__list_received_by_label {
+    () => {
+        impl Client {
+            pub fn list_received_by_label(&self) -> Result<ListReceivedByLabel> {
+                self.call("listreceivedbylabel", &[])
+            }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `listwalletdir`.
+#[macro_export]
+macro_rules! impl_client_v18__list_wallet_dir {
+    () => {
+        impl Client {
+            pub fn list_wallet_dir(&self) -> Result<ListWalletDir> {
+                self.call("listwalletdir", &[])
+            }
+        }
+    };
+}

client/src/client_sync/v19/mod.rs

@@ -127,6 +127,7 @@ crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
 crate::impl_client_v19__get_balances!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
 crate::impl_client_v17__get_received_by_address!();
@@ -135,12 +136,14 @@ crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v17__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v20/mod.rs

@@ -123,6 +123,7 @@ crate::impl_client_v17__dump_wallet!();
 crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v19__get_balances!();
 crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
@@ -133,11 +134,13 @@ crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
 crate::impl_client_v17__list_labels!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v17__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v21/mod.rs

@@ -122,6 +122,7 @@ crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();
 crate::impl_client_v17__dump_priv_key!();
 crate::impl_client_v17__dump_wallet!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
@@ -135,11 +136,13 @@ crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
 crate::impl_client_v17__list_labels!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v17__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v22/mod.rs

@@ -122,6 +122,7 @@ crate::impl_client_v17__bump_fee!();
 crate::impl_client_v17__create_wallet!();
 crate::impl_client_v17__dump_priv_key!();
 crate::impl_client_v17__dump_wallet!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
@@ -134,12 +135,14 @@ crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v17__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v23/mod.rs

@@ -128,6 +128,7 @@ crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
 crate::impl_client_v19__get_balances!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
 crate::impl_client_v17__get_received_by_address!();
@@ -136,12 +137,14 @@ crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v22__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v24/mod.rs

@@ -125,6 +125,7 @@ crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
 crate::impl_client_v19__get_balances!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
 crate::impl_client_v17__get_received_by_address!();
@@ -133,12 +134,14 @@ crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v22__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v25/mod.rs

@@ -125,6 +125,7 @@ crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
 crate::impl_client_v19__get_balances!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
 crate::impl_client_v17__get_received_by_address!();
@@ -133,12 +134,14 @@ crate::impl_client_v17__get_unconfirmed_balance!();
 crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_labels!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v22__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();

client/src/client_sync/v26/mod.rs

@@ -131,6 +131,7 @@ crate::impl_client_v17__get_addresses_by_label!();
 crate::impl_client_v17__get_address_info!();
 crate::impl_client_v17__get_balance!();
 crate::impl_client_v19__get_balances!();
+crate::impl_client_v18__get_received_by_label!();
 crate::impl_client_v17__get_new_address!();
 crate::impl_client_v17__get_raw_change_address!();
 crate::impl_client_v17__get_received_by_address!();
@@ -140,11 +141,13 @@ crate::impl_client_v17__get_wallet_info!();
 crate::impl_client_v17__import_privkey!();
 crate::impl_client_v17__list_address_groupings!();
 crate::impl_client_v17__list_labels!();
+crate::impl_client_v18__list_received_by_label!();
 crate::impl_client_v17__list_lock_unspent!();
 crate::impl_client_v17__list_received_by_address!();
 crate::impl_client_v17__list_since_block!();
 crate::impl_client_v17__list_transactions!();
 crate::impl_client_v17__list_unspent!();
+crate::impl_client_v18__list_wallet_dir!();
 crate::impl_client_v17__list_wallets!();
 crate::impl_client_v22__load_wallet!();
 crate::impl_client_v17__rescan_blockchain!();