refactor to use commonOptions method

Author: iurimatias

lib/geth_commands.js

@@ -4,35 +4,16 @@ var GethCommands = function(options) {
   this.name = "Go-Ethereum (https://github.com/ethereum/go-ethereum)";
 };
 
-GethCommands.prototype.initGenesisCommmand = function() {
-  var config = this.config;
-  var cmd = "geth ";
-
-  if (config.networkType === 'testnet') {
-    cmd += "--testnet ";
-  } else if (config.networkType === 'olympic') {
-    cmd += "--olympic ";
-  }
-
-  if (config.datadir) {
-    cmd += "--datadir=\"" + config.datadir + "\" ";
-  }
-
-  if (config.genesisBlock) {
-    cmd += "init \"" + config.genesisBlock + "\" ";
-  }
-
-  return cmd;
-};
-
-GethCommands.prototype.newAccountCommand = function() {
+GethCommands.prototype.commonOptions = function() {
   var config = this.config;
-  var cmd = "geth ";
+  var cmd = "";
 
   if (config.networkType === 'testnet') {
     cmd += "--testnet ";
   } else if (config.networkType === 'olympic') {
     cmd += "--olympic ";
+  } else if (config.networkType === 'custom') {
+    cmd += "--networkid " + config.networkId + " ";
   }
 
   if (config.datadir) {
@@ -43,32 +24,24 @@ GethCommands.prototype.newAccountCommand = function() {
     cmd += "--password " + config.account.password + " ";
   }
 
-  return cmd + "account new ";
+  return cmd;
 };
 
-GethCommands.prototype.commonOptions = function() {
+GethCommands.prototype.initGenesisCommmand = function() {
   var config = this.config;
-  var cmd = "";
+  var cmd = "geth " + this.commonOptions();
 
-  if (config.networkType === 'testnet') {
-    cmd += "--testnet ";
-  } else if (config.networkType === 'olympic') {
-    cmd += "--olympic ";
-  } else if (config.networkType === 'custom') {
-    cmd += "--networkid " + config.networkId + " ";
-  }
-
-  if (config.datadir) {
-    cmd += "--datadir=\"" + config.datadir + "\" ";
-  }
-
-  if (config.account && config.account.password) {
-    cmd += "--password " + config.account.password + " ";
+  if (config.genesisBlock) {
+    cmd += "init \"" + config.genesisBlock + "\" ";
   }
 
   return cmd;
 };
 
+GethCommands.prototype.newAccountCommand = function() {
+  return "geth " + this.commonOptions() + "account new ";
+};
+
 GethCommands.prototype.listAccountsCommand = function() {
   return "geth " + this.commonOptions() + "account list ";
 };