Add optional flag to gaiad testnet to make config directory of daem…

…on and cli configurable, fixes cosmos#1992

PENDING.md

@@ -18,7 +18,7 @@ BREAKING CHANGES
   * `gaiacli gov submit-proposal --proposer`
   * `gaiacli gov deposit --depositer`
   * `gaiacli gov vote --voter`
-* [x/gov] Added tags sub-package, changed tags to use dash-case 
+* [x/gov] Added tags sub-package, changed tags to use dash-case
 
 FEATURES
 * [lcd] Can now query governance proposals by ProposalStatus
@@ -27,7 +27,7 @@ FEATURES
   * Modules can test random combinations of their own operations
   * Applications can integrate operations and invariants from modules together for an integrated simulation
 * [baseapp] Initialize validator set on ResponseInitChain
-* [cosmos-sdk-cli] Added support for cosmos-sdk-cli tool under cosmos-sdk/cmd	
+* [cosmos-sdk-cli] Added support for cosmos-sdk-cli tool under cosmos-sdk/cmd
    * This allows SDK users to initialize a new project repository.
 * [tests] Remotenet commands for AWS (awsnet)
 
@@ -39,3 +39,4 @@ IMPROVEMENTS
 * [x/gov] Votes on a proposal can now be queried
 * [x/bank] Unit tests are now table-driven
 * [tests] Fixes ansible scripts to work with AWS too
+* [gaiad] Add optional flag to `gaiad testnet` to make config directory of daemon (default `gaiad`) and cli (default `gaiacli`) configurable

server/testnet.go

@@ -18,9 +18,11 @@ import (
 )
 
 var (
-	nodeDirPrefix = "node-dir-prefix"
-	nValidators   = "v"
-	outputDir     = "o"
+	nodeDirPrefix  = "node-dir-prefix"
+	nValidators    = "v"
+	outputDir      = "o"
+	nodeDaemonHome = "node-daemon-home"
+	nodeCliHome    = "node-cli-home"
 
 	startingIPAddress = "starting-ip-address"
 )
@@ -39,7 +41,7 @@ Note, strict routability for addresses is turned off in the config file.
 
 Example:
 
-	gaiad testnet --v 4 --output-dir ./output --starting-ip-address 192.168.10.2
+	gaiad testnet --v 4 --o ./output --starting-ip-address 192.168.10.2
 	`,
 		RunE: func(_ *cobra.Command, _ []string) error {
 			config := ctx.Config
@@ -53,6 +55,10 @@ Example:
 		"Directory to store initialization data for the testnet")
 	cmd.Flags().String(nodeDirPrefix, "node",
 		"Prefix the directory name for each node with (node results in node0, node1, ...)")
+	cmd.Flags().String(nodeDaemonHome, "gaiad",
+		"Home directory of the node's daemon configuration")
+	cmd.Flags().String(nodeCliHome, "gaiacli",
+		"Home directory of the node's cli configuration")
 
 	cmd.Flags().String(startingIPAddress, "192.168.0.1",
 		"Starting IP address (192.168.0.1 results in persistent peers list ID0@192.168.0.1:46656, ID1@192.168.0.2:46656, ...)")
@@ -66,8 +72,10 @@ func testnetWithConfig(config *cfg.Config, cdc *wire.Codec, appInit AppInit) err
 	// Generate private key, node ID, initial transaction
 	for i := 0; i < numValidators; i++ {
 		nodeDirName := fmt.Sprintf("%s%d", viper.GetString(nodeDirPrefix), i)
-		nodeDir := filepath.Join(outDir, nodeDirName, "gaiad")
-		clientDir := filepath.Join(outDir, nodeDirName, "gaiacli")
+		nodeDaemonHomeName := viper.GetString(nodeDaemonHome)
+		nodeCliHomeName := viper.GetString(nodeCliHome)
+		nodeDir := filepath.Join(outDir, nodeDirName, nodeDaemonHomeName)
+		clientDir := filepath.Join(outDir, nodeDirName, nodeCliHomeName)
 		gentxsDir := filepath.Join(outDir, "gentxs")
 		config.SetRoot(nodeDir)
 
@@ -122,7 +130,8 @@ func testnetWithConfig(config *cfg.Config, cdc *wire.Codec, appInit AppInit) err
 	for i := 0; i < numValidators; i++ {
 
 		nodeDirName := fmt.Sprintf("%s%d", viper.GetString(nodeDirPrefix), i)
-		nodeDir := filepath.Join(outDir, nodeDirName, "gaiad")
+		nodeDaemonHomeName := viper.GetString(nodeDaemonHome)
+		nodeDir := filepath.Join(outDir, nodeDirName, nodeDaemonHomeName)
 		gentxsDir := filepath.Join(outDir, "gentxs")
 		initConfig := InitConfig{
 			chainID,