provider: fix tests after migrating interface types

cosmos · Sep 27, 2023 · b84d32c · b84d32c
1 parent 4b72097
commit b84d32c
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 173 deletions.
diff --git a/testutil/integration/interfaces.go b/testutil/integration/interfaces.go
@@ -102,9 +102,8 @@ type TestStakingKeeper interface {
 	GetRedelegations(ctx sdk.Context, delegator sdk.AccAddress,
 		maxRetrieve uint16) (redelegations []types.Redelegation)
 	// NOTE: @MSalopek this is a bit confusing to me
-	// BondDenom(ctx sdk.Context) (res string)
-	// IsValidatorJailed(ctx sdk.Context, addr sdk.ConsAddress) bool
-	IsValidatorJailed(ctx context.Context, addr sdk.ConsAddress) bool
+	BondDenom(ctx context.Context) (string, error)
+	IsValidatorJailed(ctx context.Context, addr sdk.ConsAddress) (bool, error)
 	GetUnbondingDelegation(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress,
 	) (ubd types.UnbondingDelegation, found bool)
 	GetAllValidators(ctx sdk.Context) (validators []types.Validator)

diff --git a/testutil/keeper/expectations.go b/testutil/keeper/expectations.go
@@ -51,7 +51,7 @@ func GetMocksForMakeConsumerGenesis(ctx sdk.Context, mocks *MockedKeepers,
 	unbondingTimeToInject time.Duration,
 ) []*gomock.Call {
 	return []*gomock.Call{
-		mocks.MockStakingKeeper.EXPECT().UnbondingTime(gomock.Any()).Return(unbondingTimeToInject).Times(1),
+		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),
@@ -102,7 +102,7 @@ func GetMocksForHandleSlashPacket(ctx sdk.Context, mocks MockedKeepers,
 	calls := []*gomock.Call{
 		mocks.MockStakingKeeper.EXPECT().GetValidatorByConsAddr(
 			ctx, expectedProviderValConsAddr.ToSdkConsAddr()).Return(
-			valToReturn, true,
+			valToReturn, nil,
 		).Times(1),
 
 		mocks.MockSlashingKeeper.EXPECT().IsTombstoned(ctx,
@@ -113,12 +113,12 @@ func GetMocksForHandleSlashPacket(ctx sdk.Context, mocks MockedKeepers,
 		calls = append(calls, mocks.MockStakingKeeper.EXPECT().Jail(
 			gomock.Eq(ctx),
 			gomock.Eq(expectedProviderValConsAddr.ToSdkConsAddr()),
-		).Return())
+		).Return(nil))
 
 		// JailUntil is set in this code path.
-		calls = append(calls, mocks.MockSlashingKeeper.EXPECT().DowntimeJailDuration(ctx).Return(time.Hour).Times(1))
+		calls = append(calls, mocks.MockSlashingKeeper.EXPECT().DowntimeJailDuration(ctx).Return(time.Hour, nil).Times(1))
 		calls = append(calls, mocks.MockSlashingKeeper.EXPECT().JailUntil(ctx,
-			expectedProviderValConsAddr.ToSdkConsAddr(), gomock.Any()).Times(1))
+			expectedProviderValConsAddr.ToSdkConsAddr(), gomock.Any()).Return(nil).Times(1))
 	}
 
 	return calls