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

refactor dai and usdc checks

Browse Source
This commit is contained in:
Miquel A. Cabot 2022-04-07 19:10:12 +02:00
parent b9c9ad86ae
commit f71834f493
1 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
test/unit/pools/ssContracts/SideStaking.test.ts
View File

@ -28,7 +28,6 @@ describe('SideStaking unit test', () => {
let user1: string let user1: string
let user2: string let user2: string
let initialBlock: number let initialBlock: number
let sideStakingAddress: string
let contracts: Addresses let contracts: Addresses
let pool: Pool let pool: Pool
let sideStaking: SideStaking let sideStaking: SideStaking
@ -48,7 +47,6 @@ describe('SideStaking unit test', () => {
it('should deploy contracts', async () => { it('should deploy contracts', async () => {
contracts = await deployContracts(web3, factoryOwner) contracts = await deployContracts(web3, factoryOwner)
sideStakingAddress = contracts.sideStakingAddress
// initialize Pool instance // initialize Pool instance
pool = new Pool(web3) pool = new Pool(web3)
@ -56,11 +54,11 @@ describe('SideStaking unit test', () => {
sideStaking = new SideStaking(web3) sideStaking = new SideStaking(web3)
daiContract = new web3.eth.Contract(MockERC20.abi as AbiItem[], contracts.daiAddress) daiContract = new web3.eth.Contract(MockERC20.abi as AbiItem[], contracts.daiAddress)
usdcContract = new web3.eth.Contract( usdcContract = new web3.eth.Contract(
MockERC20.abi as AbiItem[], MockERC20.abi as AbiItem[],
contracts.usdcAddress contracts.usdcAddress
) )
await approve( await approve(
web3, web3,
factoryOwner, factoryOwner,
@ -68,6 +66,18 @@ describe('SideStaking unit test', () => {
contracts.erc721FactoryAddress, contracts.erc721FactoryAddress,
'2000' '2000'
) )
assert(
parseInt(
await allowance(
web3,
contracts.daiAddress,
factoryOwner,
contracts.erc721FactoryAddress
)
) >= 2000
)
await approve( await approve(
web3, web3,
factoryOwner, factoryOwner,
@ -76,22 +86,16 @@ describe('SideStaking unit test', () => {
'10000' '10000'
) )
let allowCheck = await allowance( assert(
web3, parseInt(
contracts.daiAddress, await allowance(
factoryOwner, web3,
contracts.erc721FactoryAddress contracts.usdcAddress,
factoryOwner,
contracts.erc721FactoryAddress
)
) >= 10000
) )
assert(parseInt(allowCheck) >= 2000)
allowCheck = await allowance(
web3,
contracts.usdcAddress,
factoryOwner,
contracts.erc721FactoryAddress
)
assert(parseInt(allowCheck) >= 10000)
await amountToUnits(web3, contracts.usdcAddress, '20')
}) })
describe('Test a pool with DAI (18 Decimals)', () => { describe('Test a pool with DAI (18 Decimals)', () => {
@ -151,12 +155,10 @@ describe('SideStaking unit test', () => {
erc20Contract = new web3.eth.Contract(ERC20Template.abi as AbiItem[], erc20Token) 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 erc20Contract.methods.balanceOf(user1).call()).to.equal('0')
sideStakingAddress = contracts.sideStakingAddress
}) })
it('#getRouter - should get Router address', async () => { it('#getRouter - should get Router address', async () => {
expect(await sideStaking.getRouter(sideStakingAddress)).to.equal( expect(await sideStaking.getRouter(contracts.sideStakingAddress)).to.equal(
contracts.routerAddress contracts.routerAddress
) )
}) })
@ -180,55 +182,50 @@ describe('SideStaking unit test', () => {
}) })
it('#getBaseToken - should get baseToken address', async () => { it('#getBaseToken - should get baseToken address', async () => {
expect(await sideStaking.getBaseToken(sideStakingAddress, erc20Token)).to.equal( expect(
contracts.daiAddress await sideStaking.getBaseToken(contracts.sideStakingAddress, erc20Token)
) ).to.equal(contracts.daiAddress)
}) })
it('#getPoolAddress - should get pool address', async () => { it('#getPoolAddress - should get pool address', async () => {
expect(await sideStaking.getPoolAddress(sideStakingAddress, erc20Token)).to.equal( expect(
poolAddress await sideStaking.getPoolAddress(contracts.sideStakingAddress, erc20Token)
) ).to.equal(poolAddress)
}) })
it('#getPublisherAddress - should get publisher address', async () => { it('#getPublisherAddress - should get publisher address', async () => {
expect( expect(
await sideStaking.getPublisherAddress(sideStakingAddress, erc20Token) await sideStaking.getPublisherAddress(contracts.sideStakingAddress, erc20Token)
).to.equal(factoryOwner) ).to.equal(factoryOwner)
}) })
it('#getBaseTokenBalance ', async () => { it('#getBaseTokenBalance ', async () => {
expect( expect(
await sideStaking.getBaseTokenBalance(sideStakingAddress, erc20Token) await sideStaking.getBaseTokenBalance(contracts.sideStakingAddress, erc20Token)
).to.equal('0') ).to.equal('0')
}) })
// it('#getDatatokenBalance ', async () => {
// expect(
// await sideStaking.getDatatokenBalance(sideStakingAddress, erc20Token)
// ).to.equal('997999.9999999999')
// })
it('#getvestingAmount ', async () => { it('#getvestingAmount ', async () => {
expect(await sideStaking.getvestingAmount(sideStakingAddress, erc20Token)).to.equal( expect(
'10000' await sideStaking.getvestingAmount(contracts.sideStakingAddress, erc20Token)
) ).to.equal('10000')
}) })
it('#getvestingLastBlock ', async () => { it('#getvestingLastBlock ', async () => {
expect( expect(
await sideStaking.getvestingLastBlock(sideStakingAddress, erc20Token) await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, erc20Token)
).to.equal(initialBlock.toString()) ).to.equal(initialBlock.toString())
}) })
it('#getvestingEndBlock ', async () => { it('#getvestingEndBlock ', async () => {
expect( expect(
await sideStaking.getvestingEndBlock(sideStakingAddress, erc20Token) await sideStaking.getvestingEndBlock(contracts.sideStakingAddress, erc20Token)
).to.equal((initialBlock + vestedBlocks).toString()) ).to.equal((initialBlock + vestedBlocks).toString())
}) })
it('#getvestingAmountSoFar ', async () => { it('#getvestingAmountSoFar ', async () => {
expect( expect(
await sideStaking.getvestingAmountSoFar(sideStakingAddress, erc20Token) await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, erc20Token)
).to.equal('0') ).to.equal('0')
}) })
@ -237,7 +234,7 @@ describe('SideStaking unit test', () => {
const tx = await sideStaking.getVesting( const tx = await sideStaking.getVesting(
factoryOwner, factoryOwner,
sideStakingAddress, contracts.sideStakingAddress,
erc20Token erc20Token
) )
const collector = await erc20Contract.methods.getPaymentCollector().call() const collector = await erc20Contract.methods.getPaymentCollector().call()
@ -246,10 +243,12 @@ describe('SideStaking unit test', () => {
erc20Token, erc20Token,
await erc20Contract.methods.balanceOf(collector).call() await erc20Contract.methods.balanceOf(collector).call()
) )
).to.equal(await sideStaking.getvestingAmountSoFar(sideStakingAddress, erc20Token)) ).to.equal(
await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, erc20Token)
)
expect( expect(
await sideStaking.getvestingLastBlock(sideStakingAddress, erc20Token) await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, erc20Token)
).to.equal((await web3.eth.getBlockNumber()).toString()) ).to.equal((await web3.eth.getBlockNumber()).toString())
}) })
@ -410,36 +409,31 @@ describe('SideStaking unit test', () => {
it('#getBaseTokenBalance ', async () => { it('#getBaseTokenBalance ', async () => {
expect( expect(
await sideStaking.getBaseTokenBalance(sideStakingAddress, erc20Token) await sideStaking.getBaseTokenBalance(contracts.sideStakingAddress, erc20Token)
).to.equal('0') ).to.equal('0')
}) })
// it('#getDatatokenBalance ', async () => {
// expect(
// await sideStaking.getDatatokenBalance(sideStakingAddress, erc20Token)
// ).to.equal('997999.9999999999')
// })
it('#getvestingAmount ', async () => { it('#getvestingAmount ', async () => {
expect(await sideStaking.getvestingAmount(sideStakingAddress, erc20Token)).to.equal( expect(
'10000' await sideStaking.getvestingAmount(contracts.sideStakingAddress, erc20Token)
) ).to.equal('10000')
}) })
it('#getvestingLastBlock ', async () => { it('#getvestingLastBlock ', async () => {
expect( expect(
await sideStaking.getvestingLastBlock(sideStakingAddress, erc20Token) await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, erc20Token)
).to.equal(initialBlock.toString()) ).to.equal(initialBlock.toString())
}) })
it('#getvestingEndBlock ', async () => { it('#getvestingEndBlock ', async () => {
expect( expect(
await sideStaking.getvestingEndBlock(sideStakingAddress, erc20Token) await sideStaking.getvestingEndBlock(contracts.sideStakingAddress, erc20Token)
).to.equal((initialBlock + vestedBlocks).toString()) ).to.equal((initialBlock + vestedBlocks).toString())
}) })
it('#getvestingAmountSoFar ', async () => { it('#getvestingAmountSoFar ', async () => {
expect( expect(
await sideStaking.getvestingAmountSoFar(sideStakingAddress, erc20Token) await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, erc20Token)
).to.equal('0') ).to.equal('0')
}) })
@ -448,7 +442,7 @@ describe('SideStaking unit test', () => {
const tx = await sideStaking.getVesting( const tx = await sideStaking.getVesting(
factoryOwner, factoryOwner,
sideStakingAddress, contracts.sideStakingAddress,
erc20Token erc20Token
) )
const collector = await erc20Contract.methods.getPaymentCollector().call() const collector = await erc20Contract.methods.getPaymentCollector().call()
@ -457,10 +451,12 @@ describe('SideStaking unit test', () => {
erc20Token, erc20Token,
await erc20Contract.methods.balanceOf(collector).call() await erc20Contract.methods.balanceOf(collector).call()
) )
).to.equal(await sideStaking.getvestingAmountSoFar(sideStakingAddress, erc20Token)) ).to.equal(
await sideStaking.getvestingAmountSoFar(contracts.sideStakingAddress, erc20Token)
)
expect( expect(
await sideStaking.getvestingLastBlock(sideStakingAddress, erc20Token) await sideStaking.getvestingLastBlock(contracts.sideStakingAddress, erc20Token)
).to.equal((await web3.eth.getBlockNumber()).toString()) ).to.equal((await web3.eth.getBlockNumber()).toString())
}) })