refactor basecoind, change GenAppOptions

examples/basecoin/cmd/basecoind/main.go

@@ -7,14 +7,9 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	abci "github.com/tendermint/abci/types"
-	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
-	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tmlibs/cli"
-	tmflags "github.com/tendermint/tmlibs/cli/flags"
-	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
 	"github.com/tendermint/tmlibs/log"
 
@@ -25,40 +20,20 @@ import (
 
 // basecoindCmd is the entry point for this binary
 var (
-	context      = server.NewContext(nil, nil)
-	basecoindCmd = &cobra.Command{
-		Use:   "gaiad",
-		Short: "Gaia Daemon (server)",
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			if cmd.Name() == version.VersionCmd.Name() {
-				return nil
-			}
-			config, err := tcmd.ParseConfig()
-			if err != nil {
-				return err
-			}
-			logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-			logger, err = tmflags.ParseLogLevel(config.LogLevel, logger, cfg.DefaultLogLevel())
-			if err != nil {
-				return err
-			}
-			if viper.GetBool(cli.TraceFlag) {
-				logger = log.NewTracingLogger(logger)
-			}
-			logger = logger.With("module", "main")
-			context.Config = config
-			context.Logger = logger
-			return nil
-		},
+	context = server.NewContext(nil, nil)
+	rootCmd = &cobra.Command{
+		Use:               "basecoind",
+		Short:             "Basecoin Daemon (server)",
+		PersistentPreRunE: server.PersistentPreRunEFn(context),
 	}
 )
 
-// defaultOptions sets up the app_options for the
-// default genesis file
-func defaultOptions(args []string) (json.RawMessage, string, cmn.HexBytes, error) {
-	addr, secret, err := server.GenerateCoinKey()
-	if err != nil {
-		return nil, "", nil, err
+// defaultOptions sets up the app_state for the
+// default genesis file. It is a server.GenAppState
+// used for `basecoind init`.
+func defaultOptions(args ...string) (json.RawMessage, error) {
+	if len(args) != 2 {
+		return nil, fmt.Errorf("Expected 2 args: address and coin denom")
 	}
 	opts := fmt.Sprintf(`{
       "accounts": [{
@@ -70,24 +45,25 @@ func defaultOptions(args []string) (json.RawMessage, string, cmn.HexBytes, error
           }
         ]
       }]
-    }`, addr)
-	return json.RawMessage(opts), secret, addr, nil
+    }`, args)
+	return json.RawMessage(opts), nil
 }
 
 func generateApp(rootDir string, logger log.Logger) (abci.Application, error) {
-	dbMain, err := dbm.NewGoLevelDB("basecoin", filepath.Join(rootDir, "data"))
+	dataDir := filepath.Join(rootDir, "data")
+	dbMain, err := dbm.NewGoLevelDB("basecoin", dataDir)
 	if err != nil {
 		return nil, err
 	}
-	dbAcc, err := dbm.NewGoLevelDB("basecoin-acc", filepath.Join(rootDir, "data"))
+	dbAcc, err := dbm.NewGoLevelDB("basecoin-acc", dataDir)
 	if err != nil {
 		return nil, err
 	}
-	dbIBC, err := dbm.NewGoLevelDB("basecoin-ibc", filepath.Join(rootDir, "data"))
+	dbIBC, err := dbm.NewGoLevelDB("basecoin-ibc", dataDir)
 	if err != nil {
 		return nil, err
 	}
-	dbStaking, err := dbm.NewGoLevelDB("basecoin-staking", filepath.Join(rootDir, "data"))
+	dbStaking, err := dbm.NewGoLevelDB("basecoin-staking", dataDir)
 	if err != nil {
 		return nil, err
 	}
@@ -102,17 +78,17 @@ func generateApp(rootDir string, logger log.Logger) (abci.Application, error) {
 }
 
 func main() {
-	basecoindCmd.AddCommand(
+	rootCmd.AddCommand(
 		server.InitCmd(defaultOptions, context),
 		server.StartCmd(generateApp, context),
 		server.UnsafeResetAllCmd(context),
-		server.ShowNodeIdCmd(context),
+		server.ShowNodeIDCmd(context),
 		server.ShowValidatorCmd(context),
 		version.VersionCmd,
 	)
 
 	// prepare and add flags
 	rootDir := os.ExpandEnv("$HOME/.basecoind")
-	executor := cli.PrepareBaseCmd(basecoindCmd, "BC", rootDir)
+	executor := cli.PrepareBaseCmd(rootCmd, "BC", rootDir)
 	executor.Execute()
 }