Pass expected error as second argument to ErrorIs. (cosmos#5712)

notional-labs · Jan 24, 2024 · 65306ac · 65306ac
1 parent 2f3fa4b
commit 65306ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/modules/apps/callbacks/ibc_middleware_test.go b/modules/apps/callbacks/ibc_middleware_test.go
@@ -205,7 +205,7 @@ func (s *CallbacksTestSuite) TestSendPacket() {
 
 			default:
 				sendPacket()
-				s.Require().ErrorIs(tc.expValue.(error), err)
+				s.Require().ErrorIs(err, tc.expValue.(error))
 				s.Require().Equal(uint64(0), seq)
 			}
 
@@ -344,7 +344,7 @@ func (s *CallbacksTestSuite) TestOnAcknowledgementPacket() {
 
 			default:
 				err := onAcknowledgementPacket()
-				s.Require().ErrorIs(tc.expError, err)
+				s.Require().ErrorIs(err, tc.expError)
 			}
 
 			sourceStatefulCounter := GetSimApp(s.chainA).MockContractKeeper.GetStateEntryCounter(s.chainA.GetContext())
@@ -499,7 +499,7 @@ func (s *CallbacksTestSuite) TestOnTimeoutPacket() {
 				s.Require().Nil(err)
 			case error:
 				err := onTimeoutPacket()
-				s.Require().ErrorIs(expValue, err)
+				s.Require().ErrorIs(err, expValue)
 			default:
 				s.Require().PanicsWithValue(tc.expValue, func() {
 					_ = onTimeoutPacket()
@@ -792,7 +792,7 @@ func (s *CallbacksTestSuite) TestWriteAcknowledgement() {
 				}
 
 			} else {
-				s.Require().ErrorIs(tc.expError, err)
+				s.Require().ErrorIs(err, tc.expError)
 			}
 		})
 	}
@@ -933,7 +933,7 @@ func (s *CallbacksTestSuite) TestProcessCallback() {
 				s.Require().PanicsWithValue(tc.expValue, processCallback)
 			default:
 				processCallback()
-				s.Require().ErrorIs(tc.expValue.(error), err)
+				s.Require().ErrorIs(err, tc.expValue.(error))
 			}
 
 			s.Require().Equal(expGasConsumed, ctx.GasMeter().GasConsumed())
@@ -992,7 +992,7 @@ func (s *CallbacksTestSuite) TestOnChanCloseInit() {
 	controllerStack := icaControllerStack.(porttypes.Middleware)
 	err := controllerStack.OnChanCloseInit(s.chainA.GetContext(), s.path.EndpointA.ChannelConfig.PortID, s.path.EndpointA.ChannelID)
 	// we just check that this call is passed down to the icacontroller to return an error
-	s.Require().ErrorIs(errorsmod.Wrap(ibcerrors.ErrInvalidRequest, "user cannot close channel"), err)
+	s.Require().ErrorIs(err, errorsmod.Wrap(ibcerrors.ErrInvalidRequest, "user cannot close channel"))
 }
 
 func (s *CallbacksTestSuite) TestOnChanCloseConfirm() {

diff --git a/modules/core/keeper/msg_server_test.go b/modules/core/keeper/msg_server_test.go
@@ -2771,7 +2771,7 @@ func (suite *KeeperTestSuite) TestUpdateChannelParams() {
 				suite.Require().Equal(tc.msg.Params, p)
 			} else {
 				suite.Require().Nil(resp)
-				suite.Require().ErrorIs(tc.expError, err)
+				suite.Require().ErrorIs(err, tc.expError)
 			}
 		})
 	}