diff --git a/lib/config/contracts.js b/lib/config/contracts.js index 0e74e1d4..ac109af6 100644 --- a/lib/config/contracts.js +++ b/lib/config/contracts.js @@ -60,10 +60,10 @@ ContractsConfig.prototype.compileContracts = function(env) { options = contractsConfig[className]; if (options.args == null) continue; - ref = options.args; + ref = options.args; //get arguments for (j = 0; j < ref.length; j++) { arg = ref[j]; - if (arg[0] === "$") { + if (arg[0] === "$") { //check if they are a contract dependency if (this.contractDependencies[className] === void 0) { this.contractDependencies[className] = []; } @@ -77,26 +77,23 @@ ContractsConfig.prototype.compileContracts = function(env) { var all_compiled_contracts = {}; // compile files - for (j = 0; j < this.contractFiles.length; j++) { - contractFile = this.contractFiles[j]; + compiled_contracts = this.compiler.compile(this.contractFiles); + + for (var className in compiled_contracts) { + var contract = compiled_contracts[className]; - compiled_contracts = this.compiler.compile(contractFile); - for (var className in compiled_contracts) { - var contract = compiled_contracts[className]; + if (this.is_a_token(className, compiled_contracts)) { + continue; + } - if (this.is_a_token(className, compiled_contracts)) { - continue; - } - - all_compiled_contracts[className] = contract; - this.all_contracts.push(className); - this.contractDB[className] = { - args: [], - types: ['file'], - gasPrice: this.blockchainConfig.gasPrice, - gasLimit: this.blockchainConfig.gasLimit, - compiled: contract - } + all_compiled_contracts[className] = contract; + this.all_contracts.push(className); + this.contractDB[className] = { + args: [], + types: ['file'], + gasPrice: this.blockchainConfig.gasPrice, + gasLimit: this.blockchainConfig.gasLimit, + compiled: contract } }