Remove TxBuilder

x/auth/client/tx.go

@@ -37,40 +37,6 @@ func (gr GasEstimateResponse) String() string {
 	return fmt.Sprintf("gas estimate: %d", gr.GasEstimate)
 }
 
-// EnrichWithGas calculates the gas estimate that would be consumed by the
-// transaction and set the transaction's respective value accordingly.
-func EnrichWithGas(txBldr authtypes.TxBuilder, clientCtx client.Context, msgs []sdk.Msg) (authtypes.TxBuilder, error) {
-	_, adjusted, err := simulateMsgs(txBldr, clientCtx, msgs)
-	if err != nil {
-		return txBldr, err
-	}
-
-	return txBldr.WithGas(adjusted), nil
-}
-
-// CalculateGas simulates the execution of a transaction and returns
-// the simulation response obtained by the query and the adjusted gas amount.
-func CalculateGas(
-	queryFunc func(string, []byte) ([]byte, int64, error), cdc *codec.Codec,
-	txBytes []byte, adjustment float64,
-) (sdk.SimulationResponse, uint64, error) {
-
-	// run a simulation (via /app/simulate query) to
-	// estimate gas and update TxBuilder accordingly
-	rawRes, _, err := queryFunc("/app/simulate", txBytes)
-	if err != nil {
-		return sdk.SimulationResponse{}, 0, err
-	}
-
-	simRes, err := ParseQueryResponse(rawRes)
-	if err != nil {
-		return sdk.SimulationResponse{}, 0, err
-	}
-
-	adjusted := adjustGasEstimate(simRes.GasUsed, adjustment)
-	return simRes, adjusted, nil
-}
-
 // PrintUnsignedStdTx builds an unsigned StdTx and prints it to os.Stdout.
 func PrintUnsignedStdTx(txBldr tx.Factory, clientCtx client.Context, msgs []sdk.Msg) error {
 	err := tx.GenerateTx(clientCtx, txBldr, msgs...)
@@ -196,21 +162,6 @@ func GetTxEncoder(cdc *codec.Codec) (encoder sdk.TxEncoder) {
 	return encoder
 }
 
-// simulateMsgs simulates the transaction and returns the simulation response and
-// the adjusted gas value.
-func simulateMsgs(txBldr authtypes.TxBuilder, clientCtx client.Context, msgs []sdk.Msg) (sdk.SimulationResponse, uint64, error) {
-	txBytes, err := txBldr.BuildTxForSim(msgs)
-	if err != nil {
-		return sdk.SimulationResponse{}, 0, err
-	}
-
-	return CalculateGas(clientCtx.QueryWithData, clientCtx.Codec, txBytes, txBldr.GasAdjustment())
-}
-
-func adjustGasEstimate(estimate uint64, adjustment float64) uint64 {
-	return uint64(adjustment * float64(estimate))
-}
-
 func ParseQueryResponse(bz []byte) (sdk.SimulationResponse, error) {
 	var simRes sdk.SimulationResponse
 	if err := jsonpb.Unmarshal(strings.NewReader(string(bz)), &simRes); err != nil {

x/auth/client/tx_test.go

@@ -1,7 +1,6 @@
 package client_test
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 	"testing"
@@ -45,58 +44,6 @@ func TestParseQueryResponse(t *testing.T) {
 	require.Error(t, err)
 }
 
-func TestCalculateGas(t *testing.T) {
-	cdc := makeCodec()
-	makeQueryFunc := func(gasUsed uint64, wantErr bool) func(string, []byte) ([]byte, int64, error) {
-		return func(string, []byte) ([]byte, int64, error) {
-			if wantErr {
-				return nil, 0, errors.New("query failed")
-			}
-			simRes := &sdk.SimulationResponse{
-				GasInfo: sdk.GasInfo{GasUsed: gasUsed, GasWanted: gasUsed},
-				Result:  &sdk.Result{Data: []byte("tx data"), Log: "log"},
-			}
-
-			bz, _ := codec.ProtoMarshalJSON(simRes)
-			return bz, 0, nil
-		}
-	}
-
-	type args struct {
-		queryFuncGasUsed uint64
-		queryFuncWantErr bool
-		adjustment       float64
-	}
-
-	tests := []struct {
-		name         string
-		args         args
-		wantEstimate uint64
-		wantAdjusted uint64
-		expPass      bool
-	}{
-		{"error", args{0, true, 1.2}, 0, 0, false},
-		{"adjusted gas", args{10, false, 1.2}, 10, 12, true},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			queryFunc := makeQueryFunc(tt.args.queryFuncGasUsed, tt.args.queryFuncWantErr)
-			simRes, gotAdjusted, err := authclient.CalculateGas(queryFunc, cdc, []byte(""), tt.args.adjustment)
-			if tt.expPass {
-				require.NoError(t, err)
-				require.Equal(t, simRes.GasInfo.GasUsed, tt.wantEstimate)
-				require.Equal(t, gotAdjusted, tt.wantAdjusted)
-				require.NotNil(t, simRes.Result)
-			} else {
-				require.Error(t, err)
-				require.Nil(t, simRes.Result)
-			}
-		})
-	}
-}
-
 // TODO: remove this and authclient.GetTxEncoder after the proto tx migration is complete
 func TestDefaultTxEncoder(t *testing.T) {
 	cdc := makeCodec()