warnings

Author: LeonardTibben

src/accounts/accounts_response.rs

@@ -5,17 +5,17 @@ use crate::models::Response;
 
 /// Struct defining the self link in the list all accounts response.
 #[derive(Debug, Deserialize, Serialize, Clone, Getters)]
-pub struct SelfLink {
+pub struct AccountsResponseSelfLink {
     href: String,
 }
 
 /// Struct defining the links in the list all accounts response.
 #[derive(Debug, Deserialize, Serialize, Clone, Getters)]
-pub struct Links {    
+pub struct AccountsResponseLinks {    
     #[serde(rename = "self")]
-    self_link: SelfLink,
-    next: Option<SelfLink>,
-    prev: Option<SelfLink>,
+    self_link: AccountsResponseSelfLink,
+    next: Option<AccountsResponseSelfLink>,
+    prev: Option<AccountsResponseSelfLink>,
 }
 
 /// Struct defining a single balance in the list all accounts response.
@@ -29,15 +29,15 @@ pub struct Balances {
 
 /// Struct defining the thresholds in the list all accounts response.
 #[derive(Debug, Deserialize, Serialize, Clone, Getters)]
-pub struct Thresholds {
+pub struct AccountsResponseThresholds {
     low_threshold: i32,
     med_threshold: i32,
     high_threshold: i32,
 }
 
 /// Struct defining the flags in the list all accounts response.
 #[derive(Debug, Deserialize, Serialize, Clone, Getters)]
-pub struct Flags {
+pub struct AccountsResponseFlags {
     auth_required: bool,
     auth_revocable: bool,
     auth_immutable: bool,
@@ -57,15 +57,15 @@ pub struct Signers {
 #[derive(Debug, Deserialize, Serialize, Clone, Getters)]
 pub struct Record {
     #[serde(rename = "_links")]
-    links: Links,
+    links: AccountsResponseLinks,
     id: String,
     account_id: String,
     sequence: String,
     subentry_count: i32,
     last_modified_ledger: i64,
     last_modified_time: String,
-    thresholds: Thresholds,
-    flags: Flags,
+    thresholds: AccountsResponseThresholds,
+    flags: AccountsResponseFlags,
     balances: Vec<Balances>,
     signers: Vec<Signers>,
     data: serde_json::Value,
@@ -83,7 +83,7 @@ pub struct Embedded {
 /// Struct defining the list all accounts response.
 #[derive(Debug, Deserialize, Serialize, Clone, Getters)]
 pub struct AccountsResponse {
-    _links: Links,
+    _links: AccountsResponseLinks,
     _embedded: Embedded,
 }
 

src/claimable_balances/all_claimable_balances_response.rs

@@ -10,23 +10,23 @@ use crate::models::Response;
 #[serde(rename_all = "camelCase")]
 pub struct AllClaimableBalancesResponse {
     #[serde(rename = "_links")]
-    links: Links,
+    links: AllClaimableBalancesLinks,
     #[serde(rename = "_embedded")]
     embedded: Embedded,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Links {
+pub struct AllClaimableBalancesLinks {
     #[serde(rename = "self")]
-    self_field: Self_field,
+    self_field: AllClaimableAssetsReponseSelfField,
     next: Next,
     prev: Prev,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Self_field {
+pub struct AllClaimableAssetsReponseSelfField {
     href: String,
 }
 
@@ -61,8 +61,8 @@ pub struct Record {
     last_modified_ledger: i64,
     #[serde(rename = "last_modified_time")]
     last_modified_time: String,
-    claimants: Vec<Claimant>,
-    flags: Flags,
+    claimants: Vec<AllClaimableAssetsResponseClaimant>,
+    flags: AllClaimableResponseFlags,
     #[serde(rename = "paging_token")]
     paging_token: String,
 }
@@ -71,49 +71,49 @@ pub struct Record {
 #[serde(rename_all = "camelCase")]
 pub struct RecordsLinks {
     #[serde(rename = "self")]
-    self_field: Records_Self_field,
-    transactions: Transactions,
-    operations: Operations,
+    self_field: RecordsSelfField,
+    transactions: AllClaimableAssetsResponseTransactions,
+    operations: AllClaimableAssetsResponseOperations,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Records_Self_field {
+pub struct RecordsSelfField {
     href: String,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Transactions {
+pub struct AllClaimableAssetsResponseTransactions {
     href: String,
     templated: bool,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Operations {
+pub struct AllClaimableAssetsResponseOperations {
     href: String,
     templated: bool,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Claimant {
+pub struct AllClaimableAssetsResponseClaimant {
     destination: String,
-    predicate: Predicate,
+    predicate: AllClaimableAssetsResponsePredicate,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Predicate {
+pub struct AllClaimableAssetsResponsePredicate {
     unconditional: Option<bool>,
-    or: Option<Vec<Or>>,
+    or: Option<Vec<AllClaimableAssetsOr>>,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Or {
-    and: Option<Vec<And>>,
+pub struct AllClaimableAssetsOr {
+    and: Option<Vec<AllClaimableAssetsResponseAnd>>,
     #[serde(rename = "abs_before")]
     abs_before: Option<String>,
     #[serde(rename = "abs_before_epoch")]
@@ -122,8 +122,8 @@ pub struct Or {
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct And {
-    not: Option<Not>,
+pub struct AllClaimableAssetsResponseAnd {
+    not: Option<AllClaimableBalancesResponseNot>,
     #[serde(rename = "abs_before")]
     abs_before: Option<String>,
     #[serde(rename = "abs_before_epoch")]
@@ -132,7 +132,7 @@ pub struct And {
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Not {
+pub struct AllClaimableBalancesResponseNot {
     #[serde(rename = "abs_before")]
     abs_before: String,
     #[serde(rename = "abs_before_epoch")]
@@ -141,7 +141,7 @@ pub struct Not {
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Flags {
+pub struct AllClaimableResponseFlags {
     #[serde(rename = "clawback_enabled")]
     clawback_enabled: bool,
 }
@@ -155,7 +155,7 @@ impl Response for AllClaimableBalancesResponse {
 }
 
 /// This method checks if a claim is valid at a specific datetime.
-impl Predicate {
+impl AllClaimableAssetsResponsePredicate {
     // This method checks if a claim is valid at a specific datetime.
     pub fn is_valid_claim(&self, datetime: DateTime<Utc>) -> bool {
         // If the predicate is marked as unconditional, the claim is always valid.
@@ -174,7 +174,7 @@ impl Predicate {
 }
 
 
-impl Or {
+impl AllClaimableAssetsOr {
     // This method checks if any condition under 'or' validates the claim.
     fn is_valid(&self, datetime: DateTime<Utc>) -> bool {
         // If there are 'and' conditions, check if any combination of these conditions is valid.
@@ -196,7 +196,7 @@ impl Or {
     }
 }
 
-impl And {
+impl AllClaimableAssetsResponseAnd {
     // This method checks if all conditions under 'and' are met.
     fn is_valid(&self, datetime: DateTime<Utc>) -> bool {
         let mut is_valid = true;
@@ -217,7 +217,7 @@ impl And {
     }
 }
 
-impl Not {
+impl AllClaimableBalancesResponseNot {
     // This method checks if the datetime does not fall before the specified date, negating the condition.
     fn is_valid(&self, datetime: DateTime<Utc>) -> bool {
         if let Ok(not_before_date) = DateTime::parse_from_rfc3339(&self.abs_before) {

src/claimable_balances/single_claimable_balance_response.rs

@@ -29,14 +29,14 @@ pub struct SingleClaimableBalanceResponse {
 #[serde(rename_all = "camelCase")]
 pub struct Links {
     #[serde(rename = "self")]
-    pub self_field: Self_field,
+    pub self_field: SelfField,
     pub transactions: Transactions,
     pub operations: Operations,
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, Getters)]
 #[serde(rename_all = "camelCase")]
-pub struct Self_field {
+pub struct SelfField {
     pub href: String,
 }
 

src/horizon_client/horizon_client.rs

@@ -15,8 +15,6 @@ use crate::{
 use reqwest;
 use url::Url;
 
-use crate::accounts::prelude::*;
-
 pub struct HorizonClient {
     /// The base URL for the Horizon server
     base_url: String,
@@ -165,7 +163,7 @@ impl HorizonClient {
 
         let url = request.build_url(&self.base_url);
         let response = reqwest::get(&url).await.map_err(|e| e.to_string())?;
-        println!("\n\nREQWEST RESPONSE: {:?}", response);
+        // println!("\n\nREQWEST RESPONSE: {:?}", response);
         let result: TResponse = handle_response(response).await?;
 
         // print!("\n\nResult: {:?}", result);
@@ -197,7 +195,7 @@ async fn handle_response<TResponse: Response>(
 }
 /// url_validate validates a URL
 fn url_validate(url: &str) -> Result<(), String> {
-    println!("URL: {}", url);
+    // println!("URL: {}", url);
     // check if start with http:// or https://
     if !url.starts_with("http://") && !url.starts_with("https://") {
         return Err(format!("URL must start with http:// or https://: {}", url));
@@ -209,8 +207,8 @@ fn url_validate(url: &str) -> Result<(), String> {
 
 #[cfg(test)]
 mod tests {
-    use base64::encode;
-    use chrono::{DateTime, TimeZone, Utc};
+    use base64::{Engine, engine::general_purpose};
+    use chrono::{ TimeZone, Utc};
 
     use crate::{
         assets::prelude::AllAssetsRequest,
@@ -883,8 +881,8 @@ mod tests {
         assert_eq!(decoded_xdr_header.max_tx_set_size, 100);
 
         let tx_set_hash = decoded_xdr_header.scp_value.tx_set_hash.to_string();
-        let tx_set_hash_bytes = hex::decode(tx_set_hash).expect("Failed to decode hex");
-        let tx_set_hash_base64 = encode(&tx_set_hash_bytes);
+        let tx_set_hash_bytes = hex::decode(tx_set_hash.clone()).expect("Failed to decode hex");
+        let tx_set_hash_base64 = general_purpose::STANDARD.encode(tx_set_hash_bytes.clone());
 
         assert_eq!(
             tx_set_hash_base64,

src/ledgers/ledgers_request.rs

@@ -1,6 +1,5 @@
 use crate::models::*;
 
-use super::super::AssetType;
 use super::super::Order;
 
 pub struct LedgersRequest {

src/ledgers/ledgers_response.rs

@@ -5,7 +5,7 @@ use crate::models::Response;
 
 /// Struct defining the self link in the list all ledgers response.
 #[derive(Debug, Deserialize, Clone, Getters)]
-pub struct Link {
+pub struct LedgersResponseLink {
     #[serde(rename = "self")]
     self_link: SelfLink,
     next: Option<SelfLink>,
@@ -21,7 +21,7 @@ pub struct SelfLink {
 /// Struct defining a record of a single ledger in the list all ledgers response.
 #[derive(Debug, Deserialize, Clone, Getters)]
 pub struct Records {
-    _links: Link,
+    _links: LedgersResponseLink,
     id: String,
     paging_token: String,
     hash: String,
@@ -50,7 +50,7 @@ pub struct Embedded {
 /// Struct defining the list all ledgers response.
 #[derive(Debug, Deserialize, Clone, Getters)]
 pub struct LedgersResponse {
-    _links: Link,
+    _links: LedgersResponseLink,
     _embedded: Embedded,
 }
 

src/ledgers/single_ledger_request.rs

@@ -1,8 +1,5 @@
 use crate::models::*;
 
-use super::super::AssetType;
-use super::super::Order;
-
 pub struct SingleLedgerRequest {
     /// The sequence of the ledger
     sequence: u32,

src/ledgers/single_ledger_response.rs

@@ -1,5 +1,5 @@
 use derive_getters::Getters;
-use serde::{de, Deserialize};
+use serde::Deserialize;
 use stellar_xdr::{LedgerHeader, ReadXdr};
 
 use crate::models::Response;

src/xdr/mod.rs

@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod tests {
 
-    use ::stellar_xdr::{LedgerHeader, ReadXdr};
+    use ::stellar_xdr::ReadXdr;
     use stellar_xdr::curr as stellar_xdr;
 
     // TODO, add vice versa.