Commit 811067ec authored by Iuri Matias's avatar Iuri Matias

move get accounts into deployer

parent e14d029c
...@@ -15,14 +15,8 @@ var runTest = function(filename, web3) { ...@@ -15,14 +15,8 @@ var runTest = function(filename, web3) {
next(); next();
}); });
}, },
function getAccountList(next) {
web3.eth.getAccounts((err, _accounts) => {
accounts = _accounts;
next();
});
},
function deployAllContracts(next) { function deployAllContracts(next) {
Deployer.deployAll(result, web3, accounts, next); Deployer.deployAll(result, web3, next);
}, },
function runTests(contracts, next) { function runTests(contracts, next) {
let test = contracts.MyTest; let test = contracts.MyTest;
......
...@@ -2,10 +2,16 @@ var async = require('async'); ...@@ -2,10 +2,16 @@ var async = require('async');
// TODO: replace this with remix's own deployer code // TODO: replace this with remix's own deployer code
function deployAll(compileResult, web3, accounts, callback) { function deployAll(compileResult, web3, callback) {
let compiledObject = {}, contracts = {}; let compiledObject = {}, contracts = {}, accounts;
async.waterfall([ async.waterfall([
function getAccountList(next) {
web3.eth.getAccounts((err, _accounts) => {
accounts = _accounts;
next();
});
},
function getContractData(next) { function getContractData(next) {
for (let contractFile in compileResult) { for (let contractFile in compileResult) {
for (let contractName in compileResult[contractFile]) { for (let contractName in compileResult[contractFile]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment