oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

use balance() function

Browse Source
This commit is contained in:
Miquel A. Cabot 2022-05-26 13:10:18 +02:00
parent d77966a646
commit 03f3d3b7d5
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/unit/pools/balancer/Pool.test.ts
View File

@ -1,7 +1,6 @@
import { assert, expect } from 'chai' import { assert, expect } from 'chai'
import { AbiItem } from 'web3-utils/types' import { AbiItem } from 'web3-utils/types'
import { Contract } from 'web3-eth-contract' import { Contract } from 'web3-eth-contract'
import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json' import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
import { deployContracts, Addresses } from '../../../TestContractHandler' import { deployContracts, Addresses } from '../../../TestContractHandler'
import { web3 } from '../../../config' import { web3 } from '../../../config'
@ -13,7 +12,8 @@ import {
NftCreateData, NftCreateData,
Pool, Pool,
unitsToAmount, unitsToAmount,
ZERO_ADDRESS ZERO_ADDRESS,
balance
} from '../../../../src' } from '../../../../src'
import { import {
PoolCreationParams, PoolCreationParams,
@ -32,7 +32,6 @@ describe('Pool unit test', () => {
let pool: Pool let pool: Pool
let poolAddress: string let poolAddress: string
let erc20Token: string let erc20Token: string
let erc20Contract: Contract
let daiContract: Contract let daiContract: Contract
let usdcContract: Contract let usdcContract: Contract
let ercParams: Erc20CreateParams let ercParams: Erc20CreateParams
@ -151,9 +150,8 @@ describe('Pool unit test', () => {
erc20Token = txReceipt.events.TokenCreated.returnValues.newTokenAddress erc20Token = txReceipt.events.TokenCreated.returnValues.newTokenAddress
poolAddress = txReceipt.events.NewPool.returnValues.poolAddress poolAddress = txReceipt.events.NewPool.returnValues.poolAddress
erc20Contract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], erc20Token)
// user1 has no dt1 // user1 has no dt1
expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal('0') expect(await balance(web3, erc20Token, user1)).to.equal('0')
}) })
it('#sharesBalance - should return user shares balance (datatoken balance, LPT balance, etc) ', async () => { it('#sharesBalance - should return user shares balance (datatoken balance, LPT balance, etc) ', async () => {
@ -242,7 +240,7 @@ describe('Pool unit test', () => {
expect(await daiContract.methods.balanceOf(user1).call()).to.equal( expect(await daiContract.methods.balanceOf(user1).call()).to.equal(
web3.utils.toWei('1000') web3.utils.toWei('1000')
) )
expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal('0') expect(await balance(web3, erc20Token, user1)).to.equal('0')
await approve(web3, user1, contracts.daiAddress, poolAddress, '10') await approve(web3, user1, contracts.daiAddress, poolAddress, '10')
const tokenInOutMarket: TokenInOutMarket = { const tokenInOutMarket: TokenInOutMarket = {
@ -261,7 +259,7 @@ describe('Pool unit test', () => {
tokenInOutMarket, tokenInOutMarket,
amountsInOutMaxFee amountsInOutMaxFee
) )
expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal( expect(await balance(web3, erc20Token, user1)).to.equal(
tx.events.LOG_SWAP.returnValues.tokenAmountOut tx.events.LOG_SWAP.returnValues.tokenAmountOut
) )
}) })
@ -548,9 +546,8 @@ describe('Pool unit test', () => {
erc20Token = txReceipt.events.TokenCreated.returnValues.newTokenAddress erc20Token = txReceipt.events.TokenCreated.returnValues.newTokenAddress
poolAddress = txReceipt.events.NewPool.returnValues.poolAddress poolAddress = txReceipt.events.NewPool.returnValues.poolAddress
erc20Contract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], erc20Token)
// user1 has no dt1 // user1 has no dt1
expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal('0') expect(await balance(web3, erc20Token, user1)).to.equal('0')
}) })
it('#calcPoolOutGivenSingleIn - should get the amount of pool OUT for exact token IN', async () => { it('#calcPoolOutGivenSingleIn - should get the amount of pool OUT for exact token IN', async () => {
@ -712,7 +709,7 @@ describe('Pool unit test', () => {
transferAmount.toString() transferAmount.toString()
) )
expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal('0') expect(await balance(web3, erc20Token, user1)).to.equal('0')
await approve(web3, user1, contracts.usdcAddress, poolAddress, '10') await approve(web3, user1, contracts.usdcAddress, poolAddress, '10')
const tokenInOutMarket: TokenInOutMarket = { const tokenInOutMarket: TokenInOutMarket = {
tokenIn: contracts.usdcAddress, tokenIn: contracts.usdcAddress,
@ -730,7 +727,7 @@ describe('Pool unit test', () => {
tokenInOutMarket, tokenInOutMarket,
amountsInOutMaxFee amountsInOutMaxFee
) )
expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal( expect(await balance(web3, erc20Token, user1)).to.equal(
tx.events.LOG_SWAP.returnValues.tokenAmountOut tx.events.LOG_SWAP.returnValues.tokenAmountOut
) )
}) })