Merge branch 'main' into feature/multi-issue-implementation

Author: elizabetheonoja-art

contracts/utility_contracts/src/debt_fuzz_tests.rs

@@ -17,11 +17,10 @@ mod debt_fuzz_tests {
         let token_address = env
             .register_stellar_asset_contract_v2(token_admin.clone())
             .address();
-        let token_admin_client =
-            soroban_sdk::token::StellarAssetClient::new(&env, &token_address);
+        let token_admin_client = soroban_sdk::token::StellarAssetClient::new(&env, &token_address);
 
         let device_public_key = BytesN::from_array(&env, &[1u8; 32]);
-        
+
         // Test PostPaid meter with extreme debt scenarios
         let meter_id = client.register_meter_with_mode(
             &user,
@@ -34,7 +33,7 @@ mod debt_fuzz_tests {
 
         // Test 1: High rate, long duration, zero balance scenario
         client.top_up(&meter_id, &1000000); // Initial collateral
-        
+
         // Pair meter for usage deduction
         let _challenge = client.initiate_pairing(&meter_id);
         let signature = BytesN::from_array(&env, &[2u8; 64]);
@@ -45,7 +44,7 @@ mod debt_fuzz_tests {
             meter_id,
             timestamp: env.ledger().timestamp(),
             watt_hours_consumed: 100_000_000_000i128, // 100 billion Wh
-            units_consumed: 10_000_000i128, // 10 million units
+            units_consumed: 10_000_000i128,           // 10 million units
             signature: BytesN::from_array(&env, &[3u8; 64]),
             public_key: device_public_key.clone(),
         };
@@ -54,42 +53,48 @@ mod debt_fuzz_tests {
         client.deduct_units(&extreme_usage);
 
         let meter = client.get_meter(&meter_id).unwrap();
-        
+
         // Verify debt is non-negative (critical underflow protection)
         assert!(meter.debt >= 0, "Debt should never be negative");
-        
+
         // Verify debt accumulated correctly
         assert!(meter.debt > 0, "Debt should be positive after usage");
 
         // Test 2: Verify debt clears correctly on top-up
         let debt_to_clear = meter.debt;
         token_admin_client.mint(&user, &debt_to_clear);
-        
+
         client.top_up(&meter_id, &debt_to_clear);
-        
+
         let meter_after_settlement = client.get_meter(&meter_id).unwrap();
-        
+
         // Debt should be fully cleared
-        assert_eq!(meter_after_settlement.debt, 0, "Debt should be fully cleared after sufficient top-up");
-        
+        assert_eq!(
+            meter_after_settlement.debt, 0,
+            "Debt should be fully cleared after sufficient top-up"
+        );
+
         // Collateral should be properly updated
-        assert!(meter_after_settlement.collateral_limit >= 0, "Collateral limit should remain non-negative");
+        assert!(
+            meter_after_settlement.collateral_limit >= 0,
+            "Collateral limit should remain non-negative"
+        );
 
         // Test 3: Test with maximum safe values to ensure no underflow
         let max_safe_usage = SignedUsageData {
             meter_id,
             timestamp: env.ledger().timestamp(),
             watt_hours_consumed: i128::MAX / 1_000_000, // Safe maximum
-            units_consumed: i128::MAX / 1_000_000_000, // Safe maximum
+            units_consumed: i128::MAX / 1_000_000_000,  // Safe maximum
             signature: BytesN::from_array(&env, &[4u8; 64]),
             public_key: device_public_key.clone(),
         };
 
         // Should handle maximum values without panicking
         client.deduct_units(&max_safe_usage);
-        
+
         let max_meter = client.get_meter(&meter_id).unwrap();
-        
+
         // All values should remain within valid i128 range
         assert!(max_meter.debt >= 0 && max_meter.debt <= i128::MAX);
         assert!(max_meter.collateral_limit >= 0 && max_meter.collateral_limit <= i128::MAX);
@@ -112,7 +117,7 @@ mod debt_fuzz_tests {
             .address();
 
         let device_public_key = BytesN::from_array(&env, &[1u8; 32]);
-        
+
         // Test PrePaid meter with zero balance
         let meter_id = client.register_meter_with_mode(
             &user,
@@ -142,13 +147,19 @@ mod debt_fuzz_tests {
         client.deduct_units(&zero_balance_usage);
 
         let meter = client.get_meter(&meter_id).unwrap();
-        
+
         // Balance should be negative or zero, but never cause underflow
-        assert!(meter.balance <= 0, "Balance should be zero or negative with insufficient funds");
-        
+        assert!(
+            meter.balance <= 0,
+            "Balance should be zero or negative with insufficient funds"
+        );
+
         // Meter should be inactive with negative balance
-        assert!(!meter.is_active, "Meter should be inactive with negative balance");
-        
+        assert!(
+            !meter.is_active,
+            "Meter should be inactive with negative balance"
+        );
+
         // Balance should be within valid i128 range
         assert!(meter.balance >= i128::MIN && meter.balance <= i128::MAX);
     }
@@ -171,8 +182,7 @@ mod debt_fuzz_tests {
         let token_address = env
             .register_stellar_asset_contract_v2(token_admin.clone())
             .address();
-        let token_admin_client =
-            soroban_sdk::token::StellarAssetClient::new(&env, &token_address);
+        let token_admin_client = soroban_sdk::token::StellarAssetClient::new(&env, &token_address);
         token_admin_client.mint(&user, &1_000_000_000_000i128);
 
         let device_public_key = BytesN::from_array(&env, &[1u8; 32]);
@@ -182,11 +192,8 @@ mod debt_fuzz_tests {
         client.top_up(&meter_id, &1_000_000_000_000i128);
 
         // Test large (but valid) usage updates
-        let extreme_values: [i128; 3] = [
-            1_000_000_000i128,
-            10_000_000_000i128,
-            100_000_000_000i128,
-        ];
+        let extreme_values: [i128; 3] =
+            [1_000_000_000i128, 10_000_000_000i128, 100_000_000_000i128];
 
         for &usage in extreme_values.iter() {
             client.update_usage(&meter_id, &usage);
@@ -201,13 +208,8 @@ mod debt_fuzz_tests {
 
     #[test]
     fn test_precision_factor_extremes() {
-        let extreme_precision_factors: [i128; 5] = [
-            1,
-            1000,
-            1_000_000,
-            1_000_000_000,
-            i128::MAX / 1000,
-        ];
+        let extreme_precision_factors: [i128; 5] =
+            [1, 1000, 1_000_000, 1_000_000_000, i128::MAX / 1000];
 
         let test_usage = 1_000_000_000i128;
 
@@ -224,15 +226,7 @@ mod debt_fuzz_tests {
 
     #[test]
     fn test_arithmetic_edge_cases() {
-        let edge_cases: [i128; 7] = [
-            i128::MAX,
-            i128::MIN,
-            i128::MAX - 1,
-            i128::MIN + 1,
-            0,
-            -1,
-            1,
-        ];
+        let edge_cases: [i128; 7] = [i128::MAX, i128::MIN, i128::MAX - 1, i128::MIN + 1, 0, -1, 1];
 
         for &value in edge_cases.iter() {
             let _a = value.saturating_add(1);
@@ -263,8 +257,7 @@ mod debt_fuzz_tests {
         let token_address = env
             .register_stellar_asset_contract_v2(token_admin.clone())
             .address();
-        let token_admin_client =
-            soroban_sdk::token::StellarAssetClient::new(&env, &token_address);
+        let token_admin_client = soroban_sdk::token::StellarAssetClient::new(&env, &token_address);
         token_admin_client.mint(&user, &i128::MAX);
 
         let device_public_key = BytesN::from_array(&env, &[1u8; 32]);

contracts/utility_contracts/src/gas_estimator.rs

@@ -1,4 +1,4 @@
-use soroban_sdk::{Env, Address};
+use soroban_sdk::{Address, Env};
 
 pub struct GasCostEstimator;
 
@@ -22,7 +22,7 @@ impl GasCostEstimator {
         meters_in_group: u32,
     ) -> i128 {
         let mut monthly_cost = Self::REGISTER_METER; // One-time registration
-        
+
         // Add recurring costs
         monthly_cost += (Self::CLAIM as u32 * Self::CLAIMS_PER_MONTH) as i128;
         monthly_cost += (Self::UPDATE_HEARTBEAT as u32 * Self::HEARTBEATS_PER_MONTH) as i128;
@@ -57,7 +57,8 @@ impl GasCostEstimator {
             0
         };
 
-        let individual_cost = Self::estimate_meter_monthly_cost(_env, false, 0) * individual_meters as i128;
+        let individual_cost =
+            Self::estimate_meter_monthly_cost(_env, false, 0) * individual_meters as i128;
 
         group_cost + individual_cost
     }
@@ -68,11 +69,12 @@ impl GasCostEstimator {
         group_billing_enabled: bool,
     ) -> LargeScaleCostEstimate {
         let percentage_group = if group_billing_enabled { 0.8 } else { 0.0 }; // 80% in groups if enabled
-        let monthly_cost = Self::estimate_provider_monthly_cost(env, number_of_meters, percentage_group);
-        
+        let monthly_cost =
+            Self::estimate_provider_monthly_cost(env, number_of_meters, percentage_group);
+
         let annual_cost = monthly_cost * 12;
         let cost_per_meter = monthly_cost / number_of_meters as i128;
-        
+
         // Convert to XLM (1 XLM = 10,000,000 stroops)
         let monthly_xlm = monthly_cost / 10_000_000;
         let annual_xlm = annual_cost / 10_000_000;
@@ -128,7 +130,11 @@ impl LargeScaleCostEstimate {
             self.cost_per_meter_xlm,
             self.annual_cost_xlm,
             self.cost_per_meter_xlm,
-            if self.group_billing_enabled { "Enabled" } else { "Disabled" }
+            if self.group_billing_enabled {
+                "Enabled"
+            } else {
+                "Disabled"
+            }
         )
     }
 }