WIP: Remove AppInit, other cleanup

Gopkg.toml

@@ -57,7 +57,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "=0.25.1-rc0"
+  version = "0.26.1-rc0"
 
 ## deps without releases:
 
@@ -106,4 +106,3 @@
 [prune]
   go-tests = true
   unused-packages = true
-

cmd/gaia/app/genesis.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
@@ -81,14 +80,6 @@ func (ga *GenesisAccount) ToAccount() (acc *auth.BaseAccount) {
 	}
 }
 
-// get app init parameters for server init command
-func GaiaAppInit() server.AppInit {
-
-	return server.AppInit{
-		AppGenState: GaiaAppGenStateJSON,
-	}
-}
-
 // Create the core parameters for genesis initialization for gaia
 // note that the pubkey input is this machines pubkey
 func GaiaAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) (

cmd/gaia/cmd/gaiad/main.go

@@ -37,14 +37,12 @@ func main() {
 		Short:             "Gaia Daemon (server)",
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
-	appInit := app.GaiaAppInit()
-	rootCmd.AddCommand(gaiaInit.InitCmd(ctx, cdc, appInit))
+	rootCmd.AddCommand(gaiaInit.InitCmd(ctx, cdc))
 	rootCmd.AddCommand(gaiaInit.CollectGenTxsCmd(ctx, cdc))
-	rootCmd.AddCommand(gaiaInit.TestnetFilesCmd(ctx, cdc, server.AppInit{}))
+	rootCmd.AddCommand(gaiaInit.TestnetFilesCmd(ctx, cdc))
 	rootCmd.AddCommand(gaiaInit.GenTxCmd(ctx, cdc))
 
-	server.AddCommands(ctx, cdc, rootCmd, appInit,
-		newApp, exportAppStateAndTMValidators)
+	server.AddCommands(ctx, cdc, rootCmd, newApp, exportAppStateAndTMValidators)
 
 	// prepare and add flags
 	executor := cli.PrepareBaseCmd(rootCmd, "GA", app.DefaultNodeHome)

cmd/gaia/init/collect.go

@@ -64,7 +64,7 @@ func CollectGenTxsCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 				return err
 			}
 
-			toPrint.AppMessage = appMessage
+			toPrint.Message = appMessage
 			// print out some key information
 			return displayInfo(cdc, toPrint)
 		},
@@ -105,7 +105,7 @@ func genAppStateFromConfig(cdc *codec.Codec, config *cfg.Config, initCfg initCon
 		return
 	}
 
-	err = WriteGenesisFile(genFile, initCfg.ChainID, nil, appState)
+	err = server.WriteGenesisFile(genFile, initCfg.ChainID, nil, appState)
 	return
 }
 

cmd/gaia/init/init.go

@@ -3,7 +3,6 @@ package init
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tendermint/tendermint/privval"
 	"os"
 	"path/filepath"
 
@@ -18,7 +17,6 @@ import (
 	"github.com/tendermint/tendermint/libs/cli"
 	"github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/types"
 )
 
 const (
@@ -28,10 +26,10 @@ const (
 )
 
 type printInfo struct {
-	Moniker    string          `json:"moniker"`
-	ChainID    string          `json:"chain_id"`
-	NodeID     string          `json:"node_id"`
-	AppMessage json.RawMessage `json:"app_message"`
+	Moniker string          `json:"moniker"`
+	ChainID string          `json:"chain_id"`
+	NodeID  string          `json:"node_id"`
+	Message json.RawMessage `json:"message"`
 }
 
 // nolint: errcheck
@@ -46,7 +44,7 @@ func displayInfo(cdc *codec.Codec, info printInfo) error {
 
 // get cmd to initialize all files for tendermint and application
 // nolint
-func InitCmd(ctx *server.Context, cdc *codec.Codec, appInit server.AppInit) *cobra.Command {
+func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "init",
 		Short: "Initialize private validator, p2p, genesis, and application configuration files",
@@ -74,15 +72,15 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec, appInit server.AppInit) *cob
 				viper.GetBool(flagOverwrite)); err != nil {
 				return err
 			}
-			if err = WriteGenesisFile(genFile, chainID, nil, appState); err != nil {
+			if err = server.WriteGenesisFile(genFile, chainID, nil, appState); err != nil {
 				return err
 			}
 
 			toPrint := printInfo{
-				ChainID:    chainID,
-				Moniker:    config.Moniker,
-				NodeID:     nodeID,
-				AppMessage: appState,
+				ChainID: chainID,
+				Moniker: config.Moniker,
+				NodeID:  nodeID,
+				Message: appState,
 			}
 
 			cfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "config.toml"), config)
@@ -105,40 +103,10 @@ func InitializeNodeValidatorFiles(config *cfg.Config) (nodeID string, valPubKey
 		return
 	}
 	nodeID = string(nodeKey.ID())
-	valPubKey = ReadOrCreatePrivValidator(config.PrivValidatorFile())
+	valPubKey = server.ReadOrCreatePrivValidator(config.PrivValidatorFile())
 	return
 }
 
-// WriteGenesisFile creates and writes the genesis configuration to disk. An
-// error is returned if building or writing the configuration to file fails.
-// nolint: unparam
-func WriteGenesisFile(genesisFile, chainID string, validators []types.GenesisValidator, appState json.RawMessage) error {
-	genDoc := types.GenesisDoc{
-		ChainID:    chainID,
-		Validators: validators,
-		AppState:   appState,
-	}
-
-	if err := genDoc.ValidateAndComplete(); err != nil {
-		return err
-	}
-
-	return genDoc.SaveAs(genesisFile)
-}
-
-// read of create the private key file for this config
-func ReadOrCreatePrivValidator(privValFile string) crypto.PubKey {
-	// private validator
-	var privValidator *privval.FilePV
-	if common.FileExists(privValFile) {
-		privValidator = privval.LoadFilePV(privValFile)
-	} else {
-		privValidator = privval.GenFilePV(privValFile)
-		privValidator.Save()
-	}
-	return privValidator.GetPubKey()
-}
-
 func initializeEmptyGenesis(cdc *codec.Codec, genFile string, chainID string,
 	overwrite bool) (appState json.RawMessage, err error) {
 	if !overwrite && common.FileExists(genFile) {