review comments and some fixes

CHANGELOG.md

@@ -57,6 +57,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (testing) [\#776](https://github.com/cosmos/ibc-go/pull/776) Adding helper fn to generate capability name for testing callbacks 
 * (testing) [\#892](https://github.com/cosmos/ibc-go/pull/892) IBC Mock modules store the scoped keeper and portID within the IBCMockApp. They also maintain reference to the AppModule to update the AppModule's list of IBC applications it references. Allows for the mock module to be reused as a base application in middleware stacks.
 * (channel) [\#882](https://github.com/cosmos/ibc-go/pull/882) The `WriteAcknowledgement` API now takes `exported.Acknowledgement` instead of a byte array
+* (modules/core/ante) [\#950](https://github.com/cosmos/ibc-go/pull/950) Replaces the channel keeper with the IBC keeper in the IBC `AnteDecorator` in order to execute the entire message and be able to reject redundant messages that are in the same block as the non-redundant messages.
 
 ### State Machine Breaking
 

modules/core/ante/ante.go

@@ -29,35 +29,43 @@ func (ad AnteDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 		for _, m := range tx.GetMsgs() {
 			switch msg := m.(type) {
 			case *channeltypes.MsgRecvPacket:
-				if response, err := ad.k.RecvPacket(sdk.WrapSDKContext(ctx), msg); err == nil && response.Result == channeltypes.NOOP {
-					redundancies += 1
-				} else if err != nil {
+				response, err := ad.k.RecvPacket(sdk.WrapSDKContext(ctx), msg)
+				if err != nil {
 					return ctx, err
 				}
+				if response.Result == channeltypes.NOOP {
+					redundancies += 1
+				}
 				packetMsgs += 1
 
 			case *channeltypes.MsgAcknowledgement:
-				if response, err := ad.k.Acknowledgement(sdk.WrapSDKContext(ctx), msg); err == nil && response.Result == channeltypes.NOOP {
-					redundancies += 1
-				} else if err != nil {
+				response, err := ad.k.Acknowledgement(sdk.WrapSDKContext(ctx), msg)
+				if err != nil {
 					return ctx, err
 				}
+				if response.Result == channeltypes.NOOP {
+					redundancies += 1
+				}
 				packetMsgs += 1
 
 			case *channeltypes.MsgTimeout:
-				if response, err := ad.k.Timeout(sdk.WrapSDKContext(ctx), msg); err == nil && response.Result == channeltypes.NOOP {
-					redundancies += 1
-				} else if err != nil {
+				response, err := ad.k.Timeout(sdk.WrapSDKContext(ctx), msg)
+				if err != nil {
 					return ctx, err
 				}
+				if response.Result == channeltypes.NOOP {
+					redundancies += 1
+				}
 				packetMsgs += 1
 
 			case *channeltypes.MsgTimeoutOnClose:
-				if response, err := ad.k.TimeoutOnClose(sdk.WrapSDKContext(ctx), msg); err == nil && response.Result == channeltypes.NOOP {
-					redundancies += 1
-				} else if err != nil {
+				response, err := ad.k.TimeoutOnClose(sdk.WrapSDKContext(ctx), msg)
+				if err != nil {
 					return ctx, err
 				}
+				if response.Result == channeltypes.NOOP {
+					redundancies += 1
+				}
 				packetMsgs += 1
 
 			case *clienttypes.MsgUpdateClient:

modules/core/ante/ante_test.go

@@ -372,7 +372,9 @@ func (suite *AnteTestSuite) TestAnteDecorator() {
 			func(suite *AnteTestSuite) []sdk.Msg {
 				msg := suite.createRecvPacketMessage(uint64(1), false)
 
-				// run check tx with non-redundant message
+				// We want to be able to run check tx with the non-redundant message without
+				// commiting it to a block, so that the when check tx runs with the redundant
+				// message they are both in the same block
 				k := suite.chainB.App.GetIBCKeeper()
 				decorator := ante.NewAnteDecorator(k)
 				checkCtx := suite.chainB.GetContext().WithIsCheckTx(true)

testing/endpoint.go

@@ -476,7 +476,7 @@ func (endpoint *Endpoint) TimeoutOnClose(packet channeltypes.Packet) error {
 	proofClosed, _ := endpoint.Counterparty.QueryProof(channelKey)
 
 	nextSeqRecv, found := endpoint.Counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(endpoint.Counterparty.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID)
-	require.True(endpoint.Chain.t, found)
+	require.True(endpoint.Chain.T, found)
 
 	timeoutOnCloseMsg := channeltypes.NewMsgTimeoutOnClose(
 		packet, nextSeqRecv,

testing/simapp/app.go

@@ -503,7 +503,7 @@ func NewSimApp(
 				FeegrantKeeper:  app.FeeGrantKeeper,
 				SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
 			},
-			IBCkeeper: app.IBCKeeper,
+			IBCKeeper: app.IBCKeeper,
 		},
 	)
 	if err != nil {