Merge #291: Add UnloadWalletResult

0c582fa Add UnloadWalletResult (Mike Neuhaus)

Pull request description:

  closes #290

ACKs for top commit:
  apoelstra:
    utACK 0c582fa

Tree-SHA512: 532eb51f649fbcd958c875817bc01bcb55c4a3f5245395ba8e490dad71a5c14734145b2a1a63ffece6549f082694622111d934b893d03629783876e898a97d40

Author: apoelstra

client/src/client.rs

@@ -272,7 +272,7 @@ pub trait RpcApi: Sized {
         self.call("loadwallet", &[wallet.into()])
     }
 
-    fn unload_wallet(&self, wallet: Option<&str>) -> Result<()> {
+    fn unload_wallet(&self, wallet: Option<&str>) -> Result<Option<json::UnloadWalletResult>> {
         let mut args = [opt_into_json(wallet)?];
         self.call("unloadwallet", handle_defaults(&mut args, &[null()]))
     }

integration_test/src/main.rs

@@ -122,13 +122,15 @@ fn get_auth() -> bitcoincore_rpc::Auth {
     };
 }
 
+fn new_wallet_client(wallet_name: &str) -> Client {
+    let url = format!("{}{}{}", get_rpc_url(), "/wallet/", wallet_name);
+    Client::new(&url, get_auth()).unwrap()
+}
+
 fn main() {
     log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::max())).unwrap();
 
-    let rpc_url = format!("{}/wallet/testwallet", get_rpc_url());
-    let auth = get_auth();
-
-    let cl = Client::new(&rpc_url, auth).unwrap();
+    let cl = new_wallet_client("testwallet");
 
     test_get_network_info(&cl);
     unsafe { VERSION = cl.version().unwrap() };
@@ -200,6 +202,7 @@ fn main() {
     test_get_network_hash_ps(&cl);
     test_uptime(&cl);
     test_getblocktemplate(&cl);
+    test_unloadwallet(&cl);
     //TODO import_multi(
     //TODO verify_message(
     //TODO wait_for_new_block(&self, timeout: u64) -> Result<json::BlockRef> {
@@ -210,7 +213,6 @@ fn main() {
     //TODO get_by_id<T: queryable::Queryable<Self>>(
     //TODO add_multisig_address(
     //TODO load_wallet(&self, wallet: &str) -> Result<json::LoadWalletResult> {
-    //TODO unload_wallet(&self, wallet: Option<&str>) -> Result<()> {
     //TODO backup_wallet(&self, destination: Option<&str>) -> Result<()> {
     test_add_node(&cl);
     test_get_added_node_info(&cl);
@@ -1130,8 +1132,7 @@ fn test_create_wallet(cl: &Client) {
         };
         assert_eq!(result.warning, expected_warning);
 
-        let wallet_client_url = format!("{}{}{}", get_rpc_url(), "/wallet/", wallet_param.name);
-        let wallet_client = Client::new(&wallet_client_url, get_auth()).unwrap();
+        let wallet_client = new_wallet_client(wallet_param.name);
         let wallet_info = wallet_client.get_wallet_info().unwrap();
 
         assert_eq!(wallet_info.wallet_name, wallet_param.name);
@@ -1267,6 +1268,20 @@ fn test_getblocktemplate(cl: &Client) {
     cl.generate_to_address(2, &RANDOM_ADDRESS).unwrap();
 }
 
+fn test_unloadwallet(cl: &Client) {
+    cl.create_wallet("testunloadwallet", None, None, None, None).unwrap();
+
+    let res = new_wallet_client("testunloadwallet")
+        .unload_wallet(None)
+        .unwrap();
+
+    if version() >= 210000 {
+        assert!(res.is_some());
+    } else {
+        assert!(res.is_none());
+    }
+}
+
 fn test_get_index_info(cl: &Client) {
     if version() >= 210000 {
         let gii = cl.get_index_info().unwrap();

json/src/lib.rs

@@ -134,6 +134,11 @@ pub struct LoadWalletResult {
     pub warning: Option<String>,
 }
 
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct UnloadWalletResult {
+    pub warning: Option<String>,
+}
+
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct ListWalletDirResult {
     pub wallets: Vec<ListWalletDirItem>,