From ed128c76337becba84c5c2f5d308c5a542bd22cf Mon Sep 17 00:00:00 2001
From: mihaisc <mihai@oceanprotocol.com>
Date: Thu, 4 Nov 2021 11:28:45 +0200
Subject: [PATCH 1/2] fix TestContractHandler params

---
 test/unit/NFTFactory.test.ts   | 16 +++++++++++++++-
 test/unit/pools/Router.test.ts |  5 ++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/test/unit/NFTFactory.test.ts b/test/unit/NFTFactory.test.ts
index 416e4fb1..37224f11 100644
--- a/test/unit/NFTFactory.test.ts
+++ b/test/unit/NFTFactory.test.ts
@@ -9,6 +9,7 @@ import Router from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRo
 import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json'
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import OPFCommunityFeeCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import { LoggerInstance } from '../../src/utils'
@@ -40,6 +41,7 @@ describe('NFT Factory test', () => {
       SideStaking.abi as AbiItem[],
       FixedRate.abi as AbiItem[],
       Dispenser.abi as AbiItem[],
+      OPFCommunityFeeCollector.abi as AbiItem[],
 
       ERC721Template.bytecode,
       ERC20Template.bytecode,
@@ -48,7 +50,8 @@ describe('NFT Factory test', () => {
       Router.bytecode,
       SideStaking.bytecode,
       FixedRate.bytecode,
-      Dispenser.bytecode
+      Dispenser.bytecode,
+      OPFCommunityFeeCollector.bytecode
     )
     await contracts.getAccounts()
     factoryOwner = contracts.accounts[0]
@@ -59,6 +62,17 @@ describe('NFT Factory test', () => {
 
     await contracts.deployContracts(factoryOwner, Router.abi as AbiItem[])
 
+    console.log(
+      'address',
+      contracts.factory721Address,
+      contracts.poolTemplateAddress,
+      contracts.routerAddress,
+      contracts.fixedRateAddress,
+      contracts.dispenserAddress,
+      contracts.sideStakingAddress,
+      contracts.template721Address,
+      contracts.template20Address
+    )
     const daiContract = new web3.eth.Contract(
       contracts.MockERC20.options.jsonInterface,
       contracts.daiAddress
diff --git a/test/unit/pools/Router.test.ts b/test/unit/pools/Router.test.ts
index 0d9314be..566615c8 100644
--- a/test/unit/pools/Router.test.ts
+++ b/test/unit/pools/Router.test.ts
@@ -10,6 +10,7 @@ import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/template
 import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json'
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
+import OPFCommunityFeeCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import { LoggerInstance } from '../../../src/utils'
 import { NFTFactory } from '../../../src/factories/NFTFactory'
@@ -41,6 +42,7 @@ describe('Router unit test', () => {
       SideStaking.abi as AbiItem[],
       FixedRate.abi as AbiItem[],
       Dispenser.abi as AbiItem[],
+      OPFCommunityFeeCollector.abi as AbiItem[],
 
       ERC721Template.bytecode,
       ERC20Template.bytecode,
@@ -49,7 +51,8 @@ describe('Router unit test', () => {
       FactoryRouter.bytecode,
       SideStaking.bytecode,
       FixedRate.bytecode,
-      Dispenser.bytecode
+      Dispenser.bytecode,
+      OPFCommunityFeeCollector.bytecode
     )
     await contracts.getAccounts()
     factoryOwner = contracts.accounts[0]

From ad5cc58e782f88a9393923f6a7b61c3b113f7cc4 Mon Sep 17 00:00:00 2001
From: mihaisc <mihai@oceanprotocol.com>
Date: Thu, 4 Nov 2021 12:14:23 +0200
Subject: [PATCH 2/2] fix fixed rate test

---
 test/unit/NFTFactory.test.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/unit/NFTFactory.test.ts b/test/unit/NFTFactory.test.ts
index 37224f11..b931a6fd 100644
--- a/test/unit/NFTFactory.test.ts
+++ b/test/unit/NFTFactory.test.ts
@@ -277,8 +277,13 @@ describe('NFT Factory test', () => {
 
     const fixedData = {
       fixedPriceAddress: contracts.fixedRateAddress,
-      addresses: [contracts.daiAddress, contracts.accounts[0], contracts.accounts[0]],
-      uints: [18, 18, web3.utils.toWei('1'), 1e15]
+      addresses: [
+        contracts.daiAddress,
+        contracts.accounts[0],
+        contracts.accounts[0],
+        contracts.accounts[0]
+      ],
+      uints: [18, 18, web3.utils.toWei('1'), 1e15, 0]
     }
 
     const txReceipt = await nftFactory.createNftErcWithFixedRate(