Merge pull request #1412 from oceanprotocol/issue-1350-rewrite-dispenser-test

Issue-#1350: Rewrite Dispenser test

test/unit/pools/Router.test.ts

@@ -3,8 +3,14 @@ import { AbiItem } from 'web3-utils/types'
 import { deployContracts, Addresses } from '../../TestContractHandler'
 import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
 import { web3 } from '../../config'
-import { NftFactory, NftCreateData, balance, approve, ZERO_ADDRESS } from '../../../src'
+import {
-import { Router } from '../../../src/pools/Router'
+  NftFactory,
+  NftCreateData,
+  Router,
+  balance,
+  approve,
+  ZERO_ADDRESS
+} from '../../../src'
 import { Erc20CreateParams, PoolCreationParams, Operation } from '../../../src/@types'
 
 const { keccak256 } = require('@ethersproject/keccak256')

test/unit/pools/dispenser/Dispenser.test.ts

@@ -1,7 +1,4 @@
-import { AbiItem } from 'web3-utils'
 import { assert, expect } from 'chai'
-import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
-import DispenserTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json'
 import { deployContracts, Addresses } from '../../../TestContractHandler'
 import { web3 } from '../../../config'
 import {
@@ -9,71 +6,66 @@ import {
   NftCreateData,
   Datatoken,
   DispenserParams,
-  Dispenser
+  Dispenser,
+  ZERO_ADDRESS
 } from '../../../../src/'
 import { Erc20CreateParams } from '../../../../src/@types'
 
 describe('Dispenser flow', () => {
   let factoryOwner: string
-  let nftOwner: string
   let user1: string
   let user2: string
-  let user3: string
   let contracts: Addresses
-  let DispenserAddress: string
   let DispenserClass: Dispenser
   let nftFactory: NftFactory
   let datatoken: Datatoken
-  let nftAddress: string
   let dtAddress: string
 
-  before(async () => {
-    const accounts = await web3.eth.getAccounts()
-    factoryOwner = accounts[0]
-    nftOwner = accounts[1]
-    user1 = accounts[2]
-    user2 = accounts[3]
-    user3 = accounts[4]
-  })
-
-  it('should deploy contracts', async () => {
-    contracts = await deployContracts(web3, factoryOwner)
-  })
-
-  it('should initialize Dispenser class', async () => {
-    DispenserClass = new Dispenser(
-      web3,
-      8996,
-      contracts.dispenserAddress,
-      DispenserTemplate.abi as AbiItem[]
-    )
-    assert(DispenserClass !== null)
-  })
-
-  it('#createNftwithErc - should create an NFT and a Datatoken ', async () => {
-    nftFactory = new NftFactory(contracts.erc721FactoryAddress, web3)
-
   const nftData: NftCreateData = {
     name: '72120Bundle',
     symbol: '72Bundle',
     templateIndex: 1,
     tokenURI: 'https://oceanprotocol.com/nft/',
     transferable: true,
-      owner: factoryOwner
+    owner: null
   }
 
   const ercParams: Erc20CreateParams = {
     templateIndex: 1,
-      minter: factoryOwner,
+    minter: null,
-      paymentCollector: user3,
+    paymentCollector: null,
-      mpFeeAddress: user2,
+    mpFeeAddress: null,
-      feeToken: '0x0000000000000000000000000000000000000000',
+    feeToken: ZERO_ADDRESS,
-      cap: '10000',
+    cap: '1000000',
     feeAmount: '0',
     name: 'ERC20B1',
     symbol: 'ERC20DT1Symbol'
   }
 
+  before(async () => {
+    const accounts = await web3.eth.getAccounts()
+    factoryOwner = accounts[0]
+    user1 = accounts[3]
+    user2 = accounts[4]
+
+    nftData.owner = factoryOwner
+    ercParams.minter = factoryOwner
+    ercParams.paymentCollector = user2
+    ercParams.mpFeeAddress = user1
+  })
+
+  it('should deploy contracts', async () => {
+    contracts = await deployContracts(web3, factoryOwner)
+  })
+
+  it('should initialize Dispenser class', async () => {
+    DispenserClass = new Dispenser(web3, 8996, contracts.dispenserAddress)
+    assert(DispenserClass !== null)
+  })
+
+  it('#createNftwithErc - should create an NFT and a Datatoken ', async () => {
+    nftFactory = new NftFactory(contracts.erc721FactoryAddress, web3)
+
     const txReceipt = await nftFactory.createNftWithErc20(
       factoryOwner,
       nftData,
@@ -83,12 +75,11 @@ describe('Dispenser flow', () => {
     expect(txReceipt.events.NFTCreated.event === 'NFTCreated')
     expect(txReceipt.events.TokenCreated.event === 'TokenCreated')
 
-    nftAddress = txReceipt.events.NFTCreated.returnValues.newTokenAddress
     dtAddress = txReceipt.events.TokenCreated.returnValues.newTokenAddress
   })
 
   it('Make user2 minter', async () => {
-    datatoken = new Datatoken(web3, 8996, ERC20Template.abi as AbiItem[])
+    datatoken = new Datatoken(web3, 8996)
     await datatoken.addMinter(dtAddress, factoryOwner, user2)
     assert((await datatoken.getDTPermissions(dtAddress, user2)).minter === true)
   })
@@ -113,38 +104,38 @@ describe('Dispenser flow', () => {
     assert(tx, 'Cannot activate dispenser')
   })
 
-  it('user2 gets the dispenser status', async () => {
+  it('user1 gets the dispenser status', async () => {
     const status = await DispenserClass.status(dtAddress)
     assert(status.active === true, 'Dispenser not active')
     assert(status.owner === factoryOwner, 'Dispenser owner is not alice')
     assert(status.isMinter === true, 'Dispenser is not a minter')
   })
 
-  it('user2 deactivates the dispenser', async () => {
+  it('user1 deactivates the dispenser', async () => {
     const tx = await DispenserClass.deactivate(dtAddress, factoryOwner)
     assert(tx, 'Cannot deactivate dispenser')
     const status = await DispenserClass.status(dtAddress)
     assert(status.active === false, 'Dispenser is still active')
   })
 
-  it('user2 sets user3 as an AllowedSwapper for the dispenser', async () => {
+  it('user1 sets user2 as an AllowedSwapper for the dispenser', async () => {
-    const tx = await DispenserClass.setAllowedSwapper(dtAddress, factoryOwner, user3)
+    const tx = await DispenserClass.setAllowedSwapper(dtAddress, factoryOwner, user2)
     assert(tx, 'Cannot set Allowed Swapper')
     const status = await DispenserClass.status(dtAddress)
-    assert(status.allowedSwapper === user3, 'user3 is Allowed Swapper')
+    assert(status.allowedSwapper === user2, 'user2 is Allowed Swapper')
   })
 
-  it('User3 requests datatokens', async () => {
+  it('user2 requests datatokens', async () => {
-    const activate = await DispenserClass.activate(dtAddress, '10', '10', factoryOwner)
+    await DispenserClass.activate(dtAddress, '10', '10', factoryOwner)
-    const check = await DispenserClass.isDispensable(dtAddress, datatoken, user3, '1')
+    const check = await DispenserClass.isDispensable(dtAddress, datatoken, user2, '1')
     assert(check === true, 'isDispensable should return true')
-    const tx = await DispenserClass.dispense(dtAddress, user3, '1', user3)
+    const tx = await DispenserClass.dispense(dtAddress, user2, '1', user2)
-    assert(tx, 'user3 failed to get 1DT')
+    assert(tx, 'user2 failed to get 1DT')
   })
 
-  it('user2 withdraws all datatokens', async () => {
+  it('user1 withdraws all datatokens', async () => {
     const tx = await DispenserClass.ownerWithdraw(dtAddress, factoryOwner)
-    assert(tx, 'user2 failed to withdraw all her tokens')
+    assert(tx, 'user1 failed to withdraw all her tokens')
     const status = await DispenserClass.status(dtAddress)
     assert(status.balance === '0', 'Balance > 0')
   })

test/unit/pools/ssContracts/SideStaking.test.ts

@@ -14,9 +14,9 @@ import {
   NftFactory,
   NftCreateData,
   Pool,
+  SideStaking,
   unitsToAmount
 } from '../../../../src'
-import { SideStaking } from '../../../../src/pools/ssContracts/SideStaking'
 import {
   Erc20CreateParams,
   PoolCreationParams,