Split single return type to three types

Author: GideonBature

client/src/client_sync/v17/blockchain.rs

@@ -323,20 +323,19 @@ macro_rules! impl_client_v17__save_mempool {
 macro_rules! impl_client_v17__scan_tx_out_set {
     () => {
         impl Client {
-            pub fn scan_tx_out_set(
-                &self,
-                action: ScanAction,
-                scan_objects: &[ScanObject],
-            ) -> Result<ScanTxOutSet> {
-                let params = match action {
-                    ScanAction::Start => {
-                        vec![into_json(action)?, into_json(scan_objects)?]
-                    }
-                    ScanAction::Abort | ScanAction::Status => {
-                        vec![into_json(action)?]
-                    }
-                };
-                self.call("scantxoutset", &params)
+            /// Aborts an ongoing `scantxoutset` scan.
+            pub fn scan_tx_out_set_abort(&self) -> Result<ScanTxOutSetAbort> {
+                self.call("scantxoutset", &[into_json("abort")?])
+            }
+
+            /// Starts a scan of the UTXO set for specified descriptors.
+            pub fn scan_tx_out_set_start(&self, scan_objects: &[&str]) -> Result<ScanTxOutSetStart> {
+                self.call("scantxoutset", &[into_json("start")?, into_json(scan_objects)?])
+            }
+
+            /// Checks the status of an ongoing `scantxoutset` scan.
+            pub fn scan_tx_out_set_status(&self) -> Result<Option<ScanTxOutSetStatus>> {
+                self.call("scantxoutset", &[into_json("status")?])
             }
         }
     };

client/src/client_sync/v17/mod.rs

@@ -303,24 +303,3 @@ impl Serialize for ImportMultiTimestamp {
         }
     }
 }
-
-/// Args for the `scantxoutset`
-///
-/// Represents the action for the `scantxoutset` RPC call.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(rename_all = "lowercase")]
-pub enum ScanAction {
-    Start,
-    Abort,
-    Status,
-}
-
-/// Represents a scan object for scantxoutset (descriptor string or object).
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(untagged)]
-pub enum ScanObject {
-    /// Plain descriptor string
-    Descriptor(String),
-    /// Object containing descriptor and optional range
-    WithDesc { desc: String },
-}

client/src/client_sync/v18/mod.rs

@@ -24,7 +24,7 @@ use crate::types::v18::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput,ScanAction, ScanObject,
+        TemplateRules, WalletCreateFundedPsbtInput,
     },
 };
 

client/src/client_sync/v19/mod.rs

@@ -21,7 +21,6 @@ pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
         TemplateRules, WalletCreateFundedPsbtInput,
-        ScanAction, ScanObject,
     },
 };
 

client/src/client_sync/v20/mod.rs

@@ -19,7 +19,7 @@ use crate::types::v20::*;
 pub use crate::client_sync::{
     v17::{
         AddressType, AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput, ScanAction, ScanObject,
+        WalletCreateFundedPsbtInput,
     },
 };
 

client/src/client_sync/v21/mod.rs

@@ -22,7 +22,7 @@ use crate::types::v21::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput,ScanAction, ScanObject,
+        TemplateRules, WalletCreateFundedPsbtInput,
     },
 };
 

client/src/client_sync/v22/mod.rs

@@ -20,7 +20,7 @@ use crate::types::v22::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, AddressType, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest,
-        TemplateRules, WalletCreateFundedPsbtInput, ScanAction, ScanObject,
+        TemplateRules, WalletCreateFundedPsbtInput,
     },
     v21::ImportDescriptorsRequest,
 };

client/src/client_sync/v23/mod.rs

@@ -21,7 +21,7 @@ use crate::types::v23::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput, ScanAction, ScanObject,
+        WalletCreateFundedPsbtInput,
     },
     v21::ImportDescriptorsRequest,
 };

client/src/client_sync/v24/mod.rs

@@ -17,7 +17,7 @@ use crate::types::v24::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput, ScanAction, ScanObject,
+        WalletCreateFundedPsbtInput,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,

client/src/client_sync/v25/mod.rs

@@ -19,7 +19,7 @@ use crate::types::v25::*;
 pub use crate::client_sync::{
     v17::{
         AddNodeCommand, ImportMultiRequest, ImportMultiScriptPubKey, ImportMultiTimestamp, Input, Output, SetBanCommand, TemplateRequest, TemplateRules,
-        WalletCreateFundedPsbtInput, ScanAction, ScanObject,
+        WalletCreateFundedPsbtInput,
     },
     v21::ImportDescriptorsRequest,
     v23::AddressType,