diff --git a/sol/tests.sol b/sol/tests.sol index ea57c834c8..4fafe85392 100644 --- a/sol/tests.sol +++ b/sol/tests.sol @@ -15,8 +15,6 @@ library Assert { function equal(uint a, uint b, string message) public returns (bool result) { result = (a == b); AssertionEvent(result, message); - //result = true; - //return true; } function equal(int a, int b, string message) public returns (bool result) { @@ -94,12 +92,11 @@ library Assert { AssertionEvent(result, message); } -// // TODO: needs to be convert to bytes first to be comparable -// //function notEqual(string a, string b, string message) public returns (bool result) { -// // result = (a != b); -// // AssertionEvent(result, message); -// //} - + // TODO: needs to be convert to bytes first to be comparable + //function notEqual(string a, string b, string message) public returns (bool result) { + // result = (a != b); + // AssertionEvent(result, message); + //} } diff --git a/src/deployer.js b/src/deployer.js index ec65d991cf..3d453ea08a 100644 --- a/src/deployer.js +++ b/src/deployer.js @@ -82,7 +82,6 @@ function deployAll (compileResult, web3, callback) { deployObject.send({ from: accounts[0], gas: Math.ceil(gasValue * 1.2) - //gas: 1200000 }).on('receipt', function (receipt) { contractObject.options.address = receipt.contractAddress contractObject.options.from = accounts[0] @@ -93,7 +92,8 @@ function deployAll (compileResult, web3, callback) { nextEach() }).on('error', function(err) { - console.dir(err); + console.dir(err) + nextEach(err) }) }) }, function () { diff --git a/src/provider.js b/src/provider.js index 428c66269a..454ad65599 100644 --- a/src/provider.js +++ b/src/provider.js @@ -40,7 +40,7 @@ Provider.prototype.sendAsync = function(payload, callback) { executionContext.web3().eth.getTransactionReceipt(payload.params[0], (error, receipt) => { self.deployedContracts[receipt.contractAddress] = receipt.data - var r = { + var r = { "transactionHash": receipt.hash, "transactionIndex": "0x00", "blockHash": "0x766d18646a06cf74faeabf38597314f84a82c3851859d9da9d94fc8d037269e5", diff --git a/src/testRunner.js b/src/testRunner.js index e2fa95eeda..605aa5b050 100644 --- a/src/testRunner.js +++ b/src/testRunner.js @@ -84,8 +84,6 @@ function runTest (testName, testObject, testCallback, resultsCallback) { } next() }).on('error', function(err) { - console.dir("======== error ========"); - console.dir(err); next(err); }) }