(chore) change tests in 23-commitment/types to expect specific error (#…

…7652)

* fix: fixed tests

* Update modules/core/23-commitment/types/codec_test.go

---------

Co-authored-by: DimitrisJim <[email protected]>

modules/core/23-commitment/types/codec_test.go

@@ -1,6 +1,8 @@
 package types_test
 
 import (
+	"fmt"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 
@@ -13,27 +15,27 @@ func (suite *MerkleTestSuite) TestCodecTypeRegistration() {
 	testCases := []struct {
 		name    string
 		typeURL string
-		expPass bool
+		expErr  error
 	}{
 		{
 			"success: MerkleRoot",
 			sdk.MsgTypeURL(&types.MerkleRoot{}),
-			true,
+			nil,
 		},
 		{
 			"success: MerklePrefix",
 			sdk.MsgTypeURL(&types.MerklePrefix{}),
-			true,
+			nil,
 		},
 		{
 			"success: MerklePath",
 			sdk.MsgTypeURL(&v2.MerklePath{}),
-			true,
+			nil,
 		},
 		{
 			"type not registered on codec",
 			"ibc.invalid.MsgTypeURL",
-			false,
+			fmt.Errorf("unable to resolve type URL ibc.invalid.MsgTypeURL"),
 		},
 	}
 
@@ -44,12 +46,12 @@ func (suite *MerkleTestSuite) TestCodecTypeRegistration() {
 			encodingCfg := moduletestutil.MakeTestEncodingConfig(ibc.AppModuleBasic{})
 			msg, err := encodingCfg.Codec.InterfaceRegistry().Resolve(tc.typeURL)
 
-			if tc.expPass {
-				suite.Require().NotNil(msg)
+			if tc.expErr == nil {
+				suite.NotNil(msg)
 				suite.Require().NoError(err)
 			} else {
-				suite.Require().Nil(msg)
-				suite.Require().Error(err)
+				suite.Nil(msg)
+				suite.Require().ErrorContains(err, tc.expErr.Error())
 			}
 		})
 	}

modules/core/23-commitment/types/utils_test.go

@@ -26,7 +26,7 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 		name      string
 		malleate  func()
 		keyExists bool
-		expPass   bool
+		expErr    error
 	}{
 		{
 			"success for ExistenceProof",
@@ -41,13 +41,13 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 
 				proofOps = res.ProofOps
 			},
-			true, true,
+			true, nil,
 		},
 		{
 			"success for NonexistenceProof",
 			func() {
 				res, err := suite.store.Query(&storetypes.RequestQuery{
-					Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()), // required path to get key/value+proof
+					Path:  fmt.Sprintf("/%s/key", suite.storeKey.Name()),
 					Data:  []byte("NOTMYKEY"),
 					Prove: true,
 				})
@@ -56,14 +56,14 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 
 				proofOps = res.ProofOps
 			},
-			false, true,
+			false, nil,
 		},
 		{
 			"nil proofOps",
 			func() {
 				proofOps = nil
 			},
-			true, false,
+			true, types.ErrInvalidMerkleProof,
 		},
 		{
 			"proof op data is nil",
@@ -79,7 +79,7 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 				proofOps = res.ProofOps
 				proofOps.Ops[0].Data = nil
 			},
-			true, false,
+			true, types.ErrInvalidMerkleProof,
 		},
 	}
 
@@ -89,17 +89,18 @@ func (suite *MerkleTestSuite) TestConvertProofs() {
 		tc.malleate()
 
 		proof, err := types.ConvertProofs(proofOps)
-		if tc.expPass {
+		if tc.expErr == nil {
 			suite.Require().NoError(err, "ConvertProofs unexpectedly returned error for case: %s", tc.name)
 			if tc.keyExists {
 				err := proof.VerifyMembership(types.GetSDKSpecs(), &root, existsPath, value)
 				suite.Require().NoError(err, "converted proof failed to verify membership for case: %s", tc.name)
 			} else {
 				err := proof.VerifyNonMembership(types.GetSDKSpecs(), &root, nonexistPath)
-				suite.Require().NoError(err, "converted proof failed to verify membership for case: %s", tc.name)
+				suite.Require().NoError(err, "converted proof failed to verify non-membership for case: %s", tc.name)
 			}
 		} else {
 			suite.Require().Error(err, "ConvertProofs passed on invalid case for case: %s", tc.name)
+			suite.Require().ErrorIs(err, tc.expErr, "unexpected error returned for case: %s", tc.name)
 		}
 	}
 }