Merge pull request #171 from oraichain/feat/update-get-route-swap

update route universal swap
oraidex · Feb 19, 2024 · 55321dd · 55321dd
2 parents 1fa7650 + 21ab076
commit 55321dd
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 8 deletions.
diff --git a/packages/universal-swap/package.json b/packages/universal-swap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraidex-universal-swap",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "main": "build/index.js",
   "files": [
     "build/"

diff --git a/packages/universal-swap/src/helper.ts b/packages/universal-swap/src/helper.ts
@@ -348,16 +348,15 @@ export const generateSwapOperationMsgs = (offerInfo: AssetInfo, askInfo: AssetIn
   });
 
   if (pairExist) return generateSwapRoute(offerInfo, askInfo, []);
-
   // TODO: hardcode NTMPI -> USDC -> ORAI -> X
   if (isEqual(offerInfo, NEUTARO_INFO)) {
-    const swapRoute = isEqual(askInfo, ORAI_INFO) ? [USDC_INFO] : [ORAI_INFO, USDC_INFO];
+    const swapRoute = isEqual(askInfo, ORAI_INFO) ? [USDC_INFO] : [USDC_INFO, ORAI_INFO];
     return generateSwapRoute(offerInfo, askInfo, swapRoute);
   }
 
   // TODO: X -> ORAI -> USDC -> NTMPI
   if (isEqual(askInfo, NEUTARO_INFO)) {
-    const swapRoute = isEqual(offerInfo, ORAI_INFO) ? [USDC_INFO] : [USDC_INFO, ORAI_INFO];
+    const swapRoute = isEqual(offerInfo, ORAI_INFO) ? [USDC_INFO] : [ORAI_INFO, USDC_INFO];
     return generateSwapRoute(offerInfo, askInfo, swapRoute);
   }
 

diff --git a/packages/universal-swap/tests/helper.spec.ts b/packages/universal-swap/tests/helper.spec.ts
@@ -39,7 +39,8 @@ import {
   isEvmNetworkNativeSwapSupported,
   isEvmSwappable,
   isSupportedNoPoolSwapEvm,
-  generateSwapRoute
+  generateSwapRoute,
+  generateSwapOperationMsgs
 } from "../src/helper";
 import { SwapRoute, UniversalSwapType } from "../src/types";
 import { AssetInfo } from "@oraichain/oraidex-contracts-sdk";
@@ -541,9 +542,6 @@ describe("test helper functions", () => {
     ]
   ])("test-generateSwapRoute", (offerAsset, askAsset, swapRoute, expectSwapRoute) => {
     const getSwapRoute: SwapOperation[] = generateSwapRoute(offerAsset, askAsset, swapRoute);
-    console.dir(getSwapRoute, { depth: null });
-    console.dir(expectSwapRoute, { depth: null });
-
     expect(getSwapRoute).toEqual(expect.arrayContaining(expectSwapRoute));
     getSwapRoute.forEach((swap) => {
       expect(swap).toMatchObject({
@@ -554,4 +552,66 @@ describe("test helper functions", () => {
       });
     });
   });
+
+  it.each<[AssetInfo, AssetInfo, SwapOperation[]]>([
+    [
+      ORAIX_INFO,
+      NEUTARO_INFO,
+      [
+        {
+          orai_swap: {
+            offer_asset_info: ORAIX_INFO,
+            ask_asset_info: ORAI_INFO
+          }
+        },
+        {
+          orai_swap: {
+            offer_asset_info: ORAI_INFO,
+            ask_asset_info: USDC_INFO
+          }
+        },
+        {
+          orai_swap: {
+            offer_asset_info: USDC_INFO,
+            ask_asset_info: NEUTARO_INFO
+          }
+        }
+      ]
+    ],
+    [
+      NEUTARO_INFO,
+      ORAIX_INFO,
+      [
+        {
+          orai_swap: {
+            offer_asset_info: NEUTARO_INFO,
+            ask_asset_info: USDC_INFO
+          }
+        },
+        {
+          orai_swap: {
+            offer_asset_info: USDC_INFO,
+            ask_asset_info: ORAI_INFO
+          }
+        },
+        {
+          orai_swap: {
+            offer_asset_info: ORAI_INFO,
+            ask_asset_info: ORAIX_INFO
+          }
+        }
+      ]
+    ]
+  ])("test-generateSwapOperationMsgs", (offerAsset, askAsset, expectSwapRoute) => {
+    const getSwapOperationMsgsRoute = generateSwapOperationMsgs(offerAsset, askAsset);
+    expect(getSwapOperationMsgsRoute).toEqual(expect.arrayContaining(expectSwapRoute));
+    getSwapOperationMsgsRoute.forEach((swap) => {
+      expect(swap).toMatchObject({
+        orai_swap: expect.objectContaining({
+          offer_asset_info: expect.any(Object),
+          ask_asset_info: expect.any(Object)
+        })
+      });
+    });
+  });
 });