Merge branch 'develop' into 1.0

This commit is contained in:
Fabian Vogelsteller 2017-01-05 15:38:09 +01:00
commit 0ac8ffab15
No known key found for this signature in database
GPG Key ID: E51EADA77F1A4124
2 changed files with 4 additions and 4 deletions

View File

@ -18,9 +18,9 @@
"}\n";
var compiled = web3.eth.compile.solidity(source);
var code = compiled.test.code;
var code = compiled.code;
// contract json abi, this is autogenerated using solc CLI
var abi = compiled.test.info.abiDefinition;
var abi = compiled.info.abiDefinition;
var myContract;

View File

@ -18,9 +18,9 @@
"}\n";
var compiled = web3.eth.compile.solidity(source);
var code = compiled.test.code;
var code = compiled.code;
// contract json abi, this is autogenerated using solc CLI
var abi = compiled.test.info.abiDefinition;
var abi = compiled.info.abiDefinition;
var myContract;