Merge 0a634cd into e305f2d

src/Actions/Actions.ts

@@ -12,7 +12,12 @@ export function shortenAddress(address: string) {
   return `${address.slice(0, 6)}...${address.slice(address.length - 5, address.length)}`;
 }
 
-export default class Actions {
+export default interface IActions {
+  claim(txRequest: ITxRequest, nextAccount: Address): Promise<ClaimStatus>;
+  execute(txRequest: ITxRequest): Promise<ExecuteStatus>;
+}
+
+export default class Actions implements IActions {
   public config: Config;
 
   constructor(config: Config) {

src/Actions/Pending.ts

@@ -1,6 +1,4 @@
-import Cache from '../Cache';
 import { FnSignatures } from '../Enum';
-import { ITxRequest } from '../Types';
 import BigNumber from 'bignumber.js';
 import { ITxRequestPending } from '../Types/ITxRequest';
 

src/Router/Router.ts

@@ -1,20 +1,24 @@
-import Actions from '../Actions';
 import Config from '../Config';
 import { TxStatus, ClaimStatus, ExecuteStatus, EconomicStrategyStatus } from '../Enum';
 import { shouldClaimTx, shouldExecuteTx } from '../EconomicStrategy';
 
 import W3Util from '../Util';
 import { Address, ITxRequest } from '../Types';
+import IActions from '../Actions';
 
-export default class Router {
-  public actions: Actions;
+export default interface IRouter {
+  route(txRequest: ITxRequest): Promise<TxStatus>;
+}
+
+export default class Router implements IRouter {
+  public actions: IActions;
   public config: Config;
   public util: W3Util;
   public txRequestStates: object = {};
 
   public transitions: object = {};
 
-  constructor(config: Config, actions: any) {
+  constructor(config: Config, actions: IActions) {
     this.actions = actions;
     this.config = config;
     this.util = config.util;
@@ -170,7 +174,7 @@ export default class Router {
     return localClaim;
   }
 
-  public async route(txRequest: ITxRequest): Promise<any> {
+  public async route(txRequest: ITxRequest): Promise<TxStatus> {
     let status: TxStatus = this.txRequestStates[txRequest.address] || TxStatus.BeforeClaimWindow;
 
     const statusFunction = this.transitions[status];

src/Scanner/Scanner.ts

@@ -8,14 +8,14 @@ import { IBlock, IntervalId, ITxRequest } from '../Types';
 import { Bucket, IBucketPair, IBuckets, BucketSize } from '../Buckets';
 import W3Util from '../Util';
 import { CacheStates } from '../Enum';
-import { BigNumber } from 'bignumber.js';
 import { ITxRequestRaw } from '../Types/ITxRequest';
+import IRouter from '../Router';
 
 export default class {
   public config: Config;
   public util: W3Util;
   public scanning: boolean;
-  public router: any;
+  public router: IRouter;
   public requestFactory: Promise<any>;
 
   // Child Scanners, tracked by the ID of their interval
@@ -41,7 +41,7 @@ export default class {
    * @param {number} ms Milliseconds of the scan interval.
    * @param {Config} config The TimeNode Config object.
    */
-  constructor(config: Config, router: any) {
+  constructor(config: Config, router: IRouter) {
     this.config = config;
     this.util = config.util;
     this.scanning = false;
@@ -170,7 +170,7 @@ export default class {
     }
   }
 
-  public async watchRequestsByBucket(bucket: Bucket, previousBucket: Bucket) {
+  public async watchRequestsByBucket(bucket: Bucket, previousBucket: Bucket): Promise<number> {
     const reqFactory = await this.requestFactory;
     const handleRequest = this.handleRequest.bind(this);
     let currentBucket = previousBucket;
@@ -232,29 +232,19 @@ export default class {
     return true;
   }
 
-  // TODO meaningful return value
   public async scanCache(): Promise<CacheStates> {
     if (this.config.cache.isEmpty()) {
       return CacheStates.EMPTY; // 1 = cache is empty
     }
 
-    // Get all transaction requests stored in cache and turn them into TransactionRequest objects.
-    const allTxRequests = this.config.cache
+    this.config.cache
       .stored()
-      .filter((address: string) => {
-        const cached = this.config.cache.get(address);
-
-        return cached && cached.windowStart.greaterThan(0);
-      })
-      .map((address: string) => this.config.eac.transactionRequest(address));
-
-    // Get fresh data on our transaction requests and route them into appropriate action.
-    const requests = await Promise.all(allTxRequests);
-    requests.forEach(async (txRequest: ITxRequest) => {
-      await txRequest.refreshData();
-
-      this.router.route(txRequest);
-    });
+      .filter((address: string) => this.config.cache.get(address))
+      .map((address: string) => this.config.eac.transactionRequest(address))
+      .forEach(async (txRequest: ITxRequest) => {
+        await txRequest.refreshData();
+        this.router.route(txRequest);
+      });
 
     return CacheStates.REFRESHED; //0 = cache loaded successfully
   }