Skip to content

Commit

Permalink
fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
0x3bfc committed Jun 12, 2020
1 parent bce7c6c commit 552d976
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 194 deletions.
1 change: 0 additions & 1 deletion scripts/get-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
'use strict'

const packageInfo = require('../package.json')

const execSync = require('child_process').execSync

process.stdout.write(
Expand Down
45 changes: 6 additions & 39 deletions src/datatokens/Datatokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const defaultDatatokensABI = require('../datatokens/DatatokensABI.json')

/**
* Provides a interface to DataTokens
*/
export class DataTokens {
public factoryAddress: string
Expand Down Expand Up @@ -40,34 +39,13 @@ export class DataTokens {
* @param {Account} account
* @return {Promise<string>} datatoken address
*/
public async create(
metaDataStoreURI: string,
account: Account
): Promise<string> {
public async create(metaDataStoreURI: string, account: Account): Promise<string> {
// Create factory contract object
const tokenAddress = null
const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress, {
from: account
})
const estGas = await factory.methods
.createToken(metaDataStoreURI)
.estimateGas(function(err, estGas){
return estGas
})
// Invoke createToken function of the contract
const trxReceipt = await factory.methods
.createToken(metaDataStoreURI)
.send({
from: account,
gas: estGas+1,
gasPrice: '3000000000'
})

let tokenAddress = null
try {
tokenAddress = trxReceipt.events.TokenCreated.returnValues[0]
} catch (e) {
console.error(e)
}
// TODO:
return tokenAddress
}

Expand Down Expand Up @@ -114,19 +92,8 @@ export class DataTokens {
dataTokenAddress,
{ from: account }
)

const estGas = await datatoken.methods.mint(address, amount)
.estimateGas(function(err, estGas){
return estGas
})

const trxReceipt = await datatoken.methods.mint(address, amount)
.send({
from:account,
gas: estGas*2,
gasPrice: '3000000000'
})

const trxReceipt = null
// TODO:
return trxReceipt
}

Expand Down Expand Up @@ -253,4 +220,4 @@ export class DataTokens {
const trxReceipt = await datatoken.methods.cap().call()
return trxReceipt
}
}
}
5 changes: 2 additions & 3 deletions src/ocean/Assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ export class Assets extends Instantiable {
const publisherURI = this.ocean.brizo.getURI()
const jsonBlob = { t: 0, url: publisherURI }
const { datatokens } = this.ocean
return datatokens.create( JSON.stringify(jsonBlob), publisher)

return datatokens.create(JSON.stringify(jsonBlob), publisher)
}

/**
Expand All @@ -80,7 +79,7 @@ export class Assets extends Instantiable {
const metadataStoreURI = this.ocean.aquarius.getURI()
const jsonBlob = { t: 1, url: metadataStoreURI }
const { datatokens } = this.ocean
dtAddress = await datatokens.create(JSON.stringify(jsonBlob), publisher )
dtAddress = await datatokens.create(JSON.stringify(jsonBlob), publisher)
this.logger.log('DataToken creted')
observer.next(CreateProgressStep.DataTokenCreated)
}
Expand Down
9 changes: 9 additions & 0 deletions test/integration/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"compilerOptions": {
"resolveJsonModule": true,
"lib": ["es6", "es7", "dom"],
"noUnusedLocals": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true
}
}
66 changes: 0 additions & 66 deletions test/unit/Datatokens.test.ts

This file was deleted.

77 changes: 0 additions & 77 deletions test/unit/TestContractHandler.ts

This file was deleted.

8 changes: 0 additions & 8 deletions test/unit/mocha.opts

This file was deleted.

9 changes: 9 additions & 0 deletions test/unit/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"compilerOptions": {
"resolveJsonModule": true,
"lib": ["es6", "es7"],
"noUnusedLocals": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true
}
}

0 comments on commit 552d976

Please sign in to comment.