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

fixed dispenser datatoken test

Browse Source
This commit is contained in:
Bogdan Fazakas 2021-11-05 11:29:21 +02:00
parent 16985d5a3a
commit 540acdc442
2 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TestContractHandler.ts
View File

@ -398,7 +398,7 @@ export class TestContractHandler {
.addFixedRateContract(this.fixedRateAddress) .addFixedRateContract(this.fixedRateAddress)
.send({ from: owner }) .send({ from: owner })
await RouterContract.methods await RouterContract.methods
.addFixedRateContract(this.dispenserAddress) .addDispenserContract(this.dispenserAddress)
.send({ from: owner }) .send({ from: owner })
await RouterContract.methods await RouterContract.methods
.addSSContract(this.sideStakingAddress) .addSSContract(this.sideStakingAddress)

70
test/unit/Datatoken.test.ts
View File

@ -162,20 +162,17 @@ describe('Datatoken', () => {
exchangeId = fre.events.NewFixedRate.returnValues[0] exchangeId = fre.events.NewFixedRate.returnValues[0]
}) })
it('#createDispenser - Enterprise method', async () => { it('#createDispenser - method creates a dispenser for the erc20DT', async () => {
// console.log('dispenser address', contractHandler.dispenserAddress) const dispenser = await datatoken.createDispenser(
// // create dispenser datatokenAddress,
// const dispenser = await datatoken.createDispenser( nftOwner,
// datatokenAddress, contractHandler.dispenserAddress,
// nftOwner, '10',
// contractHandler.dispenserAddress, '100',
// '10', true,
// '100', user1
// true, )
// user1 assert(dispenser !== null)
// )
// console.log('dispenser', dispenser)
// // assert(dispenser !== null)
}) })
it('#removeMinter - should remove user1 as minter, if nftDatatoken has ERC20Deployer permission', async () => { it('#removeMinter - should remove user1 as minter, if nftDatatoken has ERC20Deployer permission', async () => {
@ -273,35 +270,22 @@ describe('Datatoken', () => {
}) })
it('#buyFromDispenserAndOrder- Enterprise method', async () => { it('#buyFromDispenserAndOrder- Enterprise method', async () => {
// await nftDatatoken.addERC20Deployer(nftAddress, nftOwner, user1) const order: OrderParams = {
// // create dt consumer: user1,
// const erc20Dt = await nftDatatoken.createERC20( amount: '1',
// nftAddress, serviceId: 1,
// nftOwner, consumeFeeAddress: user1,
// nftOwner, consumeFeeToken: '0x0000000000000000000000000000000000000000',
// user1, consumeFeeAmount: '0'
// user2, }
// '0x0000000000000000000000000000000000000000',
// '0', const buyFromDispenseTx = await datatoken.buyFromDispenserAndOrder(
// '10000', datatokenAddress,
// nftName, nftOwner,
// nftSymbol, order,
// 1 contractHandler.dispenserAddress
// ) )
// assert(erc20Dt !== null) assert(buyFromDispenseTx !== null)
// console.log('dispenser address', contractHandler.dispenserAddress)
// // create dispenser
// const dispenser = await datatoken.createDispenser(
// erc20Dt,
// user1,
// contractHandler.dispenserAddress,
// '10',
// '100',
// true,
// user1
// )
// console.log('dispenser', dispenser)
// assert(dispenser !== null)
}) })
it('#buyFromFreAndOrder - Enterprise method ', async () => { it('#buyFromFreAndOrder - Enterprise method ', async () => {