use stakingkeeper for consensusstate

Author: wllmshao

testutil/keeper/expectations.go

@@ -52,8 +52,6 @@ func GetMocksForMakeConsumerGenesis(ctx sdk.Context, mocks *MockedKeepers,
 ) []*gomock.Call {
 	return []*gomock.Call{
 		mocks.MockStakingKeeper.EXPECT().UnbondingTime(gomock.Any()).Return(unbondingTimeToInject, nil).Times(1),
-		mocks.MockClientKeeper.EXPECT().GetSelfConsensusState(gomock.Any(),
-			clienttypes.GetSelfHeight(ctx)).Return(&ibctmtypes.ConsensusState{}, nil).Times(1),
 	}
 }
 

testutil/keeper/mocks.go

@@ -434,11 +434,12 @@ func (k Keeper) MakeConsumerGenesis(
 		clientState.TrustingPeriod = trustPeriod
 		clientState.UnbondingPeriod = providerUnbondingPeriod
 
-		consState, err := k.clientKeeper.GetSelfConsensusState(ctx, height)
+		consState, err := k.getSelfConsensusState(ctx, height)
+
 		if err != nil {
 			return gen, errorsmod.Wrapf(clienttypes.ErrConsensusStateNotFound, "error %s getting self consensus state for: %s", err, height)
 		}
-		tmConsState = consState.(*ibctmtypes.ConsensusState)
+		tmConsState = consState
 	} else {
 		// connection ID provided
 		preCCV = true
@@ -504,6 +505,26 @@ func (k Keeper) MakeConsumerGenesis(
 	return gen, nil
 }
 
+// This is copied from the client keeper in ibc v8, since this function was removed in ibc v9
+func (k Keeper) getSelfConsensusState(ctx sdk.Context, height clienttypes.Height) (*ibctmtypes.ConsensusState, error) {
+	// check that height revision matches chainID revision
+	revision := clienttypes.ParseChainID(ctx.ChainID())
+	if revision != height.GetRevisionNumber() {
+		return nil, errorsmod.Wrapf(clienttypes.ErrInvalidHeight, "chainID revision number does not match height revision number: expected %d, got %d", revision, height.GetRevisionNumber())
+	}
+	histInfo, err := k.stakingKeeper.GetHistoricalInfo(ctx, int64(height.RevisionHeight))
+	if err != nil {
+		return nil, errorsmod.Wrapf(err, "height %d", height.RevisionHeight)
+	}
+
+	consensusState := &ibctmtypes.ConsensusState{
+		Timestamp:          histInfo.Header.Time,
+		Root:               commitmenttypes.NewMerkleRoot(histInfo.Header.GetAppHash()),
+		NextValidatorsHash: histInfo.Header.NextValidatorsHash,
+	}
+	return consensusState, nil
+}
+
 // StopAndPrepareForConsumerRemoval sets the phase of the chain to stopped and prepares to get the state of the
 // chain removed after unbonding period elapses
 func (k Keeper) StopAndPrepareForConsumerRemoval(ctx sdk.Context, consumerId string) error {

x/ccv/provider/keeper/consumer_lifecycle.go

@@ -560,7 +560,7 @@ func TestCreateConsumerClient(t *testing.T) {
 				providerKeeper.SetConsumerPhase(ctx, CONSUMER_ID, providertypes.CONSUMER_PHASE_LAUNCHED)
 
 				// Expect none of the client creation related calls to happen
-				mocks.MockClientKeeper.EXPECT().CreateClient(gomock.Any(), gomock.Any(), gomock.Any()).Times(0)
+				mocks.MockClientKeeper.EXPECT().CreateClient(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(0)
 			},
 			expClientCreated: false,
 		},

x/ccv/provider/keeper/consumer_lifecycle_test.go

@@ -68,6 +68,7 @@ type StakingKeeper interface {
 	StakingTokenSupply(ctx context.Context) (math.Int, error)
 	BondedRatio(ctx context.Context) (math.LegacyDec, error)
 	TotalBondedTokens(ctx context.Context) (math.Int, error)
+	GetHistoricalInfo(ctx context.Context, height int64) (stakingtypes.HistoricalInfo, error)
 }
 
 // SlashingKeeper defines the contract expected to perform ccv slashing