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,63 +5,70 @@ var async = require('async');
 function deployAll(compileResult, web3, accounts, callback) {
   let compiledObject = {}, contracts = {};
 
-  for (let contractFile in compileResult) {
-    for (let contractName in compileResult[contractFile]) {
-      let contract = compileResult[contractFile][contractName];
+  async.waterfall([
+    function getContractData(next) {
+      for (let contractFile in compileResult) {
+        for (let contractName in compileResult[contractFile]) {
+          let contract = compileResult[contractFile][contractName];
 
-      const className = contractName;
-      const filename = contractFile;
+          const className = contractName;
+          const filename = contractFile;
 
 
-      let abi = contract.abi;
-      let code = contract.evm.bytecode.object;
+          let abi = contract.abi;
+          let code = contract.evm.bytecode.object;
 
-      compiledObject[className] = {};
-      compiledObject[className].abi = abi;
-      compiledObject[className].code = code;
-      compiledObject[className].filename = filename;
-      compiledObject[className].className = className;
-    }
-  }
-
-  async.eachOfLimit(compiledObject, 1, function(contract, contractName, next) {
-    let contractObject = new web3.eth.Contract(contract.abi);
-
-    let contractCode = "0x" + contract.code;
-
-    // TODO: temporary code, and terrible if the contracts are not in order...
-    for (let name in compiledObject) {
-      let contractObj = compiledObject[name];
-      let linkReference = '__' + contractObj.filename + ":" + contractObj.className;
-      let toReplace = linkReference + "_".repeat(40 - linkReference.length);
-
-      if (contractCode.indexOf(linkReference) < 0) {
-        continue
-      }
-
-      if (!contractObj.deployedAddress) {
-        throw new Error("linking not found for " + name + " when deploying " + contractName);
+          compiledObject[className] = {};
+          compiledObject[className].abi = abi;
+          compiledObject[className].code = code;
+          compiledObject[className].filename = filename;
+          compiledObject[className].className = className;
+        }
       }
-
-      contractCode = contractCode.replace(new RegExp(toReplace, "g"), contractObj.deployedAddress)
+      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;
+
+        // TODO: temporary code, and terrible if the contracts are not in order...
+        for (let name in compiledObject) {
+          let contractObj = compiledObject[name];
+          let linkReference = '__' + contractObj.filename + ":" + contractObj.className;
+          let toReplace = linkReference + "_".repeat(40 - linkReference.length);
+
+          if (contractCode.indexOf(linkReference) < 0) {
+            continue
+          }
+
+          if (!contractObj.deployedAddress) {
+            throw new Error("linking not found for " + name + " when deploying " + contractName);
+          }
+
+          contractCode = contractCode.replace(new RegExp(toReplace, "g"), contractObj.deployedAddress)
+        }
+
+        contractObject.deploy({arguments: [], data: contractCode}).send({
+          from: accounts[0],
+          gas: 4000 * 1000
+        }).on('receipt', function(receipt) {
+          contractObject.options.address = receipt.contractAddress;
+          contractObject.options.from = accounts[0];
+          contractObject.options.gas = 4000*1000;
+          compiledObject[contractName].deployedAddress = receipt.contractAddress;
+
+          contracts[contractName] = contractObject;
+
+          nextEach();
+        });
+      }, function() {
+        next(null, contracts);
+      });
     }
+  ], callback);
 
-    contractObject.deploy({arguments: [], data: contractCode}).send({
-      from: accounts[0],
-      gas: 4000 * 1000
-    }).on('receipt', function(receipt) {
-      contractObject.options.address = receipt.contractAddress;
-      contractObject.options.from = accounts[0];
-      contractObject.options.gas = 4000*1000;
-      compiledObject[contractName].deployedAddress = receipt.contractAddress;
-
-      contracts[contractName] = contractObject;
-
-      next();
-    });
-  }, function() {
-    callback(null, contracts);
-  });
 }
 
 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);