ensure atomic swap is sell

Author: dimxy

mm2src/mm2_main/src/lr_swap/lr_swap_state_machine.rs

@@ -1024,7 +1024,11 @@ impl AggTakerSwapStateMachine {
     }
 
     /// Start nested atomic swap by calling lp_auto_buy. The actual volume is determined on previous states
+    /// The volume is always in the taker sell coins.
+    /// TODO: add slippage support
     async fn start_lp_auto_buy(&self, volume: MmNumber, _slippage: f32) -> MmResult<SellBuyResponse, LrSwapError> {
+        const TAKER_ACTION: TakerAction = TakerAction::Sell;
+
         let base_coin = lp_coinfind_or_err(&self.ctx, &self.atomic_swap.base)
             .await
             .map_mm_err()?;
@@ -1047,11 +1051,11 @@ impl AggTakerSwapStateMachine {
             "{LOG_PREFIX} volume={} self.atomic_swap.price={} action={:?} base={} rel={}",
             volume.to_decimal(),
             self.atomic_swap.price.to_decimal(),
-            self.atomic_swap.action,
+            TAKER_ACTION,
             self.atomic_swap.base,
             self.atomic_swap.rel
         );
-        let (taker_amount, sell_base, sell_rel) = match self.atomic_swap.action {
+        let (taker_amount, sell_base, sell_rel) = match TAKER_ACTION {
             TakerAction::Buy => (&volume * &self.atomic_swap.price, rel_coin.clone(), base_coin.clone()),
             TakerAction::Sell => (volume.clone(), base_coin.clone(), rel_coin.clone()),
         };
@@ -1077,15 +1081,15 @@ impl AggTakerSwapStateMachine {
             "{LOG_PREFIX} starting atomic swap for {}/{}, action {:?}, amount {}",
             self.atomic_swap.base,
             self.atomic_swap.rel,
-            self.atomic_swap.action,
+            TAKER_ACTION,
             volume.to_decimal()
         );
         let sell_buy_req = lr_helpers::make_atomic_swap_request(
             self.atomic_swap.base.clone(),
             self.atomic_swap.rel.clone(),
             self.atomic_swap.price.clone(),
             volume,
-            self.atomic_swap.action.clone(),
+            TAKER_ACTION,
             self.atomic_swap.match_by.clone(),
             self.atomic_swap.order_type.clone(),
         );
@@ -1196,8 +1200,8 @@ impl AggTakerSwapStateMachine {
         let dex_fee_rate = DexFee::dex_fee_rate(&taker_ticker, &maker_ticker);
         // Recalculate swap_volume with the tarde fees removed:
         let taker_volume = volume_with_fees.clone() / (MmNumber::from("1") + dex_fee_rate);
-        println!(
-            "deduct_fees volume_with_fees={volume_with_fees} taker_volume={taker_volume} dex_fee_diff={}",
+        debug!(
+            "{maker_ticker}/{taker_ticker} deduct_fees volume_with_fees={volume_with_fees} taker_volume={taker_volume} dex_fee_diff={}",
             &volume_with_fees - &taker_volume
         );
 

mm2src/mm2_main/src/rpc/lp_commands/lr_swap_api/lr_api_types.rs

@@ -65,6 +65,7 @@ impl AskOrBidOrder {
         }
     }
     /// Convert to maker buy price
+    #[allow(unused)]
     pub fn buy_price(&self) -> MmNumber {
         match self {
             AskOrBidOrder::Ask { order, .. } => &MmNumber::from(1) / &order.price.rational.clone().into(),

mm2src/mm2_main/tests/mm2_tests/lr_swap_tests.rs

@@ -224,7 +224,7 @@ fn test_aggregated_swap_mainnet_polygon_utxo() {
         alice_bal_diff
     );
     assert!(
-        alice_bal_diff < &swap_amount * &"1.20".parse::<BigDecimal>().unwrap(),
+        alice_bal_diff < &swap_amount * "1.20".parse::<BigDecimal>().unwrap(),
         "too low received {}",
         alice_bal_diff
     );
@@ -412,7 +412,7 @@ fn test_aggregated_swap_mainnet_polygon_arbitrum_impl(
             .flatten()
             .cloned()
             .collect::<Vec<_>>();
-        json_asks.push(json!({ "base": &grt_ticker, "orders": &best_asks_1 }));
+        json_asks.push(json!({ "base": &arb_ticker, "orders": &best_asks_1 }));
     } else {
         // using "sell" we get all aave orders as bids:
         let best_orders_res = block_on(best_orders_v2_by_number(&mm_alice, &aave_ticker, "sell", 10, true));