refactor deployer into a waterfall

index.js

@@ -26,7 +26,7 @@ var runTest = function(filename, web3) {
     },
     function runTests(contracts, next) {
       let test = contracts.MyTest;
-      TestRunner.runTest("SimpleStorage", test, accounts, next);
+      TestRunner.runTest("SimpleStorage", test, next);
     }
   ], function() {
   });

src/deployer.js

@@ -5,6 +5,8 @@ var async = require('async');
 function deployAll(compileResult, web3, accounts, callback) {
   let compiledObject = {}, contracts = {};
 
+  async.waterfall([
+    function getContractData(next) {
       for (let contractFile in compileResult) {
         for (let contractName in compileResult[contractFile]) {
           let contract = compileResult[contractFile][contractName];
@@ -23,8 +25,10 @@ function deployAll(compileResult, web3, accounts, callback) {
           compiledObject[className].className = className;
         }
       }
-
-  async.eachOfLimit(compiledObject, 1, function(contract, contractName, next) {
+      next();
+    },
+    function deployContracts(next) {
+      async.eachOfLimit(compiledObject, 1, function(contract, contractName, nextEach) {
         let contractObject = new web3.eth.Contract(contract.abi);
 
         let contractCode = "0x" + contract.code;
@@ -57,11 +61,14 @@ function deployAll(compileResult, web3, accounts, callback) {
 
           contracts[contractName] = contractObject;
 
-      next();
+          nextEach();
         });
       }, function() {
-    callback(null, contracts);
+        next(null, contracts);
       });
+    }
+  ], callback);
+
 }
 
 module.exports = {

src/testRunner.js

@@ -2,7 +2,7 @@ var async = require('async');
 var changeCase = require('change-case');
 require('colors');
 
-function runTest(testName, testObject, accounts, callback) {
+function runTest(testName, testObject, callback) {
   let runList = [];
   let specialFunctions = ['beforeAll'];
   let availableFunctions = testObject._jsonInterface.filter((x) => x.type === 'function').map((x) => x.name);