Merge pull request #883 from 0xProject/feature/tslint-improvements

New tslint rules

8 files changed, 26 insertions, 26 deletions

diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 27d64a371..30cd90ef9 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -73,7 +73,7 @@
         "shx": "^0.2.2",
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
-        "tslint": "5.8.0",
+        "tslint": "5.11.0",
         "typescript": "2.7.1"
     },
     "dependencies": {
diff --git a/packages/order-watcher/src/order_watcher/event_watcher.ts b/packages/order-watcher/src/order_watcher/event_watcher.ts
index 60a3c6297..8ad52989b 100644
--- a/packages/order-watcher/src/order_watcher/event_watcher.ts
+++ b/packages/order-watcher/src/order_watcher/event_watcher.ts
@@ -19,14 +19,14 @@ enum LogEventState {
  * depth.
  */
 export class EventWatcher {
-    private _web3Wrapper: Web3Wrapper;
+    private readonly _web3Wrapper: Web3Wrapper;
     private _blockAndLogStreamerIfExists: BlockAndLogStreamer<Block, Log> | undefined;
     private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
     private _onLogAddedSubscriptionToken: string | undefined;
     private _onLogRemovedSubscriptionToken: string | undefined;
-    private _pollingIntervalMs: number;
-    private _stateLayer: BlockParamLiteral;
-    private _isVerbose: boolean;
+    private readonly _pollingIntervalMs: number;
+    private readonly _stateLayer: BlockParamLiteral;
+    private readonly _isVerbose: boolean;
     constructor(
         web3Wrapper: Web3Wrapper,
         pollingIntervalIfExistsMs: undefined | number,
diff --git a/packages/order-watcher/src/order_watcher/expiration_watcher.ts b/packages/order-watcher/src/order_watcher/expiration_watcher.ts
index 31fda7dca..c1f34d13d 100644
--- a/packages/order-watcher/src/order_watcher/expiration_watcher.ts
+++ b/packages/order-watcher/src/order_watcher/expiration_watcher.ts
@@ -13,10 +13,10 @@ const DEFAULT_ORDER_EXPIRATION_CHECKING_INTERVAL_MS = 50;
  * It stores them in a min heap by expiration time and checks for expired ones every `orderExpirationCheckingIntervalMs`
  */
 export class ExpirationWatcher {
-    private _orderHashByExpirationRBTree: RBTree<string>;
-    private _expiration: { [orderHash: string]: BigNumber } = {};
-    private _orderExpirationCheckingIntervalMs: number;
-    private _expirationMarginMs: number;
+    private readonly _orderHashByExpirationRBTree: RBTree<string>;
+    private readonly _expiration: { [orderHash: string]: BigNumber } = {};
+    private readonly _orderExpirationCheckingIntervalMs: number;
+    private readonly _expirationMarginMs: number;
     private _orderExpirationCheckingIntervalIdIfExists?: NodeJS.Timer;
     constructor(expirationMarginIfExistsMs?: number, orderExpirationCheckingIntervalIfExistsMs?: number) {
         this._orderExpirationCheckingIntervalMs =
@@ -44,7 +44,7 @@ export class ExpirationWatcher {
         this._orderExpirationCheckingIntervalIdIfExists = intervalUtils.setInterval(
             this._pruneExpiredOrders.bind(this, callback),
             this._orderExpirationCheckingIntervalMs,
-            _.noop, // _pruneExpiredOrders never throws
+            _.noop.bind(_), // _pruneExpiredOrders never throws
         );
     }
     public unsubscribe(): void {
diff --git a/packages/order-watcher/src/order_watcher/order_watcher.ts b/packages/order-watcher/src/order_watcher/order_watcher.ts
index 95671684f..765747e35 100644
--- a/packages/order-watcher/src/order_watcher/order_watcher.ts
+++ b/packages/order-watcher/src/order_watcher/order_watcher.ts
@@ -70,18 +70,18 @@ const STATE_LAYER = BlockParamLiteral.Latest;
  * the order should be deemed invalid.
  */
 export class OrderWatcher {
-    private _contractWrappers: ContractWrappers;
-    private _orderStateByOrderHashCache: OrderStateByOrderHash = {};
-    private _orderByOrderHash: OrderByOrderHash = {};
-    private _dependentOrderHashes: DependentOrderHashes = {};
+    private readonly _contractWrappers: ContractWrappers;
+    private readonly _orderStateByOrderHashCache: OrderStateByOrderHash = {};
+    private readonly _orderByOrderHash: OrderByOrderHash = {};
+    private readonly _dependentOrderHashes: DependentOrderHashes = {};
     private _callbackIfExists?: OnOrderStateChangeCallback;
-    private _eventWatcher: EventWatcher;
-    private _web3Wrapper: Web3Wrapper;
-    private _expirationWatcher: ExpirationWatcher;
-    private _orderStateUtils: OrderStateUtils;
-    private _orderFilledCancelledLazyStore: OrderFilledCancelledLazyStore;
-    private _balanceAndProxyAllowanceLazyStore: BalanceAndProxyAllowanceLazyStore;
-    private _cleanupJobInterval: number;
+    private readonly _eventWatcher: EventWatcher;
+    private readonly _web3Wrapper: Web3Wrapper;
+    private readonly _expirationWatcher: ExpirationWatcher;
+    private readonly _orderStateUtils: OrderStateUtils;
+    private readonly _orderFilledCancelledLazyStore: OrderFilledCancelledLazyStore;
+    private readonly _balanceAndProxyAllowanceLazyStore: BalanceAndProxyAllowanceLazyStore;
+    private readonly _cleanupJobInterval: number;
     private _cleanupJobIntervalIdIfExists?: NodeJS.Timer;
     constructor(provider: Provider, networkId: number, config?: OrderWatcherConfig) {
         this._web3Wrapper = new Web3Wrapper(provider);
diff --git a/packages/order-watcher/src/utils/assert.ts b/packages/order-watcher/src/utils/assert.ts
index 9c992d9b4..4a1441474 100644
--- a/packages/order-watcher/src/utils/assert.ts
+++ b/packages/order-watcher/src/utils/assert.ts
@@ -12,6 +12,6 @@ export const assert = {
     ...sharedAssert,
     isValidSignature(orderHash: string, ecSignature: ECSignature, signerAddress: string): void {
         const isValid = isValidSignature(orderHash, ecSignature, signerAddress);
-        this.assert(isValid, `Expected order with hash '${orderHash}' to have a valid signature`);
+        assert.assert(isValid, `Expected order with hash '${orderHash}' to have a valid signature`);
     },
 };
diff --git a/packages/order-watcher/test/global_hooks.ts b/packages/order-watcher/test/global_hooks.ts
index 30b0cd697..8ff4a120f 100644
--- a/packages/order-watcher/test/global_hooks.ts
+++ b/packages/order-watcher/test/global_hooks.ts
@@ -7,7 +7,7 @@ before('migrate contracts', async function(): Promise<void> {
     // HACK: Since the migrations take longer then our global mocha timeout limit
     // we manually increase it for this before hook.
     const mochaTestTimeoutMs = 25000;
-    this.timeout(mochaTestTimeoutMs);
+    this.timeout(mochaTestTimeoutMs); // tslint:disable-line:no-invalid-this
     const txDefaults = {
         gas: devConstants.GAS_LIMIT,
         from: devConstants.TESTRPC_FIRST_ADDRESS,
diff --git a/packages/order-watcher/test/order_watcher_test.ts b/packages/order-watcher/test/order_watcher_test.ts
index 2889051bc..8e9223efe 100644
--- a/packages/order-watcher/test/order_watcher_test.ts
+++ b/packages/order-watcher/test/order_watcher_test.ts
@@ -116,8 +116,8 @@ describe('OrderWatcher', () => {
             orderWatcher.unsubscribe();
         });
         it('should fail when trying to subscribe twice', async () => {
-            orderWatcher.subscribe(_.noop);
-            expect(() => orderWatcher.subscribe(_.noop)).to.throw(OrderWatcherError.SubscriptionAlreadyPresent);
+            orderWatcher.subscribe(_.noop.bind(_));
+            expect(() => orderWatcher.subscribe(_.noop.bind(_))).to.throw(OrderWatcherError.SubscriptionAlreadyPresent);
         });
     });
     describe('tests with cleanup', async () => {
diff --git a/packages/order-watcher/test/utils/token_utils.ts b/packages/order-watcher/test/utils/token_utils.ts
index e1191b5bb..f91b3797f 100644
--- a/packages/order-watcher/test/utils/token_utils.ts
+++ b/packages/order-watcher/test/utils/token_utils.ts
@@ -7,7 +7,7 @@ const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
 const WETH_TOKEN_SYMBOL = 'WETH';
 
 export class TokenUtils {
-    private _tokens: Token[];
+    private readonly _tokens: Token[];
     constructor(tokens: Token[]) {
         this._tokens = tokens;
     }