make the code beautiful

irisnet · Oct 30, 2018 · c0aa619 · c0aa619
1 parent 2373e97
commit c0aa619
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/app/genesis.go b/app/genesis.go
@@ -37,10 +37,6 @@ const (
 	defaultUnbondingTime time.Duration = 60 * 10 * time.Second
 	// DefaultKeyPass contains the default key password for genesis transactions
 	DefaultKeyPass = "1234567890"
-
-	DefaultCommissionRate          = "0.1"
-	DefaultCommissionMaxRate       = "0.2"
-	DefaultCommissionMaxChangeRate = "0.01"
 )
 
 // State to Unmarshal
@@ -291,7 +287,6 @@ func CollectStdTxs(moniker string, genTxsDir string, cdc *codec.Codec) (
 func NewDefaultGenesisAccount(addr sdk.AccAddress) GenesisAccount {
 	accAuth := auth.NewBaseAccountWithAddress(addr)
 	accAuth.Coins = []sdk.Coin{
-		{"fooToken", sdk.NewInt(1000)},
 		FreeFermionAcc,
 	}
 	return NewGenesisAccount(&accAuth)

diff --git a/init/gentx.go b/init/gentx.go
@@ -37,7 +37,7 @@ following delegation and commission default parameters:
 	commission rate:             %s
 	commission max rate:         %s
 	commission max change rate:  %s
-`, app.FreeFermionVal.String(),app.DefaultCommissionRate, app.DefaultCommissionMaxRate, app.DefaultCommissionMaxChangeRate),
+`, app.FreeFermionVal.String(),defaultCommissionRate, defaultCommissionMaxRate, defaultCommissionMaxChangeRate),
 		RunE: func(cmd *cobra.Command, args []string) error {
 
 			config := ctx.Config
@@ -91,9 +91,9 @@ func prepareFlagsForTxCreateValidator(config *cfg.Config, nodeID, ip string, val
 	viper.Set(cli.FlagIP, ip)                                      // --ip
 	viper.Set(cli.FlagPubKey, sdk.MustBech32ifyConsPub(valPubKey)) // --pubkey
 	viper.Set(cli.FlagAmount, app.FreeFermionVal.String())                       // --amount
-	viper.Set(cli.FlagCommissionRate, app.DefaultCommissionRate)
-	viper.Set(cli.FlagCommissionMaxRate, app.DefaultCommissionMaxRate)
-	viper.Set(cli.FlagCommissionMaxChangeRate, app.DefaultCommissionMaxChangeRate)
+	viper.Set(cli.FlagCommissionRate, defaultCommissionRate)
+	viper.Set(cli.FlagCommissionMaxRate, defaultCommissionMaxRate)
+	viper.Set(cli.FlagCommissionMaxChangeRate, defaultCommissionMaxChangeRate)
 	viper.Set(cli.FlagGenesisFormat, true)     // --genesis-format
 	viper.Set(cli.FlagMoniker, config.Moniker) // --moniker
 	if config.Moniker == "" {

diff --git a/init/init.go b/init/init.go
@@ -35,6 +35,12 @@ const (
 	flagMoniker      = "moniker"
 )
 
+const (
+	defaultCommissionRate          = "0.1"
+	defaultCommissionMaxRate       = "0.2"
+	defaultCommissionMaxChangeRate = "0.01"
+)
+
 type initConfig struct {
 	ChainID      string
 	GenTxsDir    string