Merge pull request #220 from kryputh/feat/issue-151-refactor-function-parameters

feat: Add market liquidity filter with minimum pool size threshold

Author: ISTIFANUS-N

contracts/teachlink/src/errors.rs

@@ -67,6 +67,7 @@ pub enum EscrowError {
     RefundTimeMustBeInFuture = 203,
     RefundTimeMustBeAfterReleaseTime = 204,
     DuplicateSigner = 205,
+    DuplicateSigners = 205,  // Alias for consistency
     SignerNotAuthorized = 206,
     SignerAlreadyApproved = 207,
     CallerNotAuthorized = 208,
@@ -83,6 +84,10 @@ pub enum EscrowError {
     EscrowNotPending = 219,
     EscrowNotFound = 220,
     ArbitratorNotAuthorized = 221,
+    InvalidBeneficiary = 222,
+    InvalidToken = 223,
+    InvalidArbitrator = 224,
+    DepositorCannotBeBeneficiary = 225,
 }
 
 /// Rewards module errors

contracts/teachlink/src/escrow.rs

@@ -14,41 +14,32 @@ use soroban_sdk::{symbol_short, vec, Address, Bytes, Env, IntoVal, Map, Vec};
 pub struct EscrowManager;
 
 impl EscrowManager {
+    /// Creates an escrow with validated parameters
+    /// 
+    /// # Arguments
+    /// * `params` - EscrowParameters containing all escrow creation details
+    /// 
+    /// # Returns
+    /// * `u64` - The ID of the created escrow
+    /// 
+    /// # Errors
+    /// Returns `EscrowError` if validation fails
     pub fn create_escrow(
         env: &Env,
-        depositor: Address,
-        beneficiary: Address,
-        token: Address,
-        amount: i128,
-        signers: Vec<EscrowSigner>,
-        threshold: u32,
-        release_time: Option<u64>,
-        refund_time: Option<u64>,
-        arbitrator: Address,
+        params: EscrowParameters,
     ) -> Result<u64, EscrowError> {
-        depositor.require_auth();
+        params.depositor.require_auth();
 
-        EscrowValidator::validate_create_escrow(
-            env,
-            &depositor,
-            &beneficiary,
-            &token,
-            amount,
-            &signers,
-            threshold,
-            release_time,
-            refund_time,
-            &arbitrator,
-        )?;
+        EscrowValidator::validate_escrow_parameters(env, &params)?;
 
         env.invoke_contract::<()>(
-            &token,
+            &params.token,
             &symbol_short!("transfer"),
             vec![
                 env,
-                depositor.clone().into_val(env),
+                params.depositor.clone().into_val(env),
                 env.current_contract_address().into_val(env),
-                amount.into_val(env),
+                params.amount.into_val(env),
             ],
         );
 
@@ -58,9 +49,9 @@ impl EscrowManager {
             .instance()
             .has(&crate::storage::INSURANCE_POOL)
         {
-            let premium = InsuranceManager::calculate_premium(env, amount);
+            let premium = InsuranceManager::calculate_premium(env, params.amount);
             if premium > 0 {
-                InsuranceManager::pay_premium_internal(env, depositor.clone(), premium)?;
+                InsuranceManager::pay_premium_internal(env, params.depositor.clone(), premium)?;
             }
         }
 
@@ -71,16 +62,16 @@ impl EscrowManager {
         let now = env.ledger().timestamp();
         let escrow = Escrow {
             id: escrow_count,
-            depositor,
-            beneficiary,
-            token: token.clone(),
-            amount,
-            signers,
-            threshold,
+            depositor: params.depositor.clone(),
+            beneficiary: params.beneficiary.clone(),
+            token: params.token.clone(),
+            amount: params.amount,
+            signers: params.signers.clone(),
+            threshold: params.threshold,
             approval_count: 0,
-            release_time,
-            refund_time,
-            arbitrator,
+            release_time: params.release_time,
+            refund_time: params.refund_time,
+            arbitrator: params.arbitrator.clone(),
             status: EscrowStatus::Pending,
             created_at: now,
             dispute_reason: None,
@@ -90,7 +81,7 @@ impl EscrowManager {
         escrows.set(escrow_count, escrow.clone());
         env.storage().instance().set(&ESCROWS, &escrows);
 
-        EscrowAnalyticsManager::update_creation(env, amount);
+        EscrowAnalyticsManager::update_creation(env, params.amount);
 
         EscrowCreatedEvent { escrow }.publish(env);