From d3b4d4245817fdb0d320846962af82daf4624356 Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Tue, 10 Oct 2017 03:13:02 -0400
Subject: [PATCH] integrated init --static, fix tests

---
 examples/eyes/cmd/eyes/init.go | 20 +--------------
 server/commands/init.go        | 46 ++++++++++++++++++++++++++++------
 tests/cli/common.sh            |  2 +-
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/examples/eyes/cmd/eyes/init.go b/examples/eyes/cmd/eyes/init.go
index c4c36cf3db..29e682193b 100644
--- a/examples/eyes/cmd/eyes/init.go
+++ b/examples/eyes/cmd/eyes/init.go
@@ -35,27 +35,9 @@ func initCmd(cmd *cobra.Command, args []string) error {
 	}
 
 	genesis := getGenesisJSON(viper.GetString(commands.FlagChainID))
-	return commands.CreateGenesisValidatorFiles(cfg, genesis, PrivValJSON, cmd.Root().Name())
+	return commands.CreateGenesisValidatorFiles(cfg, genesis, commands.StaticPrivValJSON, cmd.Root().Name())
 }
 
-// PrivValJSON - validator private key file contents in json
-var PrivValJSON = `{
-  "address": "7A956FADD20D3A5B2375042B2959F8AB172A058F",
-  "last_height": 0,
-  "last_round": 0,
-  "last_signature": null,
-  "last_signbytes": "",
-  "last_step": 0,
-  "priv_key": {
-    "type": "ed25519",
-    "data": "D07ABE82A8B15559A983B2DB5D4842B2B6E4D6AF58B080005662F424F17D68C17B90EA87E7DC0C7145C8C48C08992BE271C7234134343E8A8E8008E617DE7B30"
-  },
-  "pub_key": {
-    "type": "ed25519",
-    "data": "7B90EA87E7DC0C7145C8C48C08992BE271C7234134343E8A8E8008E617DE7B30"
-  }
-}`
-
 // TODO: better, auto-generate validator...
 func getGenesisJSON(chainID string) string {
 	return fmt.Sprintf(`{
diff --git a/server/commands/init.go b/server/commands/init.go
index bfdc94430e..5f28406f24 100644
--- a/server/commands/init.go
+++ b/server/commands/init.go
@@ -29,11 +29,13 @@ var InitCmd = &cobra.Command{
 var (
 	FlagChainID = "chain-id" //TODO group with other flags or remove? is this already a flag here?
 	FlagOption  = "option"
+	FlagStatic  = "static"
 )
 
 func init() {
 	InitCmd.Flags().String(FlagChainID, "test_chain_id", "Chain ID")
 	InitCmd.Flags().StringSliceP(FlagOption, "p", []string{}, "Genesis option in the format <app>/<option>/<value>")
+	InitCmd.Flags().Bool(FlagStatic, false, "use a static private validator")
 }
 
 // returns 1 iff it set a file, otherwise 0 (so we can add them)
@@ -93,19 +95,47 @@ func initCmd(cmd *cobra.Command, args []string) error {
 		optionsStr = sep + strings.Join(options[:], sep)
 	}
 
-	privVal := types.GenPrivValidatorFS("")
-	privValHex := strings.ToUpper(hex.EncodeToString(privVal.PubKey.Bytes()[1:]))
-	genesis := GetGenesisJSON(privValHex, viper.GetString(FlagChainID),
-		userAddr, optionsStr)
+	var privValJSON, pubkey string
+	if viper.GetBool(FlagStatic) {
+		privValJSON = StaticPrivValJSON
+		pubkey = StaticPK
+	} else {
 
-	pvBytes, err := json.Marshal(privVal)
-	if err != nil {
-		return err
+		privVal := types.GenPrivValidatorFS("")
+		pubkey = strings.ToUpper(hex.EncodeToString(privVal.PubKey.Bytes()[1:]))
+		pvBytes, err := json.Marshal(privVal)
+		if err != nil {
+			return err
+		}
+		privValJSON = string(pvBytes)
 	}
 
-	return CreateGenesisValidatorFiles(cfg, genesis, string(pvBytes), cmd.Root().Name())
+	genesis := GetGenesisJSON(pubkey, viper.GetString(FlagChainID),
+		userAddr, optionsStr)
+	return CreateGenesisValidatorFiles(cfg, genesis, privValJSON, cmd.Root().Name())
 }
 
+// StaticPK - static public key for test cases
+var StaticPK = "7B90EA87E7DC0C7145C8C48C08992BE271C7234134343E8A8E8008E617DE7B30"
+
+// StaticPrivValJSON - static validator private key file contents in json
+var StaticPrivValJSON = `{
+  "address": "7A956FADD20D3A5B2375042B2959F8AB172A058F",
+  "last_height": 0,
+  "last_round": 0,
+  "last_signature": null,
+  "last_signbytes": "",
+  "last_step": 0,
+  "priv_key": {
+    "type": "ed25519",
+    "data": "D07ABE82A8B15559A983B2DB5D4842B2B6E4D6AF58B080005662F424F17D68C17B90EA87E7DC0C7145C8C48C08992BE271C7234134343E8A8E8008E617DE7B30"
+  },
+  "pub_key": {
+    "type": "ed25519",
+    "data": "7B90EA87E7DC0C7145C8C48C08992BE271C7234134343E8A8E8008E617DE7B30"
+  }
+}`
+
 // CreateGenesisValidatorFiles creates a genesis file with these
 // contents and a private validator file
 func CreateGenesisValidatorFiles(cfg *config.Config, genesis, privVal, appName string) error {
diff --git a/tests/cli/common.sh b/tests/cli/common.sh
index e9db332152..b7a4ea9834 100644
--- a/tests/cli/common.sh
+++ b/tests/cli/common.sh
@@ -65,7 +65,7 @@ initServer() {
     SERVER_LOG=$1/${SERVER_EXE}.log
 
     GENKEY=$(${CLIENT_EXE} keys get ${RICH} | awk '{print $2}')
-    ${SERVER_EXE} init --chain-id $CHAIN $GENKEY --home=$SERVE_DIR >>$SERVER_LOG
+    ${SERVER_EXE} init --static --chain-id $CHAIN $GENKEY --home=$SERVE_DIR >>$SERVER_LOG
 
     # optionally set the port
     if [ -n "$3" ]; then