simplify method dealing with instanceOf

Author: iurimatias

lib/contracts.js

@@ -80,48 +80,51 @@ ContractsManager.prototype.build = function(done) {
       }
       callback();
     },
+    function setDeployIntention(callback) {
+      var className, contract;
+      for(className in self.contracts) {
+        contract = self.contracts[className];
+        contract.deploy = (contract.deploy === undefined) || contract.deploy;
+      }
+    },
     function dealWithSpecialConfigs(callback) {
       var className, contract, parentContractName, parentContract;
 
       for(className in self.contracts) {
         contract = self.contracts[className];
 
-        // if deploy intention is not specified default is true
-        if (contract.deploy === undefined) {
-          contract.deploy = true;
-        }
+        if (contract.instanceOf === undefined) { continue; }
 
-        if (contract.instanceOf !== undefined) {
-          parentContractName = contract.instanceOf;
-          parentContract = self.contracts[parentContractName];
+        parentContractName = contract.instanceOf;
+        parentContract = self.contracts[parentContractName];
 
-          if (parentContract === className) {
-            self.logger.error(className + ": instanceOf is set to itself");
-            continue;
-          }
+        if (parentContract === className) {
+          self.logger.error(className + ": instanceOf is set to itself");
+          continue;
+        }
 
-          if (parentContract === undefined) {
-            slef.logger.error(className + ": couldn't find instanceOf contract " + parentContractName);
-            continue;
-          }
+        if (parentContract === undefined) {
+          self.logger.error(className + ": couldn't find instanceOf contract " + parentContractName);
+          continue;
+        }
 
-          if (parentContract.args && parentContract.args.length > 0 && contract.args === []) {
-            contract.args = parentContract.args;
-          }
+        if (parentContract.args && parentContract.args.length > 0 && contract.args === []) {
+          contract.args = parentContract.args;
+        }
 
-          if (contract.code !== undefined) {
-            self.logger.error(className + " has code associated to it but it's configured as an instanceOf " + parentContractName);
-          }
+        if (contract.code !== undefined) {
+          self.logger.error(className + " has code associated to it but it's configured as an instanceOf " + parentContractName);
+        }
 
-          contract.code             = parentContract.code;
-          contract.runtimeBytecode  = parentContract.runtimeBytecode;
-          contract.gasEstimates     = parentContract.gasEstimates;
-          contract.functionHashes   = parentContract.functionHashes;
-          contract.abiDefinition    = parentContract.abiDefinition;
+        contract.code             = parentContract.code;
+        contract.runtimeBytecode  = parentContract.runtimeBytecode;
+        contract.gasEstimates     = parentContract.gasEstimates;
+        contract.functionHashes   = parentContract.functionHashes;
+        contract.abiDefinition    = parentContract.abiDefinition;
+
+        contract.gas       = contract.gas      || parentContract.gas;
+        contract.gasPrice  = contract.gasPrice || parentContract.gasPrice;
 
-          contract.gas       = contract.gas      || parentContract.gas;
-          contract.gasPrice  = contract.gasPrice || parentContract.gasPrice;
-        }
       }
       callback();
     },