tests: fix broken unit tests

cosmos · Nov 27, 2023 · efc3f95 · efc3f95
1 parent 167a74d
commit efc3f95
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/x/ccv/provider/handler_test.go b/x/ccv/provider/handler_test.go
@@ -51,6 +51,9 @@ func TestAssignConsensusKeyForConsumerChain(t *testing.T) {
 			setup: func(ctx sdk.Context,
 				k keeper.Keeper, mocks testkeeper.MockedKeepers,
 			) {
+				k.SetPendingConsumerAdditionProp(ctx, &providertypes.ConsumerAdditionProposal{
+					ChainId: "chainid",
+				})
 				gomock.InOrder(
 					mocks.MockStakingKeeper.EXPECT().GetValidator(
 						ctx, providerCryptoId.SDKValOpAddress(),
@@ -64,11 +67,29 @@ func TestAssignConsensusKeyForConsumerChain(t *testing.T) {
 			expError: false,
 			chainID:  "chainid",
 		},
+		{
+			name: "fail: chain ID not registered",
+			setup: func(ctx sdk.Context,
+				k keeper.Keeper, mocks testkeeper.MockedKeepers,
+			) {
+				gomock.InOrder(
+					mocks.MockStakingKeeper.EXPECT().GetValidator(
+						ctx, providerCryptoId.SDKValOpAddress(),
+						// Return a valid validator, found!
+					).Return(providerCryptoId.SDKStakingValidator(), true).Times(1),
+				)
+			},
+			expError: true,
+			chainID:  "chainid",
+		},
 		{
 			name: "fail: missing validator",
 			setup: func(ctx sdk.Context,
 				k keeper.Keeper, mocks testkeeper.MockedKeepers,
 			) {
+				k.SetPendingConsumerAdditionProp(ctx, &providertypes.ConsumerAdditionProposal{
+					ChainId: "chainid",
+				})
 				gomock.InOrder(
 					mocks.MockStakingKeeper.EXPECT().GetValidator(
 						ctx, providerCryptoId.SDKValOpAddress(),
@@ -84,6 +105,9 @@ func TestAssignConsensusKeyForConsumerChain(t *testing.T) {
 			setup: func(ctx sdk.Context,
 				k keeper.Keeper, mocks testkeeper.MockedKeepers,
 			) {
+				k.SetPendingConsumerAdditionProp(ctx, &providertypes.ConsumerAdditionProposal{
+					ChainId: "chainid",
+				})
 				// Use the consumer key already
 				k.SetValidatorByConsumerAddr(ctx, "chainid", consumerConsAddr, providerConsAddr)
 

diff --git a/x/ccv/provider/keeper/key_assignment_test.go b/x/ccv/provider/keeper/key_assignment_test.go
@@ -653,6 +653,10 @@ func TestCannotReassignDefaultKeyAssignment(t *testing.T) {
 	providerKeeper, ctx, ctrl, mocks := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
 	defer ctrl.Finish()
 
+	providerKeeper.SetPendingConsumerAdditionProp(ctx, &types.ConsumerAdditionProposal{
+		ChainId: "chain",
+	})
+
 	// Mock that the validator is validating with the single key, as confirmed by provider's staking keeper
 	gomock.InOrder(
 		mocks.MockStakingKeeper.EXPECT().GetValidatorByConsAddr(ctx,