test docs, replace FeeCoins with GetFee

x/auth/ante/ante_test.go

@@ -532,41 +532,6 @@ func TestAnteHandlerSetPubKey(t *testing.T) {
 	require.Nil(t, acc2.GetPubKey())
 }
 
-// func TestProcessPubKey(t *testing.T) {
-// 	app, ctx := createTestApp(true)
-
-// 	// keys
-// 	_, _, addr1 := types.KeyTestPubAddr()
-// 	priv2, _, addr2 := types.KeyTestPubAddr()
-// 	acc1 := app.AccountKeeper.NewAccountWithAddress(ctx, addr1)
-// 	acc2 := app.AccountKeeper.NewAccountWithAddress(ctx, addr2)
-
-// 	acc2.SetPubKey(priv2.PubKey())
-
-// 	type args struct {
-// 		acc      exported.Account
-// 		sig      types.StdSignature
-// 		simulate bool
-// 	}
-// 	tests := []struct {
-// 		name    string
-// 		args    args
-// 		wantErr bool
-// 	}{
-// 		{"no sigs, simulate off", args{acc1, types.StdSignature{}, false}, true},
-// 		{"no sigs, simulate on", args{acc1, types.StdSignature{}, true}, false},
-// 		{"no sigs, account with pub, simulate on", args{acc2, types.StdSignature{}, true}, false},
-// 		{"pubkey doesn't match addr, simulate off", args{acc1, types.StdSignature{PubKey: priv2.PubKey()}, false}, true},
-// 		{"pubkey doesn't match addr, simulate on", args{acc1, types.StdSignature{PubKey: priv2.PubKey()}, true}, false},
-// 	}
-// 	for _, tt := range tests {
-// 		t.Run(tt.name, func(t *testing.T) {
-// 			_, err := ante.ProcessPubKey(tt.args.acc, tt.args.sig, tt.args.simulate)
-// 			require.Equal(t, tt.wantErr, err != nil)
-// 		})
-// 	}
-// }
-
 func generatePubKeysAndSignatures(n int, msg []byte, keyTypeed25519 bool) (pubkeys []crypto.PubKey, signatures [][]byte) {
 	pubkeys = make([]crypto.PubKey, n)
 	signatures = make([][]byte, n)

x/auth/ante/basic_test.go

@@ -57,6 +57,7 @@ func TestValidateMemo(t *testing.T) {
 	privs, accNums, seqs := []crypto.PrivKey{priv1}, []uint64{0}, []uint64{0}
 	invalidTx := types.NewTestTxWithMemo(ctx, msgs, privs, accNums, seqs, fee, strings.Repeat("01234567890", 500))
 
+	// require that long memos get rejected
 	vmd := ante.NewValidateMemoDecorator(app.AccountKeeper)
 	antehandler := sdk.ChainAnteDecorators(vmd)
 	_, err := antehandler(ctx, invalidTx, false)
@@ -65,6 +66,7 @@ func TestValidateMemo(t *testing.T) {
 
 	validTx := types.NewTestTxWithMemo(ctx, msgs, privs, accNums, seqs, fee, strings.Repeat("01234567890", 10))
 
+	// require small memos pass ValidateMemo Decorator
 	_, err = antehandler(ctx, validTx, false)
 	require.Nil(t, err, "ValidateBasicDecorator returned error on valid tx. err: %v", err)
 }
@@ -84,7 +86,6 @@ func TestConsumeGasForTxSize(t *testing.T) {
 	ctx = ctx.WithTxBytes(txBytes)
 
 	// track how much gas is necessary to retrieve parameters
-	//
 	beforeGas := ctx.GasMeter().GasConsumed()
 	app.AccountKeeper.GetParams(ctx)
 	afterGas := ctx.GasMeter().GasConsumed()
@@ -95,6 +96,7 @@ func TestConsumeGasForTxSize(t *testing.T) {
 	ctx, err := antehandler(ctx, nil, false)
 	require.Nil(t, err, "ConsumeTxSizeGasDecorator returned error: %v", err)
 
+	// require that decorator consumes expected amount of gas
 	consumedGas := ctx.GasMeter().GasConsumed() - beforeGas
 	require.Equal(t, expectedGas, consumedGas, "Decorator did not consume the correct amount of gas")
 }

x/auth/ante/fee.go

@@ -14,8 +14,8 @@ import (
 // Tx must implement FeeTx interface to use the FeeDecorators
 type FeeTx interface {
 	sdk.Tx
-	Gas() uint64
-	FeeCoins() sdk.Coins
+	GetGas() uint64
+	GetFee() sdk.Coins
 	FeePayer() sdk.AccAddress
 }
 
@@ -36,8 +36,8 @@ func (mfd MempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b
 	if !ok {
 		return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
 	}
-	feeCoins := feeTx.FeeCoins()
-	gas := feeTx.Gas()
+	feeCoins := feeTx.GetFee()
+	gas := feeTx.GetGas()
 
 	// Ensure that the provided fees meet a minimum threshold for the validator,
 	// if this is a CheckTx. This is only for local mempool purposes, and thus
@@ -94,8 +94,8 @@ func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
 	feePayerAcc := dfd.ak.GetAccount(ctx, feePayer)
 
 	// deduct the fees
-	if !feeTx.FeeCoins().IsZero() {
-		err = DeductFees(dfd.supplyKeeper, ctx, feePayerAcc, feeTx.FeeCoins())
+	if !feeTx.GetFee().IsZero() {
+		err = DeductFees(dfd.supplyKeeper, ctx, feePayerAcc, feeTx.GetFee())
 		if err != nil {
 			return ctx, err
 		}

x/auth/ante/setup.go

@@ -7,10 +7,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
-// Tx with a Gas() method is needed to use SetUpContextDecorator
+// Tx with a GetGas() method is needed to use SetUpContextDecorator
 type GasTx interface {
 	sdk.Tx
-	Gas() uint64
+	GetGas() uint64
 }
 
 // SetUpContextDecorator sets the GasMeter in the Context and wraps the next AnteHandler with a defer clause
@@ -34,7 +34,7 @@ func (sud SetUpContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
 		return newCtx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be GasTx")
 	}
 
-	newCtx = SetGasMeter(simulate, ctx, gasTx.Gas())
+	newCtx = SetGasMeter(simulate, ctx, gasTx.GetGas())
 
 	// Decorator will catch an OutOfGasPanic caused in the next antehandler
 	// AnteHandlers must have their own defer/recover in order for the BaseApp
@@ -47,7 +47,7 @@ func (sud SetUpContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
 			case sdk.ErrorOutOfGas:
 				log := fmt.Sprintf(
 					"out of gas in location: %v; gasWanted: %d, gasUsed: %d",
-					rType.Descriptor, gasTx.Gas(), newCtx.GasMeter().GasConsumed())
+					rType.Descriptor, gasTx.GetGas(), newCtx.GasMeter().GasConsumed())
 
 				err = sdkerrors.Wrap(sdkerrors.ErrOutOfGas, log)
 			default:

x/auth/types/stdtx.go

@@ -137,11 +137,11 @@ func (tx StdTx) GetSignBytes(ctx sdk.Context, acc exported.Account) []byte {
 	)
 }
 
-// Gas returns the Gas in StdFee
-func (tx StdTx) Gas() uint64 { return tx.Fee.Gas }
+// GetGas returns the Gas in StdFee
+func (tx StdTx) GetGas() uint64 { return tx.Fee.Gas }
 
-// FeeCoins returns the FeeAmount in StdFee
-func (tx StdTx) FeeCoins() sdk.Coins { return tx.Fee.Amount }
+// GetFee returns the FeeAmount in StdFee
+func (tx StdTx) GetFee() sdk.Coins { return tx.Fee.Amount }
 
 // FeePayer returns the address that is responsible for paying fee
 // StdTx returns the first signer as the fee payer