Added impl for ImportDescriptorRequest and modified importdescriptors to accept a Vec<ImportDescriptorRequest>

Author: sandipndev

client/src/client.rs

@@ -297,28 +297,9 @@ pub trait RpcApi: Sized {
 
     fn import_descriptors(
         &self,
-        descriptor: &str,
-        change_descriptor: &str,
+        descriptors: Vec<json::ImportDescriptorRequest>,
     ) -> Result<Vec<json::ImportDescriptorResult>> {
-        let ex_descriptor = json::ImportDescriptorRequest {
-            active: true,
-            descriptor: descriptor.to_string(),
-            range: [0, 100],
-            next_index: 0,
-            timestamp: "now".to_string(),
-            internal: false,
-        };
-
-        let in_descriptor = json::ImportDescriptorRequest {
-            active: true,
-            descriptor: change_descriptor.to_string(),
-            range: [0, 100],
-            next_index: 0,
-            timestamp: "now".to_string(),
-            internal: true,
-        };
-
-        let arg = into_json([ex_descriptor, in_descriptor])?;
+        let arg = into_json(descriptors)?;
         self.call("importdescriptors", &[arg])
     }
 

integration_test/src/main.rs

@@ -1074,8 +1074,10 @@ fn test_descriptor_wallet(cl: &Client) {
     .unwrap();
 
     cl.import_descriptors(
-        "wpkh(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/0/*)#ymr4jlz6", 
-        "wpkh(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/1/*)#40x502jz",
+        vec![
+            json::ImportDescriptorRequest::new("wpkh(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/0/*)#ymr4jlz6", false),
+            json::ImportDescriptorRequest::new("wpkh(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/1/*)#40x502jz", true),
+        ]
     ).unwrap();
 
     let add = cl.get_new_address(None, Some(json::AddressType::Bech32)).unwrap();

json/src/lib.rs

@@ -1702,6 +1702,20 @@ pub struct ImportDescriptorRequest {
     pub internal: bool,
 }
 
+impl ImportDescriptorRequest {
+    /// Create a new Import Descriptor request providing just the descriptor and internal flags
+    pub fn new(descriptor: &str, internal: bool) -> Self {
+        ImportDescriptorRequest {
+            descriptor: descriptor.to_string(),
+            internal,
+            active: true,
+            range: [0, 100],
+            next_index: 0,
+            timestamp: "now".to_string(),
+        }
+    }
+}
+
 /// Imported Descriptor Result
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct ImportDescriptorResult {