Refactor Tron fee calculation and improve code clarity

Refactored fee calculation logic for TRON token transfers, introducing a TokenTransferFee struct and utility methods for bandwidth and energy calculations. Updated related functions and tests to use the new abstractions, improving code clarity and maintainability. Also refactored contract call logic in the Tron RPC client for better separation of concerns and fixed minor formatting issues in test code.

Author: gemcoder21

crates/fiat/src/client.rs

@@ -668,9 +668,18 @@ mod tests {
         let transak = FiatQuote::mock("transak");
 
         let mut quotes = vec![
-            FiatQuote { crypto_amount: 0.036108, ..moonpay },
-            FiatQuote { crypto_amount: 0.03311059, ..mercuryo },
-            FiatQuote { crypto_amount: 0.03086637, ..transak },
+            FiatQuote {
+                crypto_amount: 0.036108,
+                ..moonpay
+            },
+            FiatQuote {
+                crypto_amount: 0.03311059,
+                ..mercuryo
+            },
+            FiatQuote {
+                crypto_amount: 0.03086637,
+                ..transak
+            },
         ];
 
         quotes.sort_by(|a, b| sort_quotes_by_crypto_amount_asc(a, b, &providers));

crates/gem_tron/src/provider/address_mapper.rs

@@ -45,12 +45,18 @@ impl TronAccount {
             address: Some(address.to_string()),
             owner_permission: Some(TronAccountOwnerPermission {
                 permission_name: "owner".to_string(),
-                keys: Some(vec![TronAccountPermissionKey { address: address.to_string(), weight: 1 }]),
+                keys: Some(vec![TronAccountPermissionKey {
+                    address: address.to_string(),
+                    weight: 1,
+                }]),
             }),
             active_permission: Some(vec![TronAccountPermission {
                 id: None,
                 threshold: 1,
-                keys: Some(vec![TronAccountPermissionKey { address: address.to_string(), weight: 1 }]),
+                keys: Some(vec![TronAccountPermissionKey {
+                    address: address.to_string(),
+                    weight: 1,
+                }]),
             }]),
             votes: None,
             frozen_v2: None,
@@ -83,16 +89,28 @@ mod tests {
     fn test_multiple_active_permissions() {
         let mut account = TronAccount::mock(ADDRESS);
         account.active_permission = Some(vec![
-            TronAccountPermission { id: None, threshold: 1, keys: None },
-            TronAccountPermission { id: None, threshold: 1, keys: None },
+            TronAccountPermission {
+                id: None,
+                threshold: 1,
+                keys: None,
+            },
+            TronAccountPermission {
+                id: None,
+                threshold: 1,
+                keys: None,
+            },
         ]);
         assert_eq!(map_address_status(&account), vec![AddressStatus::MultiSignature]);
     }
 
     #[test]
     fn test_high_threshold() {
         let mut account = TronAccount::mock(ADDRESS);
-        account.active_permission = Some(vec![TronAccountPermission { id: None, threshold: 2, keys: None }]);
+        account.active_permission = Some(vec![TronAccountPermission {
+            id: None,
+            threshold: 2,
+            keys: None,
+        }]);
         assert_eq!(map_address_status(&account), vec![AddressStatus::MultiSignature]);
     }
 
@@ -109,7 +127,11 @@ mod tests {
     #[test]
     fn test_active_permission_id_not_default() {
         let mut account = TronAccount::mock(ADDRESS);
-        account.active_permission = Some(vec![TronAccountPermission { id: Some(2), threshold: 1, keys: None }]);
+        account.active_permission = Some(vec![TronAccountPermission {
+            id: Some(2),
+            threshold: 1,
+            keys: None,
+        }]);
         assert_eq!(map_address_status(&account), vec![AddressStatus::MultiSignature]);
     }
 
@@ -118,7 +140,10 @@ mod tests {
         let mut account = TronAccount::mock(ADDRESS);
         account.owner_permission = Some(TronAccountOwnerPermission {
             permission_name: "owner".to_string(),
-            keys: Some(vec![TronAccountPermissionKey { address: OTHER_ADDRESS.to_string(), weight: 1 }]),
+            keys: Some(vec![TronAccountPermissionKey {
+                address: OTHER_ADDRESS.to_string(),
+                weight: 1,
+            }]),
         });
         assert_eq!(map_address_status(&account), vec![AddressStatus::MultiSignature]);
     }
@@ -129,7 +154,10 @@ mod tests {
         account.active_permission = Some(vec![TronAccountPermission {
             id: None,
             threshold: 1,
-            keys: Some(vec![TronAccountPermissionKey { address: OTHER_ADDRESS.to_string(), weight: 1 }]),
+            keys: Some(vec![TronAccountPermissionKey {
+                address: OTHER_ADDRESS.to_string(),
+                weight: 1,
+            }]),
         }]);
         assert_eq!(map_address_status(&account), vec![AddressStatus::MultiSignature]);
     }
@@ -140,8 +168,14 @@ mod tests {
         account.owner_permission = Some(TronAccountOwnerPermission {
             permission_name: "owner".to_string(),
             keys: Some(vec![
-                TronAccountPermissionKey { address: ADDRESS.to_string(), weight: 1 },
-                TronAccountPermissionKey { address: OTHER_ADDRESS.to_string(), weight: 1 },
+                TronAccountPermissionKey {
+                    address: ADDRESS.to_string(),
+                    weight: 1,
+                },
+                TronAccountPermissionKey {
+                    address: OTHER_ADDRESS.to_string(),
+                    weight: 1,
+                },
             ]),
         });
         assert_eq!(map_address_status(&account), vec![AddressStatus::MultiSignature]);

crates/gem_tron/src/provider/preload.rs

@@ -1,6 +1,5 @@
 use std::collections::HashMap;
 use std::error::Error;
-use std::str::FromStr;
 
 use async_trait::async_trait;
 use chain_traits::ChainTransactionLoad;
@@ -104,11 +103,14 @@ impl<C: Client> TronClient<C> {
         let estimated_energy = self
             .estimate_trc20_transfer_gas(sender_address, token_id, format_address_parameter(&destination_address)?, value)
             .await?;
-        let (total_fee, _chargeable_energy, energy_price) =
-            calculate_transfer_token_fee_rate(chain_parameters, account_usage, BigInt::from_str(&estimated_energy)?)?;
-        let gas_price_type = GasPriceType::regular(energy_price);
-
-        Ok(TransactionFee::new_gas_price_type(gas_price_type, total_fee.clone(), total_fee, HashMap::new()))
+        let token_fee = calculate_transfer_token_fee_rate(chain_parameters, account_usage, estimated_energy)?;
+
+        Ok(TransactionFee::new_gas_price_type(
+            GasPriceType::regular(BigInt::from(token_fee.energy_price)),
+            BigInt::from(token_fee.fee),
+            BigInt::from(token_fee.fee_limit),
+            HashMap::new(),
+        ))
     }
 
     async fn get_is_new_account_for_input_type(&self, address: &str, input_type: TransactionInputType) -> Result<bool, Box<dyn Error + Send + Sync>> {