From 8d3381a5f9cd4472020df2020586b7e83fdea496 Mon Sep 17 00:00:00 2001 From: Adu Date: Mon, 27 Sep 2021 22:24:57 +0800 Subject: [PATCH] ante: fix &T{} to (*T)(nil) in error message (#592) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Adu Du Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> --- app/ante/eth.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/ante/eth.go b/app/ante/eth.go index 8a3e5748..1513c409 100644 --- a/app/ante/eth.go +++ b/app/ante/eth.go @@ -72,7 +72,7 @@ func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, s msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction", ) } @@ -126,7 +126,7 @@ func (avd EthAccountVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction %d", i, ) } @@ -194,7 +194,7 @@ func (nvd EthNonceVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction %d", i, ) } @@ -273,7 +273,7 @@ func (egcd EthGasConsumeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction %d", i, ) } @@ -345,7 +345,7 @@ func (ctd CanTransferDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction %d", i, ) } @@ -417,7 +417,7 @@ func (ald AccessListDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate b msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction %d", i, ) } @@ -457,7 +457,7 @@ func (issd EthIncrementSenderSequenceDecorator) AnteHandle(ctx sdk.Context, tx s msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx) if !ok { return ctx, stacktrace.Propagate( - sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, &evmtypes.MsgEthereumTx{}), + sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "invalid transaction type %T, expected %T", tx, (*evmtypes.MsgEthereumTx)(nil)), "failed to cast transaction %d", i, ) }