From 36986aa92898a75753fefdb6237f05feb970e351 Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Fri, 10 Jun 2022 11:09:16 +0200 Subject: [PATCH] rename erc20 to datatoken in SideStaking test --- .../pools/ssContracts/SideStaking.test.ts | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/test/unit/pools/ssContracts/SideStaking.test.ts b/test/unit/pools/ssContracts/SideStaking.test.ts index 86367516..d2c36b16 100644 --- a/test/unit/pools/ssContracts/SideStaking.test.ts +++ b/test/unit/pools/ssContracts/SideStaking.test.ts @@ -34,8 +34,8 @@ describe('SideStaking unit test', () => { let pool: Pool let sideStaking: SideStaking let poolAddress: string - let erc20Token: string - let erc20Contract: Contract + let datatoken: string + let datatokenContract: Contract let daiContract: Contract let usdcContract: Contract @@ -161,12 +161,12 @@ describe('SideStaking unit test', () => { ) initialBlock = await web3.eth.getBlockNumber() - erc20Token = txReceipt.events.TokenCreated.returnValues.newTokenAddress + datatoken = txReceipt.events.TokenCreated.returnValues.newTokenAddress poolAddress = txReceipt.events.NewPool.returnValues.poolAddress - erc20Contract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], erc20Token) + datatokenContract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], datatoken) // user1 has no dt1 - expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal('0') + expect(await datatokenContract.methods.balanceOf(user1).call()).to.equal('0') }) it('#getRouter - should get Router address', async () => { @@ -179,7 +179,7 @@ describe('SideStaking unit test', () => { expect( await sideStaking.getDatatokenCirculatingSupply( contracts.sideStakingAddress, - erc20Token + datatoken ) ).to.equal(web3.utils.toWei(BASE_TOKEN_LIQUIDITY.toString())) }) @@ -188,39 +188,39 @@ describe('SideStaking unit test', () => { expect( await sideStaking.getDatatokenCurrentCirculatingSupply( contracts.sideStakingAddress, - erc20Token + datatoken ) ).to.equal(web3.utils.toWei(BASE_TOKEN_LIQUIDITY.toString())) }) it('#getBaseToken - should get baseToken address', async () => { expect( - await sideStaking.getBaseToken(contracts.sideStakingAddress, erc20Token) + await sideStaking.getBaseToken(contracts.sideStakingAddress, datatoken) ).to.equal(contracts.daiAddress) }) it('#getPoolAddress - should get pool address', async () => { expect( - await sideStaking.getPoolAddress(contracts.sideStakingAddress, erc20Token) + await sideStaking.getPoolAddress(contracts.sideStakingAddress, datatoken) ).to.equal(poolAddress) }) it('#getPublisherAddress - should get publisher address', async () => { expect( - await sideStaking.getPublisherAddress(contracts.sideStakingAddress, erc20Token) + await sideStaking.getPublisherAddress(contracts.sideStakingAddress, datatoken) ).to.equal(factoryOwner) }) it('#getBaseTokenBalance ', async () => { expect( - await sideStaking.getBaseTokenBalance(contracts.sideStakingAddress, erc20Token) + await sideStaking.getBaseTokenBalance(contracts.sideStakingAddress, datatoken) ).to.equal('0') }) it('#getDatatokenBalance ', async () => { expect( await ( - await sideStaking.getDatatokenBalance(contracts.sideStakingAddress, erc20Token) + await sideStaking.getDatatokenBalance(contracts.sideStakingAddress, datatoken) ).toString() ).to.equal( new BigNumber(2) @@ -234,19 +234,19 @@ describe('SideStaking unit test', () => { it('#getvestingAmount ', async () => { expect( - await sideStaking.getvestingAmount(contracts.sideStakingAddress, erc20Token) + await sideStaking.getvestingAmount(contracts.sideStakingAddress, datatoken) ).to.equal('0') }) it('#getvestingLastBlock ', async () => { expect( - await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, erc20Token) + await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, datatoken) ).to.equal(initialBlock.toString()) }) it('#getvestingAmountSoFar ', async () => { expect( - await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, erc20Token) + await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, datatoken) ).to.equal('0') }) @@ -258,7 +258,7 @@ describe('SideStaking unit test', () => { const tokenInOutMarket: TokenInOutMarket = { tokenIn: contracts.daiAddress, - tokenOut: erc20Token, + tokenOut: datatoken, marketFeeAddress: factoryOwner } @@ -275,7 +275,7 @@ describe('SideStaking unit test', () => { amountsInOutMaxFee ) - expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal( + expect(await datatokenContract.methods.balanceOf(user1).call()).to.equal( tx.events.LOG_SWAP.returnValues.tokenAmountOut ) }) @@ -284,7 +284,7 @@ describe('SideStaking unit test', () => { await approve(web3, user1, contracts.daiAddress, poolAddress, '100') const tokenInOutMarket: TokenInOutMarket = { tokenIn: contracts.daiAddress, - tokenOut: erc20Token, + tokenOut: datatoken, marketFeeAddress: factoryOwner } const amountsInOutMaxFee: AmountsOutMaxFee = { @@ -341,7 +341,7 @@ describe('SideStaking unit test', () => { expect(tx.events.LOG_EXIT[0].returnValues.tokenOut).to.equal(contracts.daiAddress) // DTs were also unstaked in the same transaction (went to the staking contract) - expect(tx.events.LOG_EXIT[1].returnValues.tokenOut).to.equal(erc20Token) + expect(tx.events.LOG_EXIT[1].returnValues.tokenOut).to.equal(datatoken) }) }) @@ -383,24 +383,24 @@ describe('SideStaking unit test', () => { ) initialBlock = await web3.eth.getBlockNumber() - erc20Token = txReceipt.events.TokenCreated.returnValues.newTokenAddress + datatoken = txReceipt.events.TokenCreated.returnValues.newTokenAddress poolAddress = txReceipt.events.NewPool.returnValues.poolAddress - erc20Contract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], erc20Token) + datatokenContract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], datatoken) // user1 has no dt1 - expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal('0') + expect(await datatokenContract.methods.balanceOf(user1).call()).to.equal('0') }) it('#getBaseTokenBalance ', async () => { expect( - await sideStaking.getBaseTokenBalance(contracts.sideStakingAddress, erc20Token) + await sideStaking.getBaseTokenBalance(contracts.sideStakingAddress, datatoken) ).to.equal('0') }) it('#getDatatokenBalance ', async () => { expect( await ( - await sideStaking.getDatatokenBalance(contracts.sideStakingAddress, erc20Token) + await sideStaking.getDatatokenBalance(contracts.sideStakingAddress, datatoken) ).toString() ).to.equal( new BigNumber(2) @@ -414,19 +414,19 @@ describe('SideStaking unit test', () => { it('#getvestingAmount ', async () => { expect( - await sideStaking.getvestingAmount(contracts.sideStakingAddress, erc20Token) + await sideStaking.getvestingAmount(contracts.sideStakingAddress, datatoken) ).to.equal('0') }) it('#getvestingLastBlock ', async () => { expect( - await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, erc20Token) + await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, datatoken) ).to.equal(initialBlock.toString()) }) it('#getvestingAmountSoFar ', async () => { expect( - await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, erc20Token) + await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, datatoken) ).to.equal('0') }) @@ -439,7 +439,7 @@ describe('SideStaking unit test', () => { await approve(web3, user1, contracts.usdcAddress, poolAddress, '10') const tokenInOutMarket: TokenInOutMarket = { tokenIn: contracts.usdcAddress, - tokenOut: erc20Token, + tokenOut: datatoken, marketFeeAddress: factoryOwner } const amountsInOutMaxFee: AmountsInMaxFee = { @@ -453,7 +453,7 @@ describe('SideStaking unit test', () => { tokenInOutMarket, amountsInOutMaxFee ) - expect(await erc20Contract.methods.balanceOf(user1).call()).to.equal( + expect(await datatokenContract.methods.balanceOf(user1).call()).to.equal( tx.events.LOG_SWAP.returnValues.tokenAmountOut ) }) @@ -462,7 +462,7 @@ describe('SideStaking unit test', () => { await approve(web3, user1, contracts.usdcAddress, poolAddress, '100') const tokenInOutMarket: TokenInOutMarket = { tokenIn: contracts.usdcAddress, - tokenOut: erc20Token, + tokenOut: datatoken, marketFeeAddress: factoryOwner } const amountsInOutMaxFee: AmountsOutMaxFee = { @@ -517,7 +517,7 @@ describe('SideStaking unit test', () => { expect(tx.events.LOG_EXIT[0].returnValues.tokenOut).to.equal(contracts.usdcAddress) // DTs were also unstaked in the same transaction (went to the staking contract) - expect(tx.events.LOG_EXIT[1].returnValues.tokenOut).to.equal(erc20Token) + expect(tx.events.LOG_EXIT[1].returnValues.tokenOut).to.equal(datatoken) }) }) })