From 3f933280d93a50359b7349fb5c85823accc72be2 Mon Sep 17 00:00:00 2001 From: arsenyjin Date: Mon, 29 Jun 2020 12:20:37 +0200 Subject: [PATCH 1/4] fix transferFrom --- test/unit/Datatokens.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/Datatokens.test.ts b/test/unit/Datatokens.test.ts index cd15c644..d58dc765 100644 --- a/test/unit/Datatokens.test.ts +++ b/test/unit/Datatokens.test.ts @@ -65,7 +65,7 @@ describe('DataTokens', () => { it('#transferFrom', async () => { await datatoken.transferFrom(tokenAddress, spender, tokenAmount, minter) - minter = await datatoken.balance(tokenAddress, spender) + balance = await datatoken.balance(tokenAddress, spender) assert(balance.toString() === tokenAmount.toString()) }) }) From 67453da19d494d488789651cbacf232b4aa41158 Mon Sep 17 00:00:00 2001 From: arsenyjin Date: Mon, 29 Jun 2020 12:30:37 +0200 Subject: [PATCH 2/4] fix transferFrom --- test/unit/Datatokens.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/Datatokens.test.ts b/test/unit/Datatokens.test.ts index d58dc765..64b4fad5 100644 --- a/test/unit/Datatokens.test.ts +++ b/test/unit/Datatokens.test.ts @@ -65,7 +65,7 @@ describe('DataTokens', () => { it('#transferFrom', async () => { await datatoken.transferFrom(tokenAddress, spender, tokenAmount, minter) - balance = await datatoken.balance(tokenAddress, spender) + balance = await datatoken.balance(tokenAddress, minter) assert(balance.toString() === tokenAmount.toString()) }) }) From db693c733152eaff283514134ca308396fe1e40c Mon Sep 17 00:00:00 2001 From: arsenyjin Date: Mon, 29 Jun 2020 12:58:52 +0200 Subject: [PATCH 3/4] move datatokens tests --- test/unit/{ => datatokens}/Datatokens.test.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename test/unit/{ => datatokens}/Datatokens.test.ts (79%) diff --git a/test/unit/Datatokens.test.ts b/test/unit/datatokens/Datatokens.test.ts similarity index 79% rename from test/unit/Datatokens.test.ts rename to test/unit/datatokens/Datatokens.test.ts index 64b4fad5..b452a203 100644 --- a/test/unit/Datatokens.test.ts +++ b/test/unit/datatokens/Datatokens.test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' -import { TestContractHandler } from '../TestContractHandler' -import { DataTokens } from '../../src/datatokens/Datatokens' +import { TestContractHandler } from '../../TestContractHandler' +import { DataTokens } from '../../../src/datatokens/Datatokens' const Web3 = require('web3') const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') @@ -19,7 +19,7 @@ describe('DataTokens', () => { const blob = 'https://example.com/dataset-1' describe('#test', () => { - it('#deploy', async () => { + it('should deploy contracts', async () => { contracts = new TestContractHandler( factory.abi, datatokensTemplate.abi, @@ -32,7 +32,7 @@ describe('DataTokens', () => { await contracts.deployContracts(minter) }) - it('#init', async () => { + it('should initialize datatokens class', async () => { datatoken = new DataTokens( contracts.factoryAddress, factory.abi, @@ -42,28 +42,28 @@ describe('DataTokens', () => { assert(datatoken !== null) }) - it('#create', async () => { + it('should create datatokens smart contract', async () => { tokenAddress = await datatoken.create(blob, minter) assert(tokenAddress !== null) }) - it('#mint', async () => { + it('should mint datatokens', async () => { await datatoken.mint(tokenAddress, minter, tokenAmount) balance = await datatoken.balance(tokenAddress, minter) assert(balance.toString() === tokenAmount.toString()) }) - it('#transfer', async () => { + it('should transfer datatokens', async () => { await datatoken.transfer(tokenAddress, spender, tokenAmount, minter) balance = await datatoken.balance(tokenAddress, spender) assert(balance.toString() === tokenAmount.toString()) }) - it('#approve', async () => { + it('should approve datatokens transfer', async () => { await datatoken.approve(tokenAddress, minter, tokenAmount, spender) }) - it('#transferFrom', async () => { + it('should transferFrom datatokens', async () => { await datatoken.transferFrom(tokenAddress, spender, tokenAmount, minter) balance = await datatoken.balance(tokenAddress, minter) assert(balance.toString() === tokenAmount.toString()) From 96e1bb1b84086649d0e57a99627a91624dcfec11 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Thu, 2 Jul 2020 17:02:30 +0200 Subject: [PATCH 4/4] fix unit test conflict --- test/unit/{datatokens => }/Datatokens.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename test/unit/{datatokens => }/Datatokens.test.ts (93%) diff --git a/test/unit/datatokens/Datatokens.test.ts b/test/unit/Datatokens.test.ts similarity index 93% rename from test/unit/datatokens/Datatokens.test.ts rename to test/unit/Datatokens.test.ts index b452a203..627a2dc3 100644 --- a/test/unit/datatokens/Datatokens.test.ts +++ b/test/unit/Datatokens.test.ts @@ -1,6 +1,6 @@ import { assert } from 'chai' -import { TestContractHandler } from '../../TestContractHandler' -import { DataTokens } from '../../../src/datatokens/Datatokens' +import { TestContractHandler } from '../TestContractHandler' +import { DataTokens } from '../../src/datatokens/Datatokens' const Web3 = require('web3') const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') @@ -24,7 +24,8 @@ describe('DataTokens', () => { factory.abi, datatokensTemplate.abi, datatokensTemplate.bytecode, - factory.bytecode + factory.bytecode, + web3 ) await contracts.getAccounts() minter = contracts.accounts[0]