updates

Author: sandipndev

integration_test/src/main.rs

@@ -124,18 +124,13 @@ fn get_auth() -> bitcoincore_rpc::Auth {
 fn main() {
     log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::max())).unwrap();
 
-    let mut rpc_url = format!("{}/wallet/testdescriptorwallet", get_rpc_url());
-    let auth = get_auth();
-    let mut cl = Client::new(&rpc_url, auth).unwrap();
+    let rpc_url = format!("{}/wallet/testwallet", get_rpc_url());
+    let cl = Client::new(&rpc_url, get_auth()).unwrap();
 
     test_get_network_info(&cl);
     unsafe { VERSION = cl.version().unwrap() };
     println!("Version: {}", version());
 
-    test_import_descriptors(&cl);
-
-    rpc_url = format!("{}/wallet/testwallet", get_rpc_url());
-    cl = Client::new(&rpc_url, get_auth()).unwrap();
     cl.create_wallet("testwallet", None, None, None, None, None).unwrap();
 
     test_get_mining_info(&cl);
@@ -207,6 +202,12 @@ fn main() {
     //TODO unload_wallet(&self, wallet: Option<&str>) -> Result<()> {
     //TODO backup_wallet(&self, destination: Option<&str>) -> Result<()> {
     test_stop(cl);
+
+    let rpc_url = format!("{}/wallet/testdescriptorwallet", get_rpc_url());
+    let desc_cl = Client::new(&rpc_url, get_auth()).unwrap();
+
+    test_descriptor_wallet(&desc_cl);
+    test_stop(desc_cl);
 }
 
 fn test_get_network_info(cl: &Client) {
@@ -1008,25 +1009,6 @@ fn test_create_wallet(cl: &Client) {
     assert!(wallet_list.iter().zip(wallet_names).all(|(a, b)| a == b));
 }
 
-fn test_import_descriptors(cl: &Client) {
-    cl.create_wallet(
-        "testdescriptorwallet",
-        Some(false),
-        Some(true),
-        Some(""),
-        Some(false),
-        Some(true),
-    )
-    .unwrap();
-
-    cl.import_descriptors(
-        "tr(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/0/*)#0t9kzwrk", 
-        "tr(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/1/*)#7lqhlmnw",
-    ).unwrap();
-    cl.get_new_address(None, Some(json::AddressType::Bech32m)).unwrap();
-    cl.unload_wallet(Some("testdescriptorwallet")).unwrap();
-}
-
 fn test_get_tx_out_set_info(cl: &Client) {
     cl.get_tx_out_set_info().unwrap();
 }
@@ -1079,3 +1061,22 @@ fn test_getblocktemplate(cl: &Client) {
 fn test_stop(cl: Client) {
     println!("Stopping: '{}'", cl.stop().unwrap());
 }
+
+fn test_descriptor_wallet(cl: &Client) {
+    cl.create_wallet(
+        "testdescriptorwallet",
+        Some(false),
+        Some(true),
+        Some(""),
+        Some(false),
+        Some(true),
+    )
+    .unwrap();
+
+    cl.import_descriptors(
+        "tr(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/0/*)#0t9kzwrk", 
+        "tr(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/1/*)#7lqhlmnw",
+    ).unwrap();
+    cl.get_new_address(None, Some(json::AddressType::Bech32m)).unwrap();
+    cl.unload_wallet(Some("testdescriptorwallet")).unwrap();
+}