Merge branch 'main' into main

cosmos · Dec 13, 2024 · 6b70345 · 6b70345
2 parents f84b024 + 0d3a7af
commit 6b70345
Show file tree

Hide file tree

Showing 7 changed files with 487 additions and 281 deletions.
diff --git a/modules/apps/29-fee/ibc_middleware_test.go b/modules/apps/29-fee/ibc_middleware_test.go
@@ -1557,28 +1557,28 @@ func (suite *FeeTestSuite) TestAckUnmarshal() {
 	testCases := []struct {
 		name     string
 		ackBytes []byte
-		expPass  bool
+		expError error
 	}{
 		{
 			"success",
 			[]byte(`{"app_acknowledgement": "eyJyZXN1bHQiOiJiVzlqYXlCaFkydHViM2RzWldsblpXMWxiblE9In0=", "forward_relayer_address": "relayer", "underlying_app_success": true}`),
-			true,
+			nil,
 		},
 		{
 			"failure: unknown fields",
 			[]byte(`{"app_acknowledgement": "eyJyZXN1bHQiOiJiVzlqYXlCaFkydHViM2RzWldsblpXMWxiblE9In0=", "forward_relayer_address": "relayer", "underlying_app_success": true, "extra_field": "foo"}`),
-			false,
+			errors.New("json: unknown field \"extra_field\""),
 		},
 	}
 	for _, tc := range testCases {
 		suite.Run(tc.name, func() {
 			ack := &types.IncentivizedAcknowledgement{}
 			err := json.Unmarshal(tc.ackBytes, ack)
 
-			if tc.expPass {
+			if tc.expError == nil {
 				suite.Require().NoError(err)
 			} else {
-				suite.Require().Error(err)
+				suite.Require().ErrorContains(err, tc.expError.Error())
 			}
 		})
 	}