From 6606c6d7d7926c72c7c45e71dacfec3e008aff28 Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Mon, 8 Nov 2021 21:52:51 +0200
Subject: [PATCH] fixed pool unit tests after refactor

---
 package.json                          |  2 +-
 src/factories/NFTFactory.ts           | 12 ++++--------
 test/unit/pools/balancer/Pool.test.ts |  9 +++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 33c578e4..4514ecf7 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "release": "release-it --non-interactive",
     "changelog": "auto-changelog -p",
     "prepublishOnly": "npm run build",
-    "test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Pool.test.ts'",
+    "test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/balancer/Pool.test.ts'",
     "test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Datatoken.test.ts'",
     "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NFTDatatoken.test.ts'",
     "test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'",
diff --git a/src/factories/NFTFactory.ts b/src/factories/NFTFactory.ts
index c650d68c..4558d6d5 100644
--- a/src/factories/NFTFactory.ts
+++ b/src/factories/NFTFactory.ts
@@ -701,18 +701,14 @@ export class NFTFactory {
     ercParams: ErcCreateParams,
     poolParams: PoolParams
   ): Promise<TransactionReceipt> {
-    const ercCreateData = this.getErcCreationParams(ercParams)
-    const poolData = this.getPoolCreationParams(poolParams)
     const estGas = await this.estGasCreateNftErcWithPool(
       address,
       nftCreateData,
-      ercCreateData,
-      poolData
+      ercParams,
+      poolParams
     )
-
-    console.log('estGas', estGas)
-    console.log('ercCreateData', ercCreateData)
-    console.log('poolData', poolData)
+    const ercCreateData = this.getErcCreationParams(ercParams)
+    const poolData = this.getPoolCreationParams(poolParams)
 
     // Invoke createToken function of the contract
     const trxReceipt = await this.factory721.methods
diff --git a/test/unit/pools/balancer/Pool.test.ts b/test/unit/pools/balancer/Pool.test.ts
index 5fc094d5..66be6c61 100644
--- a/test/unit/pools/balancer/Pool.test.ts
+++ b/test/unit/pools/balancer/Pool.test.ts
@@ -597,11 +597,6 @@ describe('Pool unit test', () => {
         symbol: 'ERC20DT1Symbol'
       }
 
-      const basetokenInitialLiq = Number(
-        await pool.amountToUnits(contracts.usdcAddress, '2000')
-      )
-      console.log(basetokenInitialLiq.toString())
-
       const poolParams: PoolParams = {
         ssContract: contracts.sideStakingAddress,
         basetokenAddress: contracts.usdcAddress,
@@ -613,7 +608,9 @@ describe('Pool unit test', () => {
         basetokenDecimals: await usdcContract.methods.decimals().call(),
         vestingAmount: '10000',
         vestedBlocks: 2500000,
-        initialBasetokenLiquidity: basetokenInitialLiq.toString(),
+        initialBasetokenLiquidity: web3.utils.fromWei(
+          await pool.amountToUnits(contracts.usdcAddress, '2000')
+        ),
         swapFeeLiquidityProvider: 1e15,
         swapFeeMarketPlaceRunner: 1e15
       }