From d427d49c653681b2b33ff09426010407b2e3c3c7 Mon Sep 17 00:00:00 2001
From: Pravdyvy <awxrvtb@gmail.com>
Date: Fri, 19 Dec 2025 19:12:58 +0200
Subject: [PATCH] fix: suggestions added

---
 integration_tests/src/test_suite_map.rs |  4 +--
 wallet/src/cli/programs/amm.rs          | 12 ++++----
 wallet/src/program_facades/amm.rs       | 37 ++++++-------------------
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/integration_tests/src/test_suite_map.rs b/integration_tests/src/test_suite_map.rs
index ead73d5..ee6f9c0 100644
--- a/integration_tests/src/test_suite_map.rs
+++ b/integration_tests/src/test_suite_map.rs
@@ -2401,8 +2401,8 @@ pub fn prepare_function_map() -> HashMap<String, TestFunction> {
             user_holding_b: make_public_account_input_from_str(&recipient_account_id_2.to_string()),
             user_holding_lp: make_public_account_input_from_str(&user_holding_lp.to_string()),
             balance_lp: 2,
-            max_amount_a: 1,
-            max_amount_b: 1,
+            min_amount_a: 1,
+            min_amount_b: 1,
         };
 
         wallet::cli::execute_subcommand(Command::AMM(subcommand))
diff --git a/wallet/src/cli/programs/amm.rs b/wallet/src/cli/programs/amm.rs
index 5db6238..84a31d2 100644
--- a/wallet/src/cli/programs/amm.rs
+++ b/wallet/src/cli/programs/amm.rs
@@ -92,9 +92,9 @@ pub enum AmmProgramAgnosticSubcommand {
         #[arg(long)]
         balance_lp: u128,
         #[arg(long)]
-        max_amount_a: u128,
+        min_amount_a: u128,
         #[arg(long)]
-        max_amount_b: u128,
+        min_amount_b: u128,
     },
 }
 
@@ -238,8 +238,8 @@ impl WalletSubcommand for AmmProgramAgnosticSubcommand {
                 user_holding_b,
                 user_holding_lp,
                 balance_lp,
-                max_amount_a,
-                max_amount_b,
+                min_amount_a,
+                min_amount_b,
             } => {
                 let (user_holding_a, user_holding_a_privacy) =
                     parse_addr_with_privacy_prefix(&user_holding_a)?;
@@ -268,8 +268,8 @@ impl WalletSubcommand for AmmProgramAgnosticSubcommand {
                                 user_holding_b,
                                 user_holding_lp,
                                 balance_lp,
-                                max_amount_a,
-                                max_amount_b,
+                                min_amount_a,
+                                min_amount_b,
                             )
                             .await?;
 
diff --git a/wallet/src/program_facades/amm.rs b/wallet/src/program_facades/amm.rs
index d33ad47..9310c15 100644
--- a/wallet/src/program_facades/amm.rs
+++ b/wallet/src/program_facades/amm.rs
@@ -123,7 +123,7 @@ impl AMM<'_> {
             .ok_or(ExecutionFailureKind::AccountDataError(user_holding_a))?
             .definition_id;
         let definition_token_b_id = TokenHolding::parse(&user_b_acc.data)
-            .ok_or(ExecutionFailureKind::AccountDataError(user_holding_a))?
+            .ok_or(ExecutionFailureKind::AccountDataError(user_holding_b))?
             .definition_id;
 
         let amm_pool =
@@ -289,11 +289,11 @@ impl AMM<'_> {
         user_holding_b: AccountId,
         user_holding_lp: AccountId,
         balance_lp: u128,
-        max_amount_a: u128,
-        max_amount_b: u128,
+        min_amount_a: u128,
+        min_amount_b: u128,
     ) -> Result<SendTxResponse, ExecutionFailureKind> {
         let (instruction, program) =
-            amm_program_preparation_remove_liq(balance_lp, max_amount_a, max_amount_b);
+            amm_program_preparation_remove_liq(balance_lp, min_amount_a, min_amount_b);
 
         let amm_program_id = Program::amm().id();
 
@@ -431,8 +431,8 @@ fn amm_program_preparation_add_liq(
 
 fn amm_program_preparation_remove_liq(
     balance_lp: u128,
-    max_amount_a: u128,
-    max_amount_b: u128,
+    min_amount_a: u128,
+    min_amount_b: u128,
 ) -> (OrphanHack49BytesInput, Program) {
     // An instruction data byte string of length 49, amounts for minimum amount of liquidity to
     // redeem (balance_lp), minimum balance of each token to remove (min_amount_a and
@@ -441,32 +441,11 @@ fn amm_program_preparation_remove_liq(
     instruction[0] = 0x03;
 
     instruction[1..17].copy_from_slice(&balance_lp.to_le_bytes());
-    instruction[17..33].copy_from_slice(&max_amount_a.to_le_bytes());
-    instruction[33..49].copy_from_slice(&max_amount_b.to_le_bytes());
+    instruction[17..33].copy_from_slice(&min_amount_a.to_le_bytes());
+    instruction[33..49].copy_from_slice(&min_amount_b.to_le_bytes());
 
     let instruction_data = OrphanHack49BytesInput::expand(instruction);
     let program = Program::amm();
 
     (instruction_data, program)
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::program_facades::amm::OrphanHack65BytesInput;
-
-    #[test]
-    fn test_correct_ser() {
-        let mut arr = [0u8; 65];
-
-        for (i, item) in arr.iter_mut().enumerate().take(64) {
-            *item = i as u8;
-        }
-
-        let hack = OrphanHack65BytesInput::expand(arr);
-        let instruction_data = serde_json::to_string(&hack).unwrap();
-
-        println!("{instruction_data:?}");
-
-        // assert_eq!(serialization_res_1, serialization_res_2);
-    }
-}