Modify AnteHandler to take a simulate boolean parameter

client/flags.go

@@ -4,6 +4,7 @@ import "github.com/spf13/cobra"
 
 // nolint
 const (
+	DefaultGasLimit      = 200000
 	DefaultGasAdjustment = 1.2
 
 	FlagUseLedger     = "ledger"
@@ -52,7 +53,7 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command {
 		c.Flags().String(FlagChainID, "", "Chain ID of tendermint node")
 		c.Flags().String(FlagNode, "tcp://localhost:26657", "<host>:<port> to tendermint rpc interface for this chain")
 		c.Flags().Bool(FlagUseLedger, false, "Use a connected Ledger device")
-		c.Flags().Int64(FlagGas, 0, "gas limit to set per-transaction; set to 0 to calculate required gas automatically")
+		c.Flags().Int64(FlagGas, DefaultGasLimit, "gas limit to set per-transaction; set to 0 to calculate required gas automatically")
 		c.Flags().Float64(FlagGasAdjustment, DefaultGasAdjustment, "adjustment factor to be multiplied against the estimate returned by the tx simulation")
 		c.Flags().Bool(FlagAsync, false, "broadcast transactions asynchronously")
 		c.Flags().Bool(FlagJson, false, "return output in json format")

client/utils/utils_test.go

@@ -1,11 +1,13 @@
 package utils
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
+	"github.com/tendermint/tendermint/libs/common"
 )
 
 func TestParseQueryResponse(t *testing.T) {
@@ -18,3 +20,39 @@ func TestParseQueryResponse(t *testing.T) {
 	assert.Equal(t, gas, int64(0))
 	assert.NotNil(t, err)
 }
+
+func TestCalculateGas(t *testing.T) {
+	cdc := app.MakeCodec()
+	makeQueryFunc := func(gasUsed int64, wantErr bool) func(string, common.HexBytes) ([]byte, error) {
+		return func(string, common.HexBytes) ([]byte, error) {
+			if wantErr {
+				return nil, errors.New("")
+			}
+			return cdc.MustMarshalBinary(sdk.Result{GasUsed: gasUsed}), nil
+		}
+	}
+	type args struct {
+		queryFuncGasUsed int64
+		queryFuncWantErr bool
+		adjustment       float64
+	}
+	tests := []struct {
+		name         string
+		args         args
+		wantEstimate int64
+		wantAdjusted int64
+		wantErr      bool
+	}{
+		{"error", args{0, true, 1.2}, 0, 0, true},
+		{"adjusted gas", args{10, false, 1.2}, 10, 12, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			queryFunc := makeQueryFunc(tt.args.queryFuncGasUsed, tt.args.queryFuncWantErr)
+			gotEstimate, gotAdjusted, err := CalculateGas(queryFunc, cdc, []byte(""), tt.args.adjustment)
+			assert.Equal(t, err != nil, tt.wantErr)
+			assert.Equal(t, gotEstimate, tt.wantEstimate)
+			assert.Equal(t, gotAdjusted, tt.wantAdjusted)
+		})
+	}
+}