-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: improve file structure and default logging level
- Loading branch information
1 parent
5246bd2
commit 758bc29
Showing
2 changed files
with
163 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "errors" | ||
| "io" | ||
|
|
||
| dbm "github.com/cosmos/cosmos-db" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
|
|
||
| "cosmossdk.io/log" | ||
| confixcmd "cosmossdk.io/tools/confix/cmd" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client" | ||
| "github.com/cosmos/cosmos-sdk/client/debug" | ||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| "github.com/cosmos/cosmos-sdk/client/keys" | ||
| "github.com/cosmos/cosmos-sdk/client/pruning" | ||
| "github.com/cosmos/cosmos-sdk/client/rpc" | ||
| "github.com/cosmos/cosmos-sdk/client/snapshot" | ||
| "github.com/cosmos/cosmos-sdk/server" | ||
| servertypes "github.com/cosmos/cosmos-sdk/server/types" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
| authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" | ||
| genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" | ||
|
|
||
| "github.com/cosmosregistry/chain-minimal/app" | ||
| ) | ||
|
|
||
| func initRootCmd(rootCmd *cobra.Command, txConfig client.TxConfig, basicManager module.BasicManager) { | ||
| cfg := sdk.GetConfig() | ||
| cfg.Seal() | ||
|
|
||
| rootCmd.AddCommand( | ||
| genutilcli.InitCmd(basicManager, app.DefaultNodeHome), | ||
| debug.Cmd(), | ||
| confixcmd.ConfigCommand(), | ||
| pruning.Cmd(newApp, app.DefaultNodeHome), | ||
| snapshot.Cmd(newApp), | ||
| ) | ||
|
|
||
| server.AddCommands(rootCmd, app.DefaultNodeHome, newApp, appExport, func(startCmd *cobra.Command) {}) | ||
|
|
||
| // add keybase, auxiliary RPC, query, genesis, and tx child commands | ||
| rootCmd.AddCommand( | ||
| server.StatusCommand(), | ||
| genutilcli.Commands(txConfig, basicManager, app.DefaultNodeHome), | ||
| queryCommand(), | ||
| txCommand(), | ||
| keys.Commands(), | ||
| ) | ||
| } | ||
|
|
||
| func queryCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "query", | ||
| Aliases: []string{"q"}, | ||
| Short: "Querying subcommands", | ||
| DisableFlagParsing: false, | ||
| SuggestionsMinimumDistance: 2, | ||
| RunE: client.ValidateCmd, | ||
| } | ||
|
|
||
| cmd.AddCommand( | ||
| rpc.ValidatorCommand(), | ||
| server.QueryBlockCmd(), | ||
| authcmd.QueryTxsByEventsCmd(), | ||
| server.QueryBlocksCmd(), | ||
| authcmd.QueryTxCmd(), | ||
| server.QueryBlockResultsCmd(), | ||
| ) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| func txCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "tx", | ||
| Short: "Transactions subcommands", | ||
| DisableFlagParsing: false, | ||
| SuggestionsMinimumDistance: 2, | ||
| RunE: client.ValidateCmd, | ||
| } | ||
|
|
||
| cmd.AddCommand( | ||
| authcmd.GetSignCommand(), | ||
| authcmd.GetSignBatchCommand(), | ||
| authcmd.GetMultiSignCommand(), | ||
| authcmd.GetMultiSignBatchCmd(), | ||
| authcmd.GetValidateSignaturesCommand(), | ||
| authcmd.GetBroadcastCommand(), | ||
| authcmd.GetEncodeCommand(), | ||
| authcmd.GetDecodeCommand(), | ||
| authcmd.GetSimulateCmd(), | ||
| ) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| // newApp is an appCreator | ||
| func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts servertypes.AppOptions) servertypes.Application { | ||
| baseappOptions := server.DefaultBaseappOptions(appOpts) | ||
| app, err := app.NewMiniApp(logger, db, traceStore, true, appOpts, baseappOptions...) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| return app | ||
| } | ||
|
|
||
| // appExport creates a new app (optionally at a given height) and exports state. | ||
| func appExport( | ||
| logger log.Logger, | ||
| db dbm.DB, | ||
| traceStore io.Writer, | ||
| height int64, | ||
| forZeroHeight bool, | ||
| jailAllowedAddrs []string, | ||
| appOpts servertypes.AppOptions, | ||
| modulesToExport []string, | ||
| ) (servertypes.ExportedApp, error) { | ||
| var ( | ||
| miniApp *app.MiniApp | ||
| err error | ||
| ) | ||
|
|
||
| // this check is necessary as we use the flag in x/upgrade. | ||
| // we can exit more gracefully by checking the flag here. | ||
| homePath, ok := appOpts.Get(flags.FlagHome).(string) | ||
| if !ok || homePath == "" { | ||
| return servertypes.ExportedApp{}, errors.New("application home not set") | ||
| } | ||
|
|
||
| viperAppOpts, ok := appOpts.(*viper.Viper) | ||
| if !ok { | ||
| return servertypes.ExportedApp{}, errors.New("appOpts is not viper.Viper") | ||
| } | ||
|
|
||
| // overwrite the FlagInvCheckPeriod | ||
| viperAppOpts.Set(server.FlagInvCheckPeriod, 1) | ||
| appOpts = viperAppOpts | ||
|
|
||
| if height != -1 { | ||
| miniApp, err = app.NewMiniApp(logger, db, traceStore, false, appOpts) | ||
| if err != nil { | ||
| return servertypes.ExportedApp{}, err | ||
| } | ||
|
|
||
| if err := miniApp.LoadHeight(height); err != nil { | ||
| return servertypes.ExportedApp{}, err | ||
| } | ||
| } else { | ||
| miniApp, err = app.NewMiniApp(logger, db, traceStore, true, appOpts) | ||
| if err != nil { | ||
| return servertypes.ExportedApp{}, err | ||
| } | ||
| } | ||
|
|
||
| return miniApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters