DRY consensus metadata setting

modules/core/03-connection/types/genesis_test.go

@@ -106,6 +106,20 @@ func TestValidateGenesis(t *testing.T) {
 			),
 			expPass: false,
 		},
+		{
+			name: "invalid params",
+			genState: types.NewGenesisState(
+				[]types.IdentifiedConnection{
+					types.NewIdentifiedConnection(connectionID, types.NewConnectionEnd(types.INIT, clientID, types.Counterparty{clientID2, connectionID2, commitmenttypes.NewMerklePrefix([]byte("prefix"))}, []*types.Version{ibctesting.ConnectionVersion}, 500)),
+				},
+				[]types.ConnectionPaths{
+					{clientID, []string{connectionID}},
+				},
+				0,
+				types.Params{},
+			),
+			expPass: false,
+		},
 	}
 
 	for _, tc := range testCases {

modules/light-clients/07-tendermint/types/proposal_handle.go

@@ -90,12 +90,8 @@ func (cs ClientState) CheckSubstituteAndUpdateState(
 		}
 		SetConsensusState(subjectClientStore, cdc, consensusState, height)
 
-		processedTime, found := GetProcessedTime(substituteClientStore, height)
-		if !found {
-			continue
-		}
-		SetProcessedTime(subjectClientStore, height, processedTime)
-
+		// set metadata for this consensus state
+		setConsensusMetadata(ctx, subjectClientStore, height)
 	}
 
 	cs.LatestHeight = substituteClientState.LatestHeight

modules/light-clients/07-tendermint/types/update.go

@@ -212,13 +212,18 @@ func update(ctx sdk.Context, clientStore sdk.KVStore, clientState *ClientState,
 		NextValidatorsHash: header.Header.NextValidatorsHash,
 	}
 
-	// set context time as processed time and set context height as processed height
-	// as this is internal tendermint light client logic.
-	// client state and consensus state will be set by client keeper
-	// set iteration key to provide ability for efficient ordered iteration of consensus states.
-	SetProcessedTime(clientStore, header.GetHeight(), uint64(ctx.BlockTime().UnixNano()))
-	SetProcessedHeight(clientStore, header.GetHeight(), clienttypes.GetSelfHeight(ctx))
-	SetIterationKey(clientStore, header.GetHeight())
+	// set metadata for this consensus state
+	setConsensusMetadata(ctx, clientStore, header.GetHeight())
 
 	return clientState, consensusState
 }
+
+// set context time as processed time and set context height as processed height
+// as this is internal tendermint light client logic.
+// client state and consensus state will be set by client keeper
+// set iteration key to provide ability for efficient ordered iteration of consensus states.
+func setConsensusMetadata(ctx sdk.Context, clientStore sdk.KVStore, height exported.Height) {
+	SetProcessedTime(clientStore, height, uint64(ctx.BlockTime().UnixNano()))
+	SetProcessedHeight(clientStore, height, clienttypes.GetSelfHeight(ctx))
+	SetIterationKey(clientStore, height)
+}

modules/light-clients/07-tendermint/types/upgrade.go

@@ -6,10 +6,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
 	commitmenttypes "github.com/cosmos/ibc-go/modules/core/23-commitment/types"
 	"github.com/cosmos/ibc-go/modules/core/exported"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
 // VerifyUpgradeAndUpdateState checks if the upgraded client has been committed by the current client
@@ -122,6 +122,9 @@ func (cs ClientState) VerifyUpgradeAndUpdateState(
 		tmUpgradeConsState.Timestamp, commitmenttypes.MerkleRoot{}, tmUpgradeConsState.NextValidatorsHash,
 	)
 
+	// set metadata for this consensus state
+	setConsensusMetadata(ctx, clientStore, tmUpgradeClient.LatestHeight)
+
 	return newClientState, newConsState, nil
 }