Update API to promises

pull/3094/head
Grandschtroumpf 6 years ago committed by yann300
parent b6838fd7a5
commit fd799cc392
  1. 8
      src/app/editor/SourceHighlighters.js
  2. 19
      src/app/files/fileManager.js
  3. 9
      src/app/tabs/test-tab.js
  4. 33
      src/universal-dapp.js

@ -17,22 +17,20 @@ class SourceHighlighters {
}
// TODO what to do with mod?
highlight (mod, lineColumnPos, filePath, hexColor, cb) {
async highlight (mod, lineColumnPos, filePath, hexColor) {
let position
try {
position = JSON.parse(lineColumnPos)
} catch (e) {
return cb(e.message)
throw e
}
if (!this.highlighters[mod]) this.highlighters[mod] = new SourceHighlighter()
this.highlighters[mod].currentSourceLocation(null)
this.highlighters[mod].currentSourceLocationFromfileName(position, filePath, hexColor)
cb()
}
discardHighlight (mod, cb) {
async discardHighlight (mod) {
if (this.highlighters[mod]) this.highlighters[mod].currentSourceLocation(null)
cb()
}
}

@ -121,7 +121,8 @@ class FileManager {
async getCurrentFile () {
const path = this.currentFile()
if (!path) throw 'no file selected'
if (!path) throw new Error('no file selected')
console.log('Get current File', path)
return path
}
@ -206,12 +207,16 @@ class FileManager {
}
}
filesFromPath (path, cb) {
var provider = this.fileProviderOf(path)
if (provider) {
return provider.resolveDirectory(path, (error, filesTree) => { cb(error, filesTree) })
}
cb(`provider for path ${path} not found`)
getFilesFromPath (path) {
const provider = this.fileProviderOf(path)
if (!provider) throw new Error(`provider for path ${path} not found`)
// TODO : Change provider with promise
return new Promise((resolve, reject) => {
provider.resolveDirectory(path, (error, filesTree) => {
if(error) reject(error)
resolve(filesTree)
})
})
}
fileProviderOf (file) {

@ -98,15 +98,14 @@ module.exports = class TestTab {
var provider = self._deps.fileManager.fileProviderOf(path)
if (!provider) return cb(null, [])
var tests = []
self._deps.fileManager.filesFromPath(path, (error, files) => {
if (error) return cb(error)
if (!error) {
self._deps.fileManager.getFilesFromPath(path)
.then((files) => {
for (var file in files) {
if (/.(_test.sol)$/.exec(file)) tests.push(provider.type + '/' + file)
}
cb(null, tests)
}
})
})
.catch(err => cb(error))
}
self._deps.filePanel.event.register('newTestFileCreated', file => {

@ -231,23 +231,24 @@ UniversalDApp.prototype.getInputs = function (funABI) {
* SHOULD BE TAKEN CAREFULLY!
*
* @param {Object} tx - transaction.
* @param {Function} callback - callback.
*/
UniversalDApp.prototype.runTestTx = function (tx, cb) {
executionContext.detectNetwork((error, network) => {
if (error) return cb(error)
if (network.name === 'Main' && network.id === '1') {
return cb('It is not allowed to make this action against mainnet')
}
this.silentRunTx(tx, (error, result) => {
if (error) return cb(error)
cb(null, {
transactionHash: result.transactionHash,
status: result.result.status,
gasUsed: '0x' + result.result.gasUsed.toString('hex'),
error: result.result.vm.exceptionError,
return: result.result.vm.return ? '0x' + result.result.vm.return.toString('hex') : '0x',
createdAddress: result.result.createdAddress ? '0x' + result.result.createdAddress.toString('hex') : undefined
UniversalDApp.prototype.runTestTx = function (tx) {
return new Promise((resolve, reject) => {
executionContext.detectNetwork((error, network) => {
if (error) reject(error)
if (network.name === 'Main' && network.id === '1') {
reject(new Error('It is not allowed to make this action against mainnet'))
}
this.silentRunTx(tx, (error, result) => {
if (error) reject(error)
resolve({
transactionHash: result.transactionHash,
status: result.result.status,
gasUsed: '0x' + result.result.gasUsed.toString('hex'),
error: result.result.vm.exceptionError,
return: result.result.vm.return ? '0x' + result.result.vm.return.toString('hex') : '0x',
createdAddress: result.result.createdAddress ? '0x' + result.result.createdAddress.toString('hex') : undefined
})
})
})
})

Loading…
Cancel
Save