From ccb3d7c07bb36e32b84aed26aa40cb1440d60c52 Mon Sep 17 00:00:00 2001
From: Alexander Burkut <a.burkut90@gmail.com>
Date: Wed, 30 Oct 2024 13:21:25 +0300
Subject: [PATCH] fix for integration tests

---
 .../fluid-dex/fluid-dex-integration.test.ts   | 49 ++++++++++---------
 src/dex/fluid-dex/fluid-dex.ts                |  4 +-
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/dex/fluid-dex/fluid-dex-integration.test.ts b/src/dex/fluid-dex/fluid-dex-integration.test.ts
index 3eb0b7741..ebe4421d8 100644
--- a/src/dex/fluid-dex/fluid-dex-integration.test.ts
+++ b/src/dex/fluid-dex/fluid-dex-integration.test.ts
@@ -33,13 +33,14 @@ import ResolverABI from '../../abi/fluid-dex/resolver.abi.json';
 function getReaderCalldata(
   exchangeAddress: string,
   readerIface: Interface,
+  poolAddress: string,
   amounts: bigint[],
   funcName: string,
 ) {
   return amounts.map(amount => ({
     target: exchangeAddress,
     callData: readerIface.encodeFunctionData(funcName, [
-      '0x0b1a513ee24972daef112bc777a5610d4325c9e7',
+      poolAddress,
       funcName == 'estimateSwapIn' ? true : false,
       amount,
       funcName == 'estimateSwapIn' ? 0 : 2n * amount,
@@ -60,6 +61,7 @@ function decodeReaderResult(
 async function checkOnChainPricing(
   fluidDex: FluidDex,
   funcName: string,
+  poolAddress: string,
   blockNumber: number,
   prices: bigint[],
   amounts: bigint[],
@@ -71,9 +73,11 @@ async function checkOnChainPricing(
   const readerCallData = getReaderCalldata(
     resolverAddress,
     readerIface,
+    poolAddress,
     amounts.slice(1),
     funcName,
   );
+
   const readerResult = (
     await fluidDex.dexHelper.multiContract.methods
       .aggregate(readerCallData)
@@ -83,6 +87,8 @@ async function checkOnChainPricing(
   const expectedPrices = [0n].concat(
     decodeReaderResult(readerResult, readerIface, funcName),
   );
+
+  expect(prices).toEqual(expectedPrices);
 }
 
 async function testPricingOnNetwork(
@@ -138,6 +144,7 @@ async function testPricingOnNetwork(
   await checkOnChainPricing(
     fluidDex,
     funcNameToCheck,
+    poolPrices![0].poolAddresses![0],
     blockNumber,
     poolPrices![0].prices,
     amounts,
@@ -153,8 +160,6 @@ describe('FluidDex', function () {
     const network = Network.MAINNET;
     const dexHelper = new DummyDexHelper(network);
 
-    const tokens = Tokens[network];
-
     beforeAll(async () => {
       blockNumber = await dexHelper.provider.getBlockNumber();
       fluidDex = new FluidDex(network, dexKey, dexHelper);
@@ -169,16 +174,16 @@ describe('FluidDex', function () {
 
       const amountsForSell = [
         0n,
-        1n * BI_POWS[8],
-        2n * BI_POWS[8],
-        3n * BI_POWS[8],
-        4n * BI_POWS[8],
-        5n * BI_POWS[8],
-        6n * BI_POWS[8],
-        7n * BI_POWS[8],
-        8n * BI_POWS[8],
-        9n * BI_POWS[8],
-        10n * BI_POWS[8],
+        1n * BI_POWS[18],
+        2n * BI_POWS[18],
+        3n * BI_POWS[18],
+        4n * BI_POWS[18],
+        5n * BI_POWS[18],
+        6n * BI_POWS[18],
+        7n * BI_POWS[18],
+        8n * BI_POWS[18],
+        9n * BI_POWS[18],
+        10n * BI_POWS[18],
       ];
 
       it('wstETH -> ETH, getPoolIdentifiers and getPricesVolume SELL', async function () {
@@ -216,16 +221,16 @@ describe('FluidDex', function () {
 
       const amountsForSell = [
         0n,
-        1n * BI_POWS[6],
-        2n * BI_POWS[6],
-        3n * BI_POWS[6],
-        4n * BI_POWS[6],
-        5n * BI_POWS[6],
-        6n * BI_POWS[6],
-        7n * BI_POWS[6],
-        8n * BI_POWS[6],
-        9n * BI_POWS[6],
         10n * BI_POWS[6],
+        20n * BI_POWS[6],
+        30n * BI_POWS[6],
+        40n * BI_POWS[6],
+        50n * BI_POWS[6],
+        60n * BI_POWS[6],
+        70n * BI_POWS[6],
+        80n * BI_POWS[6],
+        90n * BI_POWS[6],
+        100n * BI_POWS[6],
       ];
 
       it('USDC -> USDT getPoolIdentifiers and getPricesVolume SELL', async function () {
diff --git a/src/dex/fluid-dex/fluid-dex.ts b/src/dex/fluid-dex/fluid-dex.ts
index 9884d8b33..7958e8e48 100644
--- a/src/dex/fluid-dex/fluid-dex.ts
+++ b/src/dex/fluid-dex/fluid-dex.ts
@@ -139,6 +139,8 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
     side: SwapSide,
     blockNumber: number,
   ): Promise<string[]> {
+    if (side === SwapSide.BUY) return [];
+
     const pool = await this.getPoolByTokenPair(
       srcToken.address,
       destToken.address,
@@ -183,7 +185,7 @@ export class FluidDex extends SimpleExchange implements IDex<FluidDexData> {
       if (srcToken.address.toLowerCase() === destToken.address.toLowerCase())
         return null;
 
-      if (side === SwapSide.BUY) throw new Error(`Buy not supported`);
+      if (side === SwapSide.BUY) return null;
       // Get the pool to use.
       const pool = await this.getPoolByTokenPair(
         srcToken.address,