remove staking queue when farming disabled

Author: keithsue

x/farming/keeper/epoch.go

@@ -82,6 +82,16 @@ func (k Keeper) RemoveFromCurrentEpochStakingQueue(ctx sdk.Context, staking *typ
 	store.Delete(types.CurrentEpochStakingQueueByAddressKey(staking.Address, staking.Id))
 }
 
+// RemoveCurrentEpochStakingQueue removes the staking queue for the current epoch
+func (k Keeper) RemoveCurrentEpochStakingQueue(ctx sdk.Context) {
+	k.IterateCurrentEpochStakingQueue(ctx, func(staking *types.Staking) (stop bool) {
+		// remove from the staking queue for the current epoch
+		k.RemoveFromCurrentEpochStakingQueue(ctx, staking)
+
+		return false
+	})
+}
+
 // HasStakingForCurrentEpoch returns true if the given staking exists for the current epoch, false otherwise
 func (k Keeper) HasStakingForCurrentEpoch(ctx sdk.Context, stakingId uint64) bool {
 	store := ctx.KVStore(k.storeKey)

x/farming/keeper/params.go

@@ -56,7 +56,10 @@ func (k Keeper) OnParamsChanged(ctx sdk.Context, params types.Params, newParams
 		// start the new epoch when farming enabled or re-enabled
 		k.NewEpoch(ctx)
 	} else if params.Enabled && !newParams.Enabled {
-		// terminate the current epoch if disabled
+		// remove the staking queue for the current epoch
+		k.RemoveCurrentEpochStakingQueue(ctx)
+
+		// end the current epoch
 		currentEpoch := k.GetCurrentEpoch(ctx)
 		currentEpoch.Status = types.EpochStatus_EPOCH_STATUS_ENDED
 		k.SetEpoch(ctx, currentEpoch)