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)
.send({ from: owner })
await RouterContract.methods
.addFixedRateContract(this.dispenserAddress)
.addDispenserContract(this.dispenserAddress)
.send({ from: owner })
await RouterContract.methods
.addSSContract(this.sideStakingAddress)

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

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