fix!: address minor bugs during main upgrade to SDK v50 (backport #2067…

…) (#2069) fix!: address minor bugs during main upgrade to SDK v50 (#2067) * fix consumer misb e2e test and mistakenly removed line during main upgrade to v50 * update UT * godoc (cherry picked from commit 5c65a15) Co-authored-by: Simon Noetzlin <[email protected]>
cosmos · Jul 19, 2024 · 60d45e0 · 60d45e0
1 parent b73dab8
commit 60d45e0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/tests/e2e/config.go b/tests/e2e/config.go
@@ -761,6 +761,7 @@ func ConsumerMisbehaviourTestConfig() TestConfig {
 				IpPrefix:       "7.7.7",
 				VotingWaitTime: 20,
 				GenesisChanges: ".app_state.gov.params.voting_period = \"20s\" | " +
+					".app_state.gov.params.expedited_voting_period = \"10s\" | " +
 					// Custom slashing parameters for testing validator downtime functionality
 					// See https://docs.cosmos.network/main/modules/slashing/04_begin_block.html#uptime-tracking
 					".app_state.slashing.params.signed_blocks_window = \"10\" | " +

diff --git a/tests/e2e/state.go b/tests/e2e/state.go
@@ -837,7 +837,7 @@ func (tr Commands) GetClientFrozenHeight(chain ChainID, clientID string) (uint64
 		log.Fatal(err, "\n", string(bz))
 	}
 
-	return uint64(revHeight), uint64(revNumber)
+	return uint64(revNumber), uint64(revHeight)
 }
 
 func (tr Commands) GetHasToValidate(

diff --git a/testutil/keeper/unit_test_helpers.go b/testutil/keeper/unit_test_helpers.go
@@ -273,6 +273,7 @@ func TestProviderStateIsCleanedAfterConsumerChainIsStopped(t *testing.T, ctx sdk
 	require.Empty(t, providerKeeper.GetAllValidatorsByConsumerAddr(ctx, &expectedChainID))
 	require.Empty(t, providerKeeper.GetAllConsumerAddrsToPrune(ctx, expectedChainID))
 	require.Empty(t, providerKeeper.GetAllCommissionRateValidators(ctx, expectedChainID))
+	require.Zero(t, providerKeeper.GetEquivocationEvidenceMinHeight(ctx, expectedChainID))
 }
 
 func GetTestConsumerAdditionProp() *providertypes.ConsumerAdditionProposal {

diff --git a/x/ccv/provider/keeper/proposal.go b/x/ccv/provider/keeper/proposal.go
@@ -186,6 +186,7 @@ func (k Keeper) StopConsumerChain(ctx sdk.Context, chainID string, closeChan boo
 	// Note: this call panics if the key assignment state is invalid
 	k.DeleteKeyAssignments(ctx, chainID)
 	k.DeleteMinimumPowerInTopN(ctx, chainID)
+	k.DeleteEquivocationEvidenceMinHeight(ctx, chainID)
 
 	// close channel and delete the mappings between chain ID and channel ID
 	if channelID, found := k.GetChainToChannel(ctx, chainID); found {

diff --git a/x/ccv/provider/keeper/proposal_test.go b/x/ccv/provider/keeper/proposal_test.go
@@ -394,6 +394,8 @@ func TestStopConsumerChain(t *testing.T) {
 		expErr bool
 	}
 
+	consumerCID := "chainID"
+
 	tests := []testCase{
 		{
 			description: "proposal dropped, client doesn't exist",
@@ -407,6 +409,9 @@ func TestStopConsumerChain(t *testing.T) {
 			setup: func(ctx sdk.Context, providerKeeper *providerkeeper.Keeper, mocks testkeeper.MockedKeepers) {
 				testkeeper.SetupForStoppingConsumerChain(t, ctx, providerKeeper, mocks)
 
+				// set consumer minimum equivocation height
+				providerKeeper.SetEquivocationEvidenceMinHeight(ctx, consumerCID, 1)
+
 				// assert mocks for expected calls to `StopConsumerChain` when closing the underlying channel
 				gomock.InOrder(testkeeper.GetMocksForStopConsumerChainWithCloseChannel(ctx, &mocks)...)
 			},
@@ -424,15 +429,15 @@ func TestStopConsumerChain(t *testing.T) {
 		// Setup specific to test case
 		tc.setup(ctx, &providerKeeper, mocks)
 
-		err := providerKeeper.StopConsumerChain(ctx, "chainID", true)
+		err := providerKeeper.StopConsumerChain(ctx, consumerCID, true)
 
 		if tc.expErr {
 			require.Error(t, err)
 		} else {
 			require.NoError(t, err)
 		}
 
-		testkeeper.TestProviderStateIsCleanedAfterConsumerChainIsStopped(t, ctx, providerKeeper, "chainID", "channelID")
+		testkeeper.TestProviderStateIsCleanedAfterConsumerChainIsStopped(t, ctx, providerKeeper, consumerCID, "channelID")
 
 		ctrl.Finish()
 	}