remove client type check between client state and consensus state (#6137

)
cosmos · Apr 11, 2024 · 690f7c8 · 690f7c8
1 parent d57f8d4
commit 690f7c8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 72 deletions.
diff --git a/modules/core/02-client/types/genesis.go b/modules/core/02-client/types/genesis.go
@@ -156,7 +156,7 @@ func (gs GenesisState) Validate() error {
 
 	for _, cc := range gs.ClientsConsensus {
 		// check that consensus state is for a client in the genesis clients list
-		clientType, ok := validClients[cc.ClientId]
+		_, ok := validClients[cc.ClientId]
 		if !ok {
 			return fmt.Errorf("consensus state in genesis has a client id %s that does not map to a genesis client", cc.ClientId)
 		}
@@ -174,12 +174,6 @@ func (gs GenesisState) Validate() error {
 			if err := cs.ValidateBasic(); err != nil {
 				return fmt.Errorf("invalid client consensus state %v clientID %s index %d: %w", cs, cc.ClientId, i, err)
 			}
-
-			// ensure consensus state type matches client state type
-			if clientType != cs.ClientType() {
-				return fmt.Errorf("consensus state client type %s does not equal client state client type %s", cs.ClientType(), clientType)
-			}
-
 		}
 	}
 

diff --git a/modules/core/02-client/types/genesis_test.go b/modules/core/02-client/types/genesis_test.go
@@ -150,34 +150,6 @@ func (suite *TypesTestSuite) TestValidateGenesis() {
 			),
 			expPass: false,
 		},
-		{
-			name: "consensus state client id does not match client id in genesis clients",
-			genState: types.NewGenesisState(
-				[]types.IdentifiedClientState{
-					types.NewIdentifiedClientState(
-						tmClientID0, ibctm.NewClientState(suite.chainA.ChainID, ibctm.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath),
-					),
-				},
-				[]types.ClientConsensusStates{
-					types.NewClientConsensusStates(
-						tmClientID1,
-						[]types.ConsensusStateWithHeight{
-							types.NewConsensusStateWithHeight(
-								types.NewHeight(1, 1),
-								ibctm.NewConsensusState(
-									header.GetTime(), commitmenttypes.NewMerkleRoot(header.Header.GetAppHash()), header.Header.NextValidatorsHash,
-								),
-							),
-						},
-					),
-				},
-				nil,
-				types.NewParams(exported.Tendermint),
-				false,
-				0,
-			),
-			expPass: false,
-		},
 		{
 			name: "invalid consensus state height",
 			genState: types.NewGenesisState(
@@ -448,30 +420,6 @@ func (suite *TypesTestSuite) TestValidateGenesis() {
 			),
 			expPass: false,
 		},
-		{
-			name: "consensus state different than client state type",
-			genState: types.NewGenesisState(
-				[]types.IdentifiedClientState{},
-				[]types.ClientConsensusStates{
-					types.NewClientConsensusStates(
-						tmClientID0,
-						[]types.ConsensusStateWithHeight{
-							types.NewConsensusStateWithHeight(
-								header.GetHeight().(types.Height),
-								ibctm.NewConsensusState(
-									header.GetTime(), commitmenttypes.NewMerkleRoot(header.Header.GetAppHash()), header.Header.NextValidatorsHash,
-								),
-							),
-						},
-					),
-				},
-				nil,
-				types.NewParams(exported.Tendermint),
-				false,
-				5,
-			),
-			expPass: false,
-		},
 	}
 
 	for _, tc := range testCases {

diff --git a/modules/core/02-client/types/msgs.go b/modules/core/02-client/types/msgs.go
@@ -74,9 +74,6 @@ func (msg MsgCreateClient) ValidateBasic() error {
 	if err != nil {
 		return err
 	}
-	// if clientState.ClientType() != consensusState.ClientType() {
-	// 	return errorsmod.Wrap(ErrInvalidClientType, "client type for client state and consensus state do not match")
-	// }
 	if err := ValidateClientType(clientState.ClientType()); err != nil {
 		return errorsmod.Wrap(err, "client type does not meet naming constraints")
 	}

diff --git a/modules/core/02-client/types/msgs_test.go b/modules/core/02-client/types/msgs_test.go
@@ -179,16 +179,6 @@ func (suite *TypesTestSuite) TestMsgCreateClient_ValidateBasic() {
 			},
 			false,
 		},
-		// {
-		// 	"invalid - client state and consensus state client types do not match",
-		// 	func() {
-		// 		tendermintClient := ibctm.NewClientState(suite.chainA.ChainID, ibctesting.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath)
-		// 		soloMachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachine", "", 2)
-		// 		msg, err = types.NewMsgCreateClient(tendermintClient, soloMachine.ConsensusState(), suite.chainA.SenderAccount.GetAddress().String())
-		// 		suite.Require().NoError(err)
-		// 	},
-		// 	false,
-		// },
 	}
 
 	for _, tc := range cases {