Skip to content

Commit

Permalink
change --gas=simulate to --gas=auto when sending txs
Browse files Browse the repository at this point in the history
--gas=simulate caused confusion and could be
mistaken for the --simulate flag.

Closes: #3162

GasFlagSimulate -> GasFlagAuto
  • Loading branch information
Alessio Treglia committed Dec 20, 2018
1 parent 13bb9fa commit 82549ac
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions client/flags.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package client

import (
"errors"
"fmt"
"strconv"

Expand All @@ -16,7 +15,7 @@ const (
// occur between the tx simulation and the actual run.
DefaultGasAdjustment = 1.0
DefaultGasLimit = 200000
GasFlagSimulate = "auto"
GasFlagAuto = "auto"

FlagUseLedger = "ledger"
FlagChainID = "chain-id"
Expand Down Expand Up @@ -92,7 +91,7 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command {
c.Flags().Bool(FlagGenerateOnly, false, "build an unsigned transaction and write it to STDOUT")
// --gas can accept integers and "simulate"
c.Flags().Var(&GasFlagVar, "gas", fmt.Sprintf(
"gas limit to set per-transaction; set to %q to calculate required gas automatically (default %d)", GasFlagSimulate, DefaultGasLimit))
"gas limit to set per-transaction; set to %q to calculate required gas automatically (default %d)", GasFlagAuto, DefaultGasLimit))
viper.BindPFlag(FlagTrustNode, c.Flags().Lookup(FlagTrustNode))
viper.BindPFlag(FlagUseLedger, c.Flags().Lookup(FlagUseLedger))
viper.BindPFlag(FlagChainID, c.Flags().Lookup(FlagChainID))
Expand Down Expand Up @@ -142,7 +141,7 @@ func (v *GasSetting) Set(s string) (err error) {

func (v *GasSetting) String() string {
if v.Simulate {
return GasFlagSimulate
return GasFlagAuto
}
return strconv.FormatUint(v.Gas, 10)
}
Expand All @@ -152,12 +151,12 @@ func ParseGas(gasStr string) (simulateAndExecute bool, gas uint64, err error) {
switch gasStr {
case "":
gas = DefaultGasLimit
case GasFlagSimulate:
case GasFlagAuto:
simulateAndExecute = true
default:
gas, err = strconv.ParseUint(gasStr, 10, 64)
if err != nil {
err = errors.New("gas must be a positive integer")
err = fmt.Errorf("gas must be either integer or %q", GasFlagAuto)
return
}
}
Expand Down

0 comments on commit 82549ac

Please sign in to comment.