reduce module interdependancy, /client refactor (#4415)

* abstract staking BuildCreateValidatorMsg, genutil defines its own flags

* client/ refactor

* staking move keys from keeper to types

server/export.go

@@ -11,10 +11,10 @@ import (
 
 	"io/ioutil"
 
-	"github.com/tendermint/tendermint/libs/cli"
 	dbm "github.com/tendermint/tendermint/libs/db"
 	tmtypes "github.com/tendermint/tendermint/types"
 
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 )
 
@@ -31,7 +31,7 @@ func ExportCmd(ctx *Context, cdc *codec.Codec, appExporter AppExporter) *cobra.C
 		Short: "Export state to JSON",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			config := ctx.Config
-			config.SetRoot(viper.GetString(cli.HomeFlag))
+			config.SetRoot(viper.GetString(flags.FlagHome))
 
 			traceWriterFile := viper.GetString(flagTraceStore)
 

server/test_helpers.go

@@ -7,11 +7,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
 
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/libs/cli"
 )
 
 // Get a free address for a test tendermint server
@@ -43,8 +42,8 @@ func FreeTCPAddr() (addr, port string, err error) {
 func SetupViper(t *testing.T) func() {
 	rootDir, err := ioutil.TempDir("", "mock-sdk-cmd")
 	require.Nil(t, err)
-	viper.Set(cli.HomeFlag, rootDir)
-	viper.Set(client.FlagName, "moniker")
+	viper.Set(flags.FlagHome, rootDir)
+	viper.Set(flags.FlagName, "moniker")
 	return func() {
 		err := os.RemoveAll(rootDir)
 		if err != nil {

server/util.go

@@ -21,7 +21,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	pvm "github.com/tendermint/tendermint/privval"
 
-	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	"github.com/cosmos/cosmos-sdk/version"
@@ -148,10 +148,10 @@ func AddCommands(
 	rootCmd.AddCommand(
 		StartCmd(ctx, appCreator),
 		UnsafeResetAllCmd(ctx),
-		client.LineBreak,
+		flags.LineBreak,
 		tendermintCmd,
 		ExportCmd(ctx, cdc, appExport),
-		client.LineBreak,
+		flags.LineBreak,
 		version.Cmd,
 	)
 }