Refactor SingleClaimableBalanceRequest

src/claimable_balances/single_claimable_balance_request.rs

@@ -1,21 +1,32 @@
 use crate::models::*;
 
-/// SingleClaimableBalanceRequest is the struct that implements the type for the /claimable_balances endpoint to get a single claimable balance
-/// [More Details](https://laboratory.stellar.org/#explorer?resource=claimable_balances&endpoint=single&network=test "Single Claimable Balance")
-#[derive(Debug)]
-pub struct SingleClaimableBalanceRequest {
-    /// Claimable Balance ID
-    /// [Stellar Documentation](https://developers.stellar.org/api/resources/claimablebalances/single/ "Claimable Balance ID")
-    claimable_balance_id: Option<String>,
+
+#[derive(Default, Clone)]
+pub struct Id(String);
+#[derive(Default, Clone)]
+pub struct NoId;
+
+#[derive(Default)]
+pub struct SingleClaimableBalanceRequest<I> {
+    claimable_balance_id: I,
 }
 
-impl Request for SingleClaimableBalanceRequest {
-    fn new() -> Self {
-        SingleClaimableBalanceRequest {
-            claimable_balance_id: None,
-        }
+impl SingleClaimableBalanceRequest<NoId> {
+    pub fn new() -> Self {
+        SingleClaimableBalanceRequest::default()
     }
+}
 
+impl<I> SingleClaimableBalanceRequest<I> {
+    pub fn set_claimable_balance_id(
+        self,
+        claimable_balance_id: String,
+    ) -> SingleClaimableBalanceRequest<Id> {
+        SingleClaimableBalanceRequest { claimable_balance_id: Id(claimable_balance_id) }
+    }
+}
+
+impl Request for SingleClaimableBalanceRequest<Id> {
     fn get_path(&self) -> &str {
         "/claimable_balances/"
     }
@@ -38,14 +49,3 @@ impl Request for SingleClaimableBalanceRequest {
     }
 }
 
-/// Returns the claimable balance ID
-/// # Arguments
-/// * `self` - The request object
-/// # Returns
-/// The claimable balance ID
-impl SingleClaimableBalanceRequest {
-    pub fn set_claimable_balance_id(&mut self, claimable_balance_id: String) -> &mut Self {
-        self.claimable_balance_id = Some(claimable_balance_id);
-        self
-    }
-}

src/horizon_client/horizon_client.rs

@@ -208,8 +208,8 @@ mod tests {
 
     use crate::{
         assets::prelude::AllAssetsRequest,
-        claimable_balances::prelude::SingleClaimableBalanceRequest,
-        ledgers::prelude::SingleLedgerRequest,
+        claimable_balances::{prelude::SingleClaimableBalanceRequest, single_claimable_balance_request},
+        ledgers::{prelude::SingleLedgerRequest, single_ledger_request},
     };
 
     use super::*;
@@ -1130,11 +1130,8 @@ mod tests {
         let horizon_client =
             HorizonClient::new("https://horizon-testnet.stellar.org".to_string()).unwrap();
 
-        // construct request
-        let mut single_claimable_balance_request = SingleClaimableBalanceRequest::new();
-        single_claimable_balance_request.set_claimable_balance_id(
-            "000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string(),
-        );
+        let single_claimable_balance_request = SingleClaimableBalanceRequest::new()
+            .set_claimable_balance_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string());
 
         let single_claimable_balance_response = horizon_client
             .get_single_claimable_balance(&single_claimable_balance_request)