Refactoring and task queue tests

src/Action/ActionController.ts

@@ -1,9 +1,9 @@
-import { Task } from '../Queue/TaskQueue';
 import { Scheduler } from '../Scheduler';
 import { ActionError, TryLaterError } from '../Errors';
 import { grabActiveVillageId } from '../Page/VillageBlock';
 import { aroundMinutes } from '../utils';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 const actionMap: { [name: string]: Function | undefined } = {};
 

src/Action/BalanceHeroResourcesAction.ts

@@ -1,5 +1,4 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { grabVillageResources, grabVillageResourceStorage } from '../Page/ResourcesBlock';
 import { changeHeroResource, grabCurrentHeroResource } from '../Page/HeroPage';
 import { grabActiveVillageId } from '../Page/VillageBlock';
@@ -7,6 +6,7 @@ import { HeroState } from '../State/HeroState';
 import { calcHeroResource } from '../Core/HeroBalance';
 import { HeroAllResources } from '../Core/Hero';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class BalanceHeroResourcesAction extends ActionController {

src/Action/BuildBuildingAction.ts

@@ -1,9 +1,9 @@
 import { ActionController, registerAction } from './ActionController';
 import { ActionError, GrabError, TryLaterError } from '../Errors';
-import { Task } from '../Queue/TaskQueue';
 import { clickBuildButton } from '../Page/BuildingPage';
 import { aroundMinutes } from '../utils';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class BuildBuildingAction extends ActionController {

src/Action/CheckBuildingRemainingTimeAction.ts

@@ -1,9 +1,9 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { GrabError, TryLaterError } from '../Errors';
 import { grabBuildingQueueInfo } from '../Page/VillageBlock';
 import { BuildingQueueInfo } from '../Game';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class CheckBuildingRemainingTimeAction extends ActionController {

src/Action/ClickButtonAction.ts

@@ -1,7 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { AbortTaskError } from '../Errors';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class ClickButtonAction extends ActionController {

src/Action/CompleteTaskAction.ts

@@ -1,6 +1,6 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class CompleteTaskAction extends ActionController {

src/Action/GoToHeroVillageAction.ts

@@ -1,10 +1,10 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { grabVillageList } from '../Page/VillageBlock';
 import { grabHeroVillage } from '../Page/HeroPage';
 import { path } from '../utils';
 import { HeroState } from '../State/HeroState';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class GoToHeroVillageAction extends ActionController {

src/Action/GoToPageAction.ts

@@ -1,7 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { AbortTaskError } from '../Errors';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class GoToPageAction extends ActionController {

src/Action/SendOnAdventureAction.ts

@@ -1,8 +1,8 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { trimPrefix } from '../utils';
 import { AbortTaskError } from '../Errors';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 const CONFIG = [
     { level: 0, health: 60 },

src/Action/SendResourcesAction.ts

@@ -1,6 +1,5 @@
 import { ActionController, registerAction } from './ActionController';
 import { AbortTaskError, ActionError, TryLaterError } from '../Errors';
-import { Task } from '../Queue/TaskQueue';
 import { Resources } from '../Core/Resources';
 import { Coordinates, Village } from '../Core/Village';
 import { clickSendButton, fillSendResourcesForm, grabMerchantsInfo } from '../Page/BuildingPage';
@@ -10,6 +9,7 @@ import { SendResourcesTask } from '../Task/SendResourcesTask';
 import { aroundMinutes, timestamp } from '../utils';
 import { VillageState } from '../State/VillageState';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 function err(msg): never {
     throw new ActionError(msg);

src/Action/TrainTrooperAction.ts

@@ -1,8 +1,8 @@
 import { ActionController, registerAction } from './ActionController';
 import { ActionError, TryLaterError } from '../Errors';
-import { Task } from '../Queue/TaskQueue';
 import { getNumber, toNumber } from '../utils';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class TrainTrooperAction extends ActionController {

src/Action/UpdateBuildingTaskResourcesAction.ts

@@ -1,7 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
-import { Task } from '../Queue/TaskQueue';
 import { grabContractResources } from '../Page/BuildingPage';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class UpdateBuildingTaskResourcesAction extends ActionController {

src/Action/UpgradeBuildingAction.ts

@@ -1,9 +1,9 @@
 import { ActionController, registerAction } from './ActionController';
 import { GrabError, TryLaterError } from '../Errors';
-import { Task } from '../Queue/TaskQueue';
 import { clickUpgradeButton } from '../Page/BuildingPage';
 import { aroundMinutes } from '../utils';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class UpgradeBuildingAction extends ActionController {

src/Action/UpgradeResourceToLevel.ts

@@ -1,11 +1,11 @@
 import { ActionController, registerAction } from './ActionController';
 import { AbortTaskError, ActionError, TryLaterError } from '../Errors';
-import { Task } from '../Queue/TaskQueue';
 import { grabResourceDeposits } from '../Page/SlotBlock';
 import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
 import { ResourceDeposit } from '../Game';
 import { aroundMinutes, getNumber } from '../utils';
 import { Args } from '../Queue/Args';
+import { Task } from '../Queue/TaskProvider';
 
 @registerAction
 export class UpgradeResourceToLevel extends ActionController {