Merge pull request #245 from sander2/feat/getwalletdir

feat: added listwalletdir rpc

Author: stevenroose

client/src/client.rs

@@ -294,6 +294,12 @@ pub trait RpcApi: Sized {
         self.call("listwallets", &[])
     }
 
+    fn list_wallet_dir(&self) -> Result<Vec<String>> {
+        let result: json::ListWalletDirResult = self.call("listwalletdir", &[])?;
+        let names = result.wallets.into_iter().map(|x| x.name).collect();
+        Ok(names)
+    }
+
     fn get_wallet_info(&self) -> Result<json::GetWalletInfoResult> {
         self.call("getwalletinfo", &[])
     }

integration_test/src/main.rs

@@ -1015,16 +1015,23 @@ fn test_create_wallet(cl: &Client) {
         );
     }
 
-    let mut wallet_list = cl.list_wallets().unwrap();
+    let mut loaded_wallet_list = cl.list_wallets().unwrap();
 
-    wallet_list.sort();
+    loaded_wallet_list.sort();
 
     // Main wallet created for tests
-    assert!(wallet_list.iter().any(|w| w == "testwallet"));
-    wallet_list.retain(|w| w != "testwallet" && w != "");
+    assert!(loaded_wallet_list.iter().any(|w| w == "testwallet"));
+    loaded_wallet_list.retain(|w| w != "testwallet" && w != "");
 
     // Created wallets
-    assert!(wallet_list.iter().zip(wallet_names).all(|(a, b)| a == b));
+    assert!(loaded_wallet_list.iter().zip(wallet_names).all(|(a, b)| a == b));
+
+    // get all wallets, including any that are not loaded
+    let wallet_list = cl.list_wallet_dir().unwrap();
+    // check that wallet_list is a superset of loaded_wallet_list
+    for ref wallet in loaded_wallet_list {
+        assert!(wallet_list.iter().any(|x| x == wallet));
+    }
 }
 
 fn test_get_tx_out_set_info(cl: &Client) {

json/src/lib.rs

@@ -131,6 +131,16 @@ pub struct LoadWalletResult {
     pub warning: Option<String>,
 }
 
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct ListWalletDirResult {
+    pub wallets: Vec<ListWalletDirItem>,
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct ListWalletDirItem {
+    pub name: String,
+}
+
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct GetWalletInfoResult {
     #[serde(rename = "walletname")]