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

fix error in decimals

This commit is contained in:
Miquel A. Cabot 2022-05-27 17:16:45 +02:00
parent 2b3b5c871d
commit 4e92381007

View File

@ -227,6 +227,7 @@ describe('Pool unit test', () => {
it('#swapExactAmountIn - should swap', async () => { it('#swapExactAmountIn - should swap', async () => {
await transfer(web3, factoryOwner, contracts.daiAddress, user1, '1000') await transfer(web3, factoryOwner, contracts.daiAddress, user1, '1000')
expect(await balance(web3, contracts.daiAddress, user1)).to.equal('1000') expect(await balance(web3, contracts.daiAddress, user1)).to.equal('1000')
expect(await balance(web3, erc20Token, user1)).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')
@ -518,11 +519,7 @@ describe('Pool unit test', () => {
baseTokenDecimals: await decimals(web3, contracts.usdcAddress), baseTokenDecimals: await decimals(web3, contracts.usdcAddress),
vestingAmount: '10000', vestingAmount: '10000',
vestedBlocks: 2500000, vestedBlocks: 2500000,
initialBaseTokenLiquidity: await unitsToAmount( initialBaseTokenLiquidity: '2000',
web3,
contracts.usdcAddress,
await amountToUnits(web3, contracts.usdcAddress, '2000')
),
swapFeeLiquidityProvider: '0.001', swapFeeLiquidityProvider: '0.001',
swapFeeMarketRunner: '0.001' swapFeeMarketRunner: '0.001'
} }
@ -694,14 +691,12 @@ describe('Pool unit test', () => {
}) })
it('#swapExactAmountIn - should swap', async () => { it('#swapExactAmountIn - should swap', async () => {
const transferAmount = await amountToUnits(web3, contracts.usdcAddress, '1000') // 1000 USDC await transfer(web3, factoryOwner, contracts.usdcAddress, user1, '1000')
await transfer(web3, factoryOwner, contracts.usdcAddress, user1, transferAmount) expect(await balance(web3, contracts.usdcAddress, user1)).to.equal('1000')
expect(await balance(web3, contracts.usdcAddress, user1)).to.equal(
transferAmount.toString()
)
expect(await balance(web3, erc20Token, user1)).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,
tokenOut: erc20Token, tokenOut: erc20Token,
@ -729,9 +724,7 @@ describe('Pool unit test', () => {
it('#swapExactAmountOut - should swap', async () => { it('#swapExactAmountOut - should swap', async () => {
await approve(web3, user1, contracts.usdcAddress, poolAddress, '100') await approve(web3, user1, contracts.usdcAddress, poolAddress, '100')
expect(await balance(web3, contracts.usdcAddress, user1)).to.equal( expect(await balance(web3, contracts.usdcAddress, user1)).to.equal('990')
(await amountToUnits(web3, contracts.usdcAddress, '990')).toString()
)
const tokenInOutMarket: TokenInOutMarket = { const tokenInOutMarket: TokenInOutMarket = {
tokenIn: contracts.usdcAddress, tokenIn: contracts.usdcAddress,
tokenOut: erc20Token, tokenOut: erc20Token,