Merge pull request #110 from tcharding/03-20-unloadwallet

Fix `unloadwallet` method

Author: tcharding

client/src/client_sync/v17/mod.rs

@@ -101,6 +101,7 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();
 

client/src/client_sync/v17/wallet.rs

@@ -432,6 +432,22 @@ macro_rules! impl_client_v17__signrawtransactionwithwallet {
     };
 }
 
+/// Implements Bitcoin Core JSON-RPC API method `unloadwallet`.
+#[macro_export]
+macro_rules! impl_client_v17__unloadwallet {
+    () => {
+        impl Client {
+            pub fn unload_wallet(&self, wallet_name: &str) -> Result<()> {
+                match self.call("unloadwallet", &[into_json(wallet_name)?]) {
+                    Ok(serde_json::Value::Null) => Ok(()),
+                    Ok(res) => Err(Error::Returned(res.to_string())),
+                    Err(err) => Err(err.into()),
+                }
+            }
+        }
+    };
+}
+
 /// Implements Bitcoin Core JSON-RPC API method `walletcreatefundedpsbt`.
 #[macro_export]
 macro_rules! impl_client_v17__walletcreatefundedpsbt {

client/src/client_sync/v18/mod.rs

@@ -96,5 +96,6 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v19/mod.rs

@@ -94,5 +94,6 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v20.rs

@@ -92,5 +92,6 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v17__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v21.rs renamed to client/src/client_sync/v21/mod.rs

@@ -4,6 +4,8 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
+mod wallet;
+
 use std::collections::BTreeMap;
 use std::path::Path;
 
@@ -92,5 +94,6 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v21__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v21/wallet.rs

@@ -0,0 +1,22 @@
+// 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 `v21`.
+//!
+//! 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 `unloadwallet`
+#[macro_export]
+macro_rules! impl_client_v21__unloadwallet {
+    () => {
+        impl Client {
+            pub fn unload_wallet(&self, wallet: &str) -> Result<UnloadWallet> {
+                self.call("unloadwallet", &[wallet.into()])
+            }
+        }
+    };
+}

client/src/client_sync/v22/mod.rs

@@ -95,5 +95,6 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
+crate::impl_client_v21__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();

client/src/client_sync/v22/wallet.rs

@@ -9,18 +9,6 @@
 //!
 //! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
 
-/// Implements Bitcoin Core JSON-RPC API method `unloadwallet`
-#[macro_export]
-macro_rules! impl_client_v22__unloadwallet {
-    () => {
-        impl Client {
-            pub fn unload_wallet(&self, wallet: &str) -> Result<UnloadWallet> {
-                self.call("unloadwallet", &[wallet.into()])
-            }
-        }
-    };
-}
-
 /// Implements Bitcoin Core JSON-RPC API method `loadwallet`
 #[macro_export]
 macro_rules! impl_client_v22__loadwallet {

client/src/client_sync/v23.rs

@@ -93,7 +93,7 @@ crate::impl_client_v17__sendmany!();
 crate::impl_client_v17__sendtoaddress!();
 crate::impl_client_v17__signmessage!();
 crate::impl_client_v17__signrawtransactionwithwallet!();
-crate::impl_client_v22__unloadwallet!();
+crate::impl_client_v21__unloadwallet!();
 crate::impl_client_v17__walletcreatefundedpsbt!();
 crate::impl_client_v17__walletprocesspsbt!();