Merge branch 'develop'

Author: armandocodecr

contracts/escrow/src/core/dispute.rs

@@ -31,17 +31,21 @@ impl DisputeManager {
         let token_client = TokenClient::new(&e, &escrow.trustline.address);
         let current_balance = token_client.balance(&contract_address);
 
+        let mut total: i128 = 0;
+        for (_addr, amount) in distributions.iter() {
+            if amount <= 0 {
+                return Err(ContractError::AmountsToBeTransferredShouldBePositive);
+            }
+            total = BasicMath::safe_add(total, amount)?;
+        }
+
         validate_dispute_resolution_conditions(
             &escrow,
             &dispute_resolver,
-            &distributions,
             current_balance,
+            total,
         )?;
 
-        let mut total: i128 = 0;
-        for (_addr, amount) in distributions.iter() {
-            total = BasicMath::safe_add(total, amount)?;
-        }
         let fee_result = FeeCalculator::calculate_standard_fees(total, escrow.platform_fee)?;
         let total_fees =
             BasicMath::safe_add(fee_result.trustless_work_fee, fee_result.platform_fee)?;

contracts/escrow/src/core/validators/dispute.rs

@@ -1,6 +1,5 @@
-use soroban_sdk::{Address, Map};
+use soroban_sdk::Address;
 
-use crate::modules::math::{BasicArithmetic, BasicMath};
 use crate::{
     error::ContractError,
     storage::types::{Escrow, Roles},
@@ -10,8 +9,8 @@ use crate::{
 pub fn validate_dispute_resolution_conditions(
     escrow: &Escrow,
     dispute_resolver: &Address,
-    distributions: &Map<Address, i128>,
     current_balance: i128,
+    total: i128,
 ) -> Result<(), ContractError> {
     if dispute_resolver != &escrow.roles.dispute_resolver {
         return Err(ContractError::OnlyDisputeResolverCanExecuteThisFunction);
@@ -21,23 +20,18 @@ pub fn validate_dispute_resolution_conditions(
         return Err(ContractError::EscrowNotInDispute);
     }
 
-    let mut total: i128 = 0;
-    for (_addr, amount) in distributions.iter() {
-        if amount < 0 {
-            return Err(ContractError::AmountsToBeTransferredShouldBePositive);
-        }
-        total = BasicMath::safe_add(total, amount)?;
-    }
-    if total <= 0 {
-        return Err(ContractError::AmountCannotBeZero);
-    }
     if current_balance < total {
         return Err(ContractError::InsufficientFundsForResolution);
     }
+
     if total != current_balance {
         return Err(ContractError::DistributionsMustEqualEscrowBalance);
     }
 
+    if total <= 0 {
+        return Err(ContractError::TotalAmountCannotBeZero);
+    }
+
     Ok(())
 }
 

contracts/escrow/src/error.rs

@@ -44,6 +44,7 @@ pub enum ContractError {
     IncompatibleEscrowWasmHash = 36,
     PlatformAddressCannotBeChanged = 37,
     DisputeResolverCannotDisputeTheEscrow = 40,
+    TotalAmountCannotBeZero = 41,
 }
 
 impl fmt::Display for ContractError {
@@ -122,7 +123,7 @@ impl fmt::Display for ContractError {
             ContractError::AmountsToBeTransferredShouldBePositive => {
                 write!(
                     f,
-                    "None of the amounts to be transferred should be less than 0."
+                    "None of the amounts to be transferred should be less or equal than 0."
                 )
             }
             ContractError::DistributionsMustEqualEscrowBalance => {
@@ -170,6 +171,9 @@ impl fmt::Display for ContractError {
             ContractError::DisputeResolverCannotDisputeTheEscrow => {
                 write!(f, "The dispute resolver cannot dispute the escrow.")
             }
+            ContractError::TotalAmountCannotBeZero => {
+                write!(f, "The total amount to be distributed cannot be equal to zero.")
+            }
         }
     }
 }

contracts/escrow/src/tests/test.rs

@@ -892,7 +892,7 @@ fn test_dispute_management() {
     let escrow = escrow_approver.get_escrow();
     assert!(!escrow.flags.disputed);
 
-    escrow_approver.dispute_escrow(&dispute_resolver_address);
+    escrow_approver.dispute_escrow(&approver_address);
 
     let escrow_after_change = escrow_approver.get_escrow();
     assert!(escrow_after_change.flags.disputed);
@@ -903,7 +903,7 @@ fn test_dispute_management() {
         escrow_approver.try_release_funds(&release_signer_address);
     assert!(result.is_err());
 
-    let _ = escrow_approver.try_dispute_escrow(&dispute_resolver_address);
+    let _ = escrow_approver.try_dispute_escrow(&approver_address);
 
     let escrow_after_second_change = escrow_approver.get_escrow();
     assert!(escrow_after_second_change.flags.disputed);