Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove duplicate app.toml code #737

Merged
merged 2 commits into from
Jan 8, 2022
Merged

remove duplicate app.toml code #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0886afc
remove duplicate code
tac0turtle Jan 7, 2022
4ae7217
touchup
tac0turtle Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions cmd/osmosisd/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/input"
"github.com/cosmos/cosmos-sdk/server"
appcfg "github.com/cosmos/cosmos-sdk/server/config"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/genutil"
Expand Down Expand Up @@ -100,13 +99,6 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {

config.SetRoot(clientCtx.HomeDir)

//Override default settings in app.toml
appConfig := appcfg.DefaultConfig()
appConfig.API.Enable = true
appConfig.StateSync.SnapshotInterval = 1500
appConfig.StateSync.SnapshotKeepRecent = 2
appConfig.MinGasPrices = "0uosmo"

chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
if chainID == "" {
chainID = fmt.Sprintf("test-chain-%v", tmrand.Str(6))
Expand Down Expand Up @@ -167,7 +159,6 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
toPrint := newPrintInfo(config.Moniker, chainID, nodeID, "", appState)

tmcfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "config.toml"), config)
appcfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "app.toml"), appConfig)

return displayInfo(toPrint)
},
Expand Down
47 changes: 5 additions & 42 deletions cmd/osmosisd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,57 +81,20 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
// initAppConfig helps to override default appConfig template and configs.
// return "", nil if no custom configuration is required for the application.
func initAppConfig() (string, interface{}) {
// The following code snippet is just for reference.

// WASMConfig defines configuration for the wasm module.
type WASMConfig struct {
// This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries
QueryGasLimit uint64 `mapstructure:"query_gas_limit"`

// Address defines the gRPC-web server to listen on
LruSize uint64 `mapstructure:"lru_size"`
}

type CustomAppConfig struct {
serverconfig.Config

WASM WASMConfig `mapstructure:"wasm"`
}

// Optionally allow the chain developer to overwrite the SDK's default
// server config.
srvCfg := serverconfig.DefaultConfig()
// The SDK's default minimum gas price is set to "" (empty value) inside
// app.toml. If left empty by validators, the node will halt on startup.
// However, the chain developer can set a default app.toml value for their
// validators here.
//
// In summary:
// - if you leave srvCfg.MinGasPrices = "", all validators MUST tweak their
// own app.toml config,
// - if you set srvCfg.MinGasPrices non-empty, validators CAN tweak their
// own app.toml to override, or use this default value.
//
// In simapp, we set the min gas prices to 0.
srvCfg.MinGasPrices = "0stake"

customAppConfig := CustomAppConfig{
Config: *srvCfg,
WASM: WASMConfig{
LruSize: 1,
QueryGasLimit: 300000,
},
}

customAppTemplate := serverconfig.DefaultConfigTemplate + `
[wasm]
# This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries
query_gas_limit = 300000
# This is the number of wasm vm instances we keep cached in memory for speed-up
# Warning: this is currently unstable and may lead to crashes, best to keep for 0 unless testing locally
lru_size = 0`
srvCfg.API.Enable = true
srvCfg.StateSync.SnapshotInterval = 1500
srvCfg.StateSync.SnapshotKeepRecent = 2
srvCfg.MinGasPrices = "0uosmo"

return customAppTemplate, customAppConfig
return serverconfig.DefaultConfigTemplate, CustomAppConfig{Config: *srvCfg}
}

func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
Expand Down