[cmd/pkg] Have chain ID as pretty json with chain-id as plain int

cmd/subcommands/blockchain.go

@@ -56,8 +56,8 @@ Query Harmony's blockchain for completed transaction, historic records
 		Long: `
 High level information about each transaction for given account
 `,
-    Args:    cobra.ExactArgs(1),
-    PreRunE: validateAddress,
+		Args:    cobra.ExactArgs(1),
+		PreRunE: validateAddress,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			type historyParams struct {
 				Address   string `json:"address"`
@@ -87,7 +87,7 @@ High level information about each transaction for given account
 		Use:   "known-chains",
 		Short: "Print out the known chain-ids",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Println(common.ToJSONUnsafe(common.AllChainIDs(), !noPrettyOutput))
+			fmt.Println(common.Chain.String())
 			return nil
 		},
 	}, {

pkg/common/chain-id.go

@@ -1,24 +1,23 @@
 package common
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/big"
 )
 
-//TODO Use reflection for these values instead of switch & slice given by AllChainIDs
-
 // ChainID is a wrapper around the human name for a chain and the actual Big.Int used
 type ChainID struct {
-	Name  string
-	Value *big.Int
+	Name  string   `json:"-"`
+	Value *big.Int `json:"chain-as-number"`
 }
 
 type chainIDList struct {
-	MainNet    ChainID
-	TestNet    ChainID
-	PangaeaNet ChainID
-	PartnerNet ChainID
-	StressNet  ChainID
+	MainNet    ChainID `json:"mainnet"`
+	TestNet    ChainID `json:"testnet"`
+	PangaeaNet ChainID `json:"pangaea"`
+	PartnerNet ChainID `json:"partner"`
+	StressNet  ChainID `json:"stress"`
 }
 
 // Chain is an enumeration of the known Chain-IDs
@@ -30,9 +29,9 @@ var Chain = chainIDList{
 	StressNet:  ChainID{"stress", big.NewInt(5)},
 }
 
-// AllChainIDs returns list of known chains
-func AllChainIDs() []string {
-	return []string{"mainnet", "testnet", "pangaea", "devnet", "partner", "stressnet"}
+func (c chainIDList) String() string {
+	s, _ := json.MarshalIndent(c, "", "  ")
+	return string(s)
 }
 
 // StringToChainID returns the ChainID wrapper for the given human name of a chain-id