add interface to compile from sources

pull/7/head
Iuri Matias 7 years ago
parent 2247beed38
commit 64dfd62130
  1. 30
      src/compiler.js
  2. 98
      src/index.js

@ -45,6 +45,34 @@ function compileFileOrFiles (filename, isDirectory, cb) {
})
}
function compileContractSources (sources, cb) {
let compiler, filepath
async.waterfall([
function loadCompiler (next) {
compiler = new RemixCompiler()
compiler.onInternalCompilerLoaded()
// compiler.event.register('compilerLoaded', this, function (version) {
next()
// });
},
function doCompilation (next) {
compiler.event.register('compilationFinished', this, function (success, data, source) {
next(null, data)
})
compiler.compile(sources, filepath)
}
], function (err, result) {
let errors = (result.errors || []).filter((e) => e.type === 'Error')
if (errors.length > 0) {
console.dir(errors)
return cb(new Error('errors compiling'))
}
cb(err, result.contracts)
})
}
module.exports = {
compileFileOrFiles: compileFileOrFiles
compileFileOrFiles: compileFileOrFiles,
compileContractSources: compileContractSources
}

@ -7,6 +7,103 @@ let Compiler = require('./compiler.js')
let Deployer = require('./deployer.js')
let TestRunner = require('./testRunner.js')
const Web3 = require('web3')
const Provider = require('remix-simulator').Provider
var createWeb3Provider = function() {
let web3 = new Web3()
web3.setProvider(new Provider())
return web3
}
var runTestSources = function (contractSources) {
async.waterfall([
function compile (next) {
Compiler.compileContractSources(contractSources, next)
},
function deployAllContracts (compilationResult, next) {
let web3 = createWeb3Provider();
Deployer.deployAll(compilationResult, web3, function (err, contracts) {
if (err) {
next(err)
}
next(null, compilationResult, contracts)
})
},
function determineTestContractsToRun (compilationResult, contracts, next) {
let contractsToTest = []
for (let filename in compilationResult) {
let contract = compilationResult[filename];
if (filename.indexOf('_test.sol') < 0) {
continue
}
Object.keys(compilationResult[filename]).forEach(contractName => {
contractsToTest.push(contractName)
})
}
next(null, contractsToTest, contracts)
},
function runTests (contractsToTest, contracts, next) {
let totalPassing = 0
let totalFailing = 0
let totalTime = 0
let errors = []
var testCallback = function (result) {
if (result.type === 'contract') {
console.log('\n ' + result.value)
} else if (result.type === 'testPass') {
console.log('\t✓ '.green.bold + result.value.grey)
} else if (result.type === 'testFailure') {
console.log('\t✘ '.bold.red + result.value.red)
errors.push(result)
}
}
var resultsCallback = function (_err, result, cb) {
totalPassing += result.passingNum
totalFailing += result.failureNum
totalTime += result.timePassed
cb()
}
async.eachOfLimit(contractsToTest, 1, (contractName, index, cb) => {
TestRunner.runTest(contractName, contracts[contractName], testCallback, (err, result) => {
if (err) {
return cb(err)
}
resultsCallback(null, result, cb)
})
}, function (err, _results) {
if (err) {
return next(err)
}
console.log('\n')
if (totalPassing > 0) {
console.log((' ' + totalPassing + ' passing ').green + ('(' + totalTime + 's)').grey)
}
if (totalFailing > 0) {
console.log((' ' + totalFailing + ' failing').red)
}
console.log('')
errors.forEach((error, index) => {
console.log(' ' + (index + 1) + ') ' + error.context + ' ' + error.value)
console.log('')
console.log(('\t error: ' + error.errMsg).red)
})
console.log('')
next()
})
}
], function () {
})
}
var runTestFiles = function (filepath, isDirectory, web3) {
async.waterfall([
function compile (next) {
@ -98,5 +195,6 @@ var runTestFiles = function (filepath, isDirectory, web3) {
module.exports = {
runTestFiles: runTestFiles,
runTestSources: runTestSources,
runTest: TestRunner.runTest
}

Loading…
Cancel
Save