diff --git a/stellar_rust_sdk/src/accounts/accounts_request.rs b/stellar_rust_sdk/src/accounts/accounts_request.rs index 5cf0bd9..2beb4a2 100644 --- a/stellar_rust_sdk/src/accounts/accounts_request.rs +++ b/stellar_rust_sdk/src/accounts/accounts_request.rs @@ -198,7 +198,7 @@ macro_rules! valid_generic_account_request_impl { /// # use stellar_rs::models::Request; /// # let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); /// let request = AccountsRequest::new() -/// .set_sponsor_filter("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7".to_string()) +/// .set_sponsor_filter("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7") /// .unwrap(); /// // Now, you can pass `request` to `horizon_client.get_account_list`. /// ``` @@ -345,11 +345,12 @@ impl AccountsRequest ) -> Result< AccountsRequest, String, > { + let sponsor = sponsor.into(); if let Err(e) = is_public_key(&sponsor) { return Err(e.to_string()); } @@ -437,7 +438,7 @@ mod tests { #[test] fn test_accounts_request_set_sponsor_filter() { - let request = AccountsRequest::new().set_sponsor_filter("sponsor".to_string()); + let request = AccountsRequest::new().set_sponsor_filter("sponsor"); assert!(request.is_err()); } @@ -445,9 +446,7 @@ mod tests { #[test] fn test_accounts_set_sponsor_valid() { let request = AccountsRequest::new() - .set_sponsor_filter( - "GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7".to_string(), - ) + .set_sponsor_filter("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7") .unwrap(); assert_eq!( request.sponsor.0, diff --git a/stellar_rust_sdk/src/assets/mod.rs b/stellar_rust_sdk/src/assets/mod.rs index b470658..4f16e2e 100644 --- a/stellar_rust_sdk/src/assets/mod.rs +++ b/stellar_rust_sdk/src/assets/mod.rs @@ -105,6 +105,11 @@ pub mod test { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); // construct request + AllAssetsRequest::new() + .set_asset_code(ASSET_CODE) + .unwrap() + .set_asset_issuer(ASSET_ISSUER) + .unwrap(); let all_assets_request: AllAssetsRequest = AllAssetsRequest::new().set_limit(1).unwrap(); let response = horizon_client.get_all_assets(&all_assets_request).await; diff --git a/stellar_rust_sdk/src/claimable_balances/all_claimable_balances_request.rs b/stellar_rust_sdk/src/claimable_balances/all_claimable_balances_request.rs index 2909285..9603fe0 100644 --- a/stellar_rust_sdk/src/claimable_balances/all_claimable_balances_request.rs +++ b/stellar_rust_sdk/src/claimable_balances/all_claimable_balances_request.rs @@ -21,9 +21,9 @@ use stellar_rust_sdk_derive::pagination; /// # use stellar_rs::models::{Asset, Order, IssuedAsset}; /// /// let request = AllClaimableBalancesRequest::new() -/// .set_sponsor("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7".to_string()).unwrap() // Optional sponsor filter +/// .set_sponsor("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7").unwrap() // Optional sponsor filter /// .set_asset(Asset::new().set_issued("USD", "GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7").unwrap()) // Optional asset filter -/// .set_claimant("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7".to_string()).unwrap() // Optional claimant filter +/// .set_claimant("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7").unwrap() // Optional claimant filter /// .set_cursor(123).unwrap() // Optional cursor for pagination /// .set_limit(100).unwrap() // Optional limit for response records /// .set_order(Order::Desc); // Optional order of records @@ -81,7 +81,8 @@ impl AllClaimableBalancesRequest { /// # Arguments /// * `sponsor` - A Stellar public key of the sponsor whose claimable balances are to be retrieved. /// - pub fn set_sponsor(self, sponsor: String) -> Result { + pub fn set_sponsor(self, sponsor: impl Into) -> Result { + let sponsor = sponsor.into(); if let Err(e) = is_public_key(&sponsor) { return Err(e.to_string()); } @@ -109,7 +110,8 @@ impl AllClaimableBalancesRequest { /// # Arguments /// * `claimant` - A Stellar public key of the claimant whose claimable balances are to be retrieved. /// - pub fn set_claimant(self, claimant: String) -> Result { + pub fn set_claimant(self, claimant: impl Into) -> Result { + let claimant = claimant.into(); if let Err(e) = is_public_key(&claimant) { return Err(e.to_string()); } diff --git a/stellar_rust_sdk/src/claimable_balances/mod.rs b/stellar_rust_sdk/src/claimable_balances/mod.rs index b1b4c6a..21dc194 100644 --- a/stellar_rust_sdk/src/claimable_balances/mod.rs +++ b/stellar_rust_sdk/src/claimable_balances/mod.rs @@ -219,7 +219,7 @@ mod tests { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let single_claimable_balance_request = SingleClaimableBalanceRequest::new() - .set_claimable_balance_id(CLAIMABLE_BALANCE_ID.to_string()); + .set_claimable_balance_id(CLAIMABLE_BALANCE_ID); let single_claimable_balance_response = horizon_client .get_single_claimable_balance(&single_claimable_balance_request) diff --git a/stellar_rust_sdk/src/claimable_balances/single_claimable_balance_request.rs b/stellar_rust_sdk/src/claimable_balances/single_claimable_balance_request.rs index 8ace855..99c3687 100644 --- a/stellar_rust_sdk/src/claimable_balances/single_claimable_balance_request.rs +++ b/stellar_rust_sdk/src/claimable_balances/single_claimable_balance_request.rs @@ -33,7 +33,7 @@ pub struct NoClaimableBalanceId; /// # async fn fetch_single_claimable_balance() -> Result<(), Box> { /// # let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org")?; /// let request = SingleClaimableBalanceRequest::new() -/// .set_claimable_balance_id("00000000".to_string()); // Example claimable balance ID +/// .set_claimable_balance_id("00000000"); // Example claimable balance ID /// /// let response = horizon_client.get_single_claimable_balance(&request).await?; /// // Process the response @@ -59,10 +59,10 @@ impl SingleClaimableBalanceRequest { /// pub fn set_claimable_balance_id( self, - claimable_balance_id: String, + claimable_balance_id: impl Into, ) -> SingleClaimableBalanceRequest { SingleClaimableBalanceRequest { - claimable_balance_id: ClaimableBalanceId(claimable_balance_id), + claimable_balance_id: ClaimableBalanceId(claimable_balance_id.into()), } } } @@ -91,13 +91,13 @@ mod tests { #[test] fn test_single_claimable_balance_request() { let request = - SingleClaimableBalanceRequest::new().set_claimable_balance_id("00000000".to_string()); + SingleClaimableBalanceRequest::new().set_claimable_balance_id("00000000"); - assert_eq!(request.get_query_parameters(), "00000000".to_string()); + assert_eq!(request.get_query_parameters(), "00000000"); assert_eq!( request.build_url("https://horizon-testnet.stellar.org"), - "https://horizon-testnet.stellar.org/claimable_balances/00000000".to_string() + "https://horizon-testnet.stellar.org/claimable_balances/00000000" ); } } diff --git a/stellar_rust_sdk/src/effects/effects_for_liquidity_pools_request.rs b/stellar_rust_sdk/src/effects/effects_for_liquidity_pools_request.rs index 526a193..c136047 100644 --- a/stellar_rust_sdk/src/effects/effects_for_liquidity_pools_request.rs +++ b/stellar_rust_sdk/src/effects/effects_for_liquidity_pools_request.rs @@ -25,7 +25,7 @@ use stellar_rust_sdk_derive::pagination; /// # use stellar_rs::models::*; /// /// let request = EffectsForLiquidityPoolRequest::new() -/// .set_liquidity_pool_id("01c58ab8fb283c8b083a26bf2fe06b7b6c6304c13f9d29d956cdf15a48bea72d".to_string()) +/// .set_liquidity_pool_id("01c58ab8fb283c8b083a26bf2fe06b7b6c6304c13f9d29d956cdf15a48bea72d") /// .set_cursor(1234).unwrap() /// .set_limit(20).unwrap() /// .set_order(Order::Desc); @@ -53,10 +53,10 @@ impl EffectsForLiquidityPoolRequest { /// pub fn set_liquidity_pool_id( self, - liquidity_pool_id: String, + liquidity_pool_id: impl Into, ) -> EffectsForLiquidityPoolRequest { EffectsForLiquidityPoolRequest { - liquidity_pool_id: Some(liquidity_pool_id), + liquidity_pool_id: Some(liquidity_pool_id.into()), ..self } } @@ -94,7 +94,7 @@ mod tests { #[test] fn test_effects_for_liquidity_pools_request() { let request = EffectsForLiquidityPoolRequest::new() - .set_liquidity_pool_id("liquidity_pool_id".to_string()) + .set_liquidity_pool_id("liquidity_pool_id") .set_cursor(1) .unwrap() .set_limit(10) diff --git a/stellar_rust_sdk/src/effects/effects_for_operation_request.rs b/stellar_rust_sdk/src/effects/effects_for_operation_request.rs index 9457166..4ac2640 100644 --- a/stellar_rust_sdk/src/effects/effects_for_operation_request.rs +++ b/stellar_rust_sdk/src/effects/effects_for_operation_request.rs @@ -47,9 +47,9 @@ impl EffectsForOperationRequest { EffectsForOperationRequest::default() } - pub fn set_operation_id(self, operation_id: &str) -> EffectsForOperationRequest { + pub fn set_operation_id(self, operation_id: impl Into) -> EffectsForOperationRequest { EffectsForOperationRequest { - operation_id: Some(operation_id.to_string()), + operation_id: Some(operation_id.into()), ..self } } diff --git a/stellar_rust_sdk/src/effects/effects_for_transaction_request.rs b/stellar_rust_sdk/src/effects/effects_for_transaction_request.rs index 4dbc52e..787f45b 100644 --- a/stellar_rust_sdk/src/effects/effects_for_transaction_request.rs +++ b/stellar_rust_sdk/src/effects/effects_for_transaction_request.rs @@ -21,7 +21,7 @@ use stellar_rust_sdk_derive::pagination; /// # use stellar_rs::models::*; /// /// let request = EffectForTransactionRequest::new() -/// .set_transaction_hash("transaction_hash".to_string()) +/// .set_transaction_hash("transaction_hash") /// .set_cursor(1234).unwrap() /// .set_limit(20).unwrap() /// .set_order(Order::Desc); @@ -46,9 +46,9 @@ impl EffectForTransactionRequest { /// # Arguments /// * `liquidity_pool_id` - A `String` value representing the liquidity pool id. /// - pub fn set_transaction_hash(self, transaction_hash: String) -> EffectForTransactionRequest { + pub fn set_transaction_hash(self, transaction_hash: impl Into) -> EffectForTransactionRequest { EffectForTransactionRequest { - transaction_hash: Some(transaction_hash), + transaction_hash: Some(transaction_hash.into()), ..self } } @@ -85,7 +85,7 @@ mod tests { #[test] fn test_effects_for_liquidity_pools_request() { let request = EffectForTransactionRequest::new() - .set_transaction_hash("transaction_hash".to_string()) + .set_transaction_hash("transaction_hash") .set_cursor(1) .unwrap() .set_limit(10) diff --git a/stellar_rust_sdk/src/effects/mod.rs b/stellar_rust_sdk/src/effects/mod.rs index 564dfc0..cb46357 100644 --- a/stellar_rust_sdk/src/effects/mod.rs +++ b/stellar_rust_sdk/src/effects/mod.rs @@ -234,7 +234,7 @@ mod tests { let _effects_for_liquidity_pools_request_with_id = EffectsForLiquidityPoolRequest::new() .set_limit(2) .expect("REASON") - .set_liquidity_pool_id("0000000459561504769-0000000001".to_string()); + .set_liquidity_pool_id("0000000459561504769-0000000001"); let effects_for_liquidity_pools_response = horizon_client .get_effects_for_liquidity_pools(&effects_for_liquidity_pools_request) .await; @@ -335,7 +335,7 @@ mod tests { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let effects_for_transaction_request = EffectForTransactionRequest::new() - .set_transaction_hash(TRANSACTION_HASH.to_string()) + .set_transaction_hash(TRANSACTION_HASH) .set_limit(2) .unwrap(); diff --git a/stellar_rust_sdk/src/horizon_client.rs b/stellar_rust_sdk/src/horizon_client.rs index 1305d90..5bf031d 100644 --- a/stellar_rust_sdk/src/horizon_client.rs +++ b/stellar_rust_sdk/src/horizon_client.rs @@ -367,7 +367,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = AllClaimableBalancesRequest::new() - /// .set_sponsor("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7".to_string()) + /// .set_sponsor("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7") /// .unwrap(); /// /// let response = horizon_client.get_all_claimable_balances(&request).await; @@ -425,7 +425,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = SingleClaimableBalanceRequest::new() - /// .set_claimable_balance_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string()); + /// .set_claimable_balance_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca"); /// /// let response = horizon_client.get_single_claimable_balance(&request).await; /// @@ -627,7 +627,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = EffectForTransactionRequest::new() - /// .set_transaction_hash("transaction_hash".to_string()); + /// .set_transaction_hash("transaction_hash"); /// /// let response = horizon_client.get_effects_for_transaction(&request).await; /// @@ -1114,7 +1114,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = SingleOperationRequest::new() - /// .set_operation_id("459561504769".to_string()); + /// .set_operation_id("459561504769"); /// /// let response = horizon_client.get_single_operation(&request).await; /// @@ -1261,7 +1261,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = OperationsForLiquidityPoolRequest::new() - /// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string()); + /// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca"); /// /// let response = horizon_client.get_operations_for_liquidity_pool(&request).await; /// @@ -1312,7 +1312,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = OperationsForTransactionRequest::new() - /// .set_transaction_hash("b9d0b2292c4e09e8eb22d036171491e87b8d2086bf8b265874c8d182cb9c9020".to_string()); + /// .set_transaction_hash("b9d0b2292c4e09e8eb22d036171491e87b8d2086bf8b265874c8d182cb9c9020"); /// /// let response = horizon_client.get_operations_for_transaction(&request).await; /// @@ -1557,7 +1557,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = TradesForLiquidityPoolRequest::new() - /// .set_liquidity_pool_id("0b3c88caa5aeada296646c1810893e3b04cba0426cff8ff6a63cf6f35cc7f5b3".to_string()) + /// .set_liquidity_pool_id("0b3c88caa5aeada296646c1810893e3b04cba0426cff8ff6a63cf6f35cc7f5b3") /// .unwrap(); /// /// let response = horizon_client.get_trades_for_liquidity_pool(&request).await; @@ -1707,7 +1707,7 @@ impl HorizonClient { /// # let base_url = "https://horizon-testnet.stellar.org"; /// # let horizon_client = HorizonClient::new(base_url)?; /// let request = SingleLiquidityPoolRequest::new() - /// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string()).unwrap(); + /// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca").unwrap(); /// /// let response = horizon_client.get_single_liquidity_pool(&request).await; /// @@ -1762,7 +1762,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = SingleTransactionRequest::new() - /// .set_transaction_hash("be0d59c8706e8fd525d2ab10910a55ec57323663858c65b330a3f93afb13ab0f".to_string()) // example transaction hash + /// .set_transaction_hash("be0d59c8706e8fd525d2ab10910a55ec57323663858c65b330a3f93afb13ab0f") // example transaction hash /// .unwrap(); /// /// let response = horizon_client.get_single_transaction(&request).await; @@ -1913,7 +1913,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = TransactionsForLedgerRequest::new() - /// .set_ledger_sequence("539".to_string()).unwrap() + /// .set_ledger_sequence("539").unwrap() /// .set_include_failed(true).unwrap(); /// /// let response = horizon_client.get_transactions_for_ledger(&request).await; @@ -1964,7 +1964,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = TransactionsForLiquidityPoolRequest::new() - /// .set_liquidity_pool_id("0066b15f5d0dc0be771209c33f3e4126383e58183a598eae8b3813024c6a6d10".to_string()).unwrap() + /// .set_liquidity_pool_id("0066b15f5d0dc0be771209c33f3e4126383e58183a598eae8b3813024c6a6d10").unwrap() /// .set_include_failed(true).unwrap(); /// /// let response = horizon_client.get_transactions_for_liquidity_pool(&request).await; @@ -2189,7 +2189,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = PaymentsForLedgerRequest::new() - /// .set_ledger_sequence("48483".to_string()); + /// .set_ledger_sequence("48483"); /// /// let response = horizon_client.get_payments_for_ledger(&request).await; /// @@ -2240,7 +2240,7 @@ impl HorizonClient { /// # let horizon_client = HorizonClient::new(base_url) /// # .expect("Failed to create Horizon Client"); /// let request = PaymentsForTransactionRequest::new() - /// .set_transaction_hash("be0d59c8706e8fd525d2ab10910a55ec57323663858c65b330a3f93afb13ab0f".to_string()); + /// .set_transaction_hash("be0d59c8706e8fd525d2ab10910a55ec57323663858c65b330a3f93afb13ab0f"); /// /// let response = horizon_client.get_payments_for_transaction(&request).await; /// diff --git a/stellar_rust_sdk/src/lib.rs b/stellar_rust_sdk/src/lib.rs index 69b1590..c74922a 100644 --- a/stellar_rust_sdk/src/lib.rs +++ b/stellar_rust_sdk/src/lib.rs @@ -368,7 +368,7 @@ pub mod fee_stats; /// /// // Example: Fetching fee stats /// let single_lp_request = SingleLiquidityPoolRequest::new() -/// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string()) +/// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca") /// .unwrap(); /// let lp_response = horizon_client.get_single_liquidity_pool(&single_lp_request).await?; /// @@ -571,7 +571,7 @@ pub mod trade_aggregations; /// /// // Example: Fetching a transaction /// let single_transaction_request = SingleTransactionRequest::new() -/// .set_transaction_hash("be0d59c8706e8fd525d2ab10910a55ec57323663858c65b330a3f93afb13ab0f".to_string()) +/// .set_transaction_hash("be0d59c8706e8fd525d2ab10910a55ec57323663858c65b330a3f93afb13ab0f") /// .unwrap(); /// let single_transaction_response = horizon_client.get_single_transaction(&single_transaction_request).await?; /// diff --git a/stellar_rust_sdk/src/liquidity_pools/mod.rs b/stellar_rust_sdk/src/liquidity_pools/mod.rs index e28722e..35387b0 100644 --- a/stellar_rust_sdk/src/liquidity_pools/mod.rs +++ b/stellar_rust_sdk/src/liquidity_pools/mod.rs @@ -302,7 +302,7 @@ async fn test_get_single_liquidity_pool() { let single_liquidity_pool_request = SingleLiquidityPoolRequest::new() .set_liquidity_pool_id( - "03eac63a834b31201652ed575c816b4e7beb0c4eece47caf956ff83648f486d0".to_string(), + "03eac63a834b31201652ed575c816b4e7beb0c4eece47caf956ff83648f486d0" ) .unwrap(); diff --git a/stellar_rust_sdk/src/liquidity_pools/single_liquidity_pool_request.rs b/stellar_rust_sdk/src/liquidity_pools/single_liquidity_pool_request.rs index f6ebca6..2b602f5 100644 --- a/stellar_rust_sdk/src/liquidity_pools/single_liquidity_pool_request.rs +++ b/stellar_rust_sdk/src/liquidity_pools/single_liquidity_pool_request.rs @@ -29,7 +29,7 @@ pub struct NoLiquidityPoolId; /// # use stellar_rs::liquidity_pools::prelude::SingleLiquidityPoolRequest; /// # use stellar_rs::models::Request; /// let request = SingleLiquidityPoolRequest::new() -/// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca".to_string()) +/// .set_liquidity_pool_id("000000006520216af66d20d63a58534d6cbdf28ba9f2a9c1e03f8d9a756bb7d988b29bca") /// .unwrap(); /// // Use with HorizonClient::get_single_liquidity_pool /// ``` @@ -53,10 +53,10 @@ impl SingleLiquidityPoolRequest { /// pub fn set_liquidity_pool_id( self, - liquidity_pool_id: String, + liquidity_pool_id: impl Into, ) -> Result, String> { Ok(SingleLiquidityPoolRequest { - liquidity_pool_id: LiquidityPoolId(liquidity_pool_id), + liquidity_pool_id: LiquidityPoolId(liquidity_pool_id.into()), }) } } diff --git a/stellar_rust_sdk/src/offers/all_offers_request.rs b/stellar_rust_sdk/src/offers/all_offers_request.rs index 982e65c..43fdbc8 100644 --- a/stellar_rust_sdk/src/offers/all_offers_request.rs +++ b/stellar_rust_sdk/src/offers/all_offers_request.rs @@ -20,8 +20,8 @@ use stellar_rust_sdk_derive::pagination; /// use stellar_rs::models::{Asset, NativeAsset, Order}; /// /// let request = AllOffersRequest::new() -/// .set_sponsor("GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5".to_string()).unwrap() // Optional sponsor filter -/// .set_seller("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7".to_string()).unwrap() // Optional seller filter +/// .set_sponsor("GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5").unwrap() // Optional sponsor filter +/// .set_seller("GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7").unwrap() // Optional seller filter /// .set_selling(Asset::new().set_issued("USD", "GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7").unwrap()) // Optional selling asset filter /// .set_buying(Asset::new().set_issued("USD", "GDQJUTQYK2MQX2VGDR2FYWLIYAQIEGXTQVTFEMGH2BEWFG4BRUY4CKI7").unwrap()) // Optional buying asset filter /// .set_cursor(123).unwrap() // Optional cursor for pagination @@ -83,7 +83,8 @@ impl AllOffersRequest { /// # Arguments /// * `sponsor` - A Stellar public key of the sponsor to filter offers by. /// - pub fn set_sponsor(self, sponsor: String) -> Result { + pub fn set_sponsor(self, sponsor: impl Into) -> Result { + let sponsor = sponsor.into(); if let Err(e) = is_public_key(&sponsor) { return Err(e.to_string()); } @@ -99,7 +100,8 @@ impl AllOffersRequest { /// # Arguments /// * `seller` - A Stellar public key of the seller to filter offers by. /// - pub fn set_seller(self, seller: String) -> Result { + pub fn set_seller(self, seller: impl Into) -> Result { + let seller = seller.into(); if let Err(e) = is_public_key(&seller) { return Err(e.to_string()); } diff --git a/stellar_rust_sdk/src/offers/mod.rs b/stellar_rust_sdk/src/offers/mod.rs index ffcd2d9..58ace4f 100644 --- a/stellar_rust_sdk/src/offers/mod.rs +++ b/stellar_rust_sdk/src/offers/mod.rs @@ -238,7 +238,7 @@ pub mod test { // Create a request and supply values for optional filters. let all_offers_request = AllOffersRequest::new() - .set_seller(SELLER.to_string()) + .set_seller(SELLER) .unwrap() .set_cursor(1) .unwrap() diff --git a/stellar_rust_sdk/src/operations/mod.rs b/stellar_rust_sdk/src/operations/mod.rs index 0218395..a8678ad 100644 --- a/stellar_rust_sdk/src/operations/mod.rs +++ b/stellar_rust_sdk/src/operations/mod.rs @@ -196,7 +196,7 @@ pub mod tests { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let single_operation_request = - SingleOperationRequest::new().set_operation_id(ID.to_string()); + SingleOperationRequest::new().set_operation_id(ID); let all_operations_response: Result = horizon_client .get_single_operation(&single_operation_request) @@ -412,7 +412,7 @@ pub mod tests { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let operations_for_transaction_request = OperationsForTransactionRequest::new() - .set_transaction_hash(REQUEST_TRANSACTION_HASH.to_string()) + .set_transaction_hash(REQUEST_TRANSACTION_HASH) .set_limit(2) .unwrap(); diff --git a/stellar_rust_sdk/src/operations/operations_for_liquidity_pool_request.rs b/stellar_rust_sdk/src/operations/operations_for_liquidity_pool_request.rs index 1ac219f..7bfe976 100644 --- a/stellar_rust_sdk/src/operations/operations_for_liquidity_pool_request.rs +++ b/stellar_rust_sdk/src/operations/operations_for_liquidity_pool_request.rs @@ -40,10 +40,10 @@ impl OperationsForLiquidityPoolRequest { /// pub fn set_liquidity_pool_id( self, - liquidity_pool_id: String, + liquidity_pool_id: impl Into, ) -> OperationsForLiquidityPoolRequest { OperationsForLiquidityPoolRequest { - liquidity_pool_id: Some(liquidity_pool_id), + liquidity_pool_id: Some(liquidity_pool_id.into()), ..self } } diff --git a/stellar_rust_sdk/src/operations/operations_for_transaction_request.rs b/stellar_rust_sdk/src/operations/operations_for_transaction_request.rs index 75d30ef..da3c45a 100644 --- a/stellar_rust_sdk/src/operations/operations_for_transaction_request.rs +++ b/stellar_rust_sdk/src/operations/operations_for_transaction_request.rs @@ -22,9 +22,9 @@ impl OperationsForTransactionRequest { /// # Arguments /// * `transaction_hash` - A `String` representing the transaction hash. /// - pub fn set_transaction_hash(self, transaction_hash: String) -> OperationsForTransactionRequest { + pub fn set_transaction_hash(self, transaction_hash: impl Into) -> OperationsForTransactionRequest { OperationsForTransactionRequest { - transaction_hash: Some(transaction_hash), + transaction_hash: Some(transaction_hash.into()), ..self } } diff --git a/stellar_rust_sdk/src/operations/single_operation_request.rs b/stellar_rust_sdk/src/operations/single_operation_request.rs index ecdda8e..23fa95e 100644 --- a/stellar_rust_sdk/src/operations/single_operation_request.rs +++ b/stellar_rust_sdk/src/operations/single_operation_request.rs @@ -24,7 +24,7 @@ pub struct NoOperationId; /// # use stellar_rs::operations::prelude::SingleOperationRequest; /// # use stellar_rs::models::Request; /// let request = SingleOperationRequest::new() -/// .set_operation_id("123456".to_string()); +/// .set_operation_id("123456"); /// // Use with HorizonClient::get_single_operation /// ``` /// @@ -45,9 +45,9 @@ impl SingleOperationRequest { /// # Arguments /// * `operation_id` - A `String` specifying the operation ID. /// - pub fn set_operation_id(self, operation_id: String) -> SingleOperationRequest { + pub fn set_operation_id(self, operation_id: impl Into) -> SingleOperationRequest { SingleOperationRequest { - operation_id: OperationId(operation_id), + operation_id: OperationId(operation_id.into()), } } } diff --git a/stellar_rust_sdk/src/payments/mod.rs b/stellar_rust_sdk/src/payments/mod.rs index bb48fb7..e68634a 100644 --- a/stellar_rust_sdk/src/payments/mod.rs +++ b/stellar_rust_sdk/src/payments/mod.rs @@ -156,7 +156,7 @@ pub mod test { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let payments_for_ledger_request: PaymentsForLedgerRequest = PaymentsForLedgerRequest::new() - .set_ledger_sequence(LEDGER_SEQUENCE.to_string()) + .set_ledger_sequence(LEDGER_SEQUENCE) .set_include_failed(IncludeFailed::False) .set_limit(1) .unwrap(); @@ -190,9 +190,7 @@ pub mod test { let payments_for_transaction_request: PaymentsForTransactionRequest = PaymentsForTransactionRequest::new() - .set_transaction_hash( - "b9d0b2292c4e09e8eb22d036171491e87b8d2086bf8b265874c8d182cb9c9020".to_string(), - ) + .set_transaction_hash("b9d0b2292c4e09e8eb22d036171491e87b8d2086bf8b265874c8d182cb9c9020") .set_limit(1) .unwrap(); diff --git a/stellar_rust_sdk/src/payments/payments_for_ledger_request.rs b/stellar_rust_sdk/src/payments/payments_for_ledger_request.rs index 1266f6d..415af7f 100644 --- a/stellar_rust_sdk/src/payments/payments_for_ledger_request.rs +++ b/stellar_rust_sdk/src/payments/payments_for_ledger_request.rs @@ -29,8 +29,8 @@ impl PaymentsForLedgerRequest { /// # Arguments /// * `account_id` - The Stellar address of the account for which you want to retrieve payments. /// - pub fn set_ledger_sequence(mut self, ledger_sequence: String) -> PaymentsForLedgerRequest { - self.ledger_sequence = Some(ledger_sequence); + pub fn set_ledger_sequence(mut self, ledger_sequence: impl Into) -> PaymentsForLedgerRequest { + self.ledger_sequence = Some(ledger_sequence.into()); self } diff --git a/stellar_rust_sdk/src/payments/payments_for_transaction_request.rs b/stellar_rust_sdk/src/payments/payments_for_transaction_request.rs index df5fd6e..39682d5 100644 --- a/stellar_rust_sdk/src/payments/payments_for_transaction_request.rs +++ b/stellar_rust_sdk/src/payments/payments_for_transaction_request.rs @@ -28,9 +28,9 @@ impl PaymentsForTransactionRequest { /// pub fn set_transaction_hash( mut self, - transaction_hash: String, + transaction_hash: impl Into, ) -> PaymentsForTransactionRequest { - self.transaction_hash = Some(transaction_hash); + self.transaction_hash = Some(transaction_hash.into()); self } } diff --git a/stellar_rust_sdk/src/trades/mod.rs b/stellar_rust_sdk/src/trades/mod.rs index 03fb145..2c43c4c 100644 --- a/stellar_rust_sdk/src/trades/mod.rs +++ b/stellar_rust_sdk/src/trades/mod.rs @@ -316,7 +316,7 @@ pub mod test { const PRICE_D: &str = "93486278"; let trades_for_liquidity_pool_request = TradesForLiquidityPoolRequest::new() - .set_liquidity_pool_id(LIQUIDITY_POOL_ID.to_string()) + .set_liquidity_pool_id(LIQUIDITY_POOL_ID) .unwrap(); let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let trades_for_liquidity_pool_response = horizon_client diff --git a/stellar_rust_sdk/src/trades/trades_for_liquidity_pool_request.rs b/stellar_rust_sdk/src/trades/trades_for_liquidity_pool_request.rs index ea0d630..a6d5c53 100644 --- a/stellar_rust_sdk/src/trades/trades_for_liquidity_pool_request.rs +++ b/stellar_rust_sdk/src/trades/trades_for_liquidity_pool_request.rs @@ -32,10 +32,10 @@ impl TradesForLiquidityPoolRequest { /// pub fn set_liquidity_pool_id( self, - liquidity_pool_id: String, + liquidity_pool_id: impl Into, ) -> Result, String> { Ok(TradesForLiquidityPoolRequest { - liquidity_pool_id: TradeLiquidityPoolId(liquidity_pool_id), + liquidity_pool_id: TradeLiquidityPoolId(liquidity_pool_id.into()), cursor: self.cursor, limit: self.limit, order: self.order, diff --git a/stellar_rust_sdk/src/transactions/mod.rs b/stellar_rust_sdk/src/transactions/mod.rs index 05040ff..b33eff1 100644 --- a/stellar_rust_sdk/src/transactions/mod.rs +++ b/stellar_rust_sdk/src/transactions/mod.rs @@ -163,7 +163,7 @@ pub mod test { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let single_transaction_request = SingleTransactionRequest::new() - .set_transaction_hash(ID.to_string()) + .set_transaction_hash(ID) .unwrap(); let single_transaction_response = horizon_client @@ -385,7 +385,7 @@ pub mod test { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let transactions_for_ledger_request = TransactionsForLedgerRequest::new() - .set_ledger_sequence(LEDGER_SEQUENCE.to_string()) + .set_ledger_sequence(LEDGER_SEQUENCE) .unwrap() .set_include_failed(true) .unwrap(); @@ -490,7 +490,7 @@ pub mod test { let horizon_client = HorizonClient::new("https://horizon-testnet.stellar.org").unwrap(); let transactions_for_liquidity_pool_request = TransactionsForLiquidityPoolRequest::new() - .set_liquidity_pool_id(LIQUIDITY_POOL_ID.to_string()) + .set_liquidity_pool_id(LIQUIDITY_POOL_ID) .unwrap() .set_include_failed(true) .unwrap(); diff --git a/stellar_rust_sdk/src/transactions/single_transaction_request.rs b/stellar_rust_sdk/src/transactions/single_transaction_request.rs index 214fe1d..a443d0e 100644 --- a/stellar_rust_sdk/src/transactions/single_transaction_request.rs +++ b/stellar_rust_sdk/src/transactions/single_transaction_request.rs @@ -27,8 +27,9 @@ impl SingleTransactionRequest { /// pub fn set_transaction_hash( self, - transaction_hash: String, + transaction_hash: impl Into, ) -> Result, String> { + let transaction_hash = transaction_hash.into(); match transaction_hash.len() { 64 => Ok(SingleTransactionRequest { transaction_hash: TransactionHash(transaction_hash), diff --git a/stellar_rust_sdk/src/transactions/transactions_for_ledger_request.rs b/stellar_rust_sdk/src/transactions/transactions_for_ledger_request.rs index 7f7023d..612f47d 100644 --- a/stellar_rust_sdk/src/transactions/transactions_for_ledger_request.rs +++ b/stellar_rust_sdk/src/transactions/transactions_for_ledger_request.rs @@ -34,10 +34,10 @@ impl TransactionsForLedgerRequest { /// pub fn set_ledger_sequence( self, - ledger_sequence: String, + ledger_sequence: impl Into, ) -> Result, String> { Ok(TransactionsForLedgerRequest { - ledger_sequence: TransactionsLedgerId(ledger_sequence), + ledger_sequence: TransactionsLedgerId(ledger_sequence.into()), include_failed: self.include_failed, cursor: self.cursor, limit: self.limit, diff --git a/stellar_rust_sdk/src/transactions/transactions_for_liquidity_pool_request.rs b/stellar_rust_sdk/src/transactions/transactions_for_liquidity_pool_request.rs index e6d86c2..8d6bdea 100644 --- a/stellar_rust_sdk/src/transactions/transactions_for_liquidity_pool_request.rs +++ b/stellar_rust_sdk/src/transactions/transactions_for_liquidity_pool_request.rs @@ -34,10 +34,10 @@ impl TransactionsForLiquidityPoolRequest { /// pub fn set_liquidity_pool_id( self, - liquidity_pool_id: String, + liquidity_pool_id: impl Into, ) -> Result, String> { Ok(TransactionsForLiquidityPoolRequest { - liquidity_pool_id: TransactionsLiquidityPoolId(liquidity_pool_id), + liquidity_pool_id: TransactionsLiquidityPoolId(liquidity_pool_id.into()), include_failed: self.include_failed, cursor: self.cursor, limit: self.limit,