Merge branch 'development' into createWethPage

* development: (54 commits)
  Fix redundant spaces
  Fix tests
  Fix website unused vars
  Fix connect unused vars
  Fix 0x.js unused vars
  Dissallow unused vars/imports
  Implement first custom linter rule async-suffix
  Reuse intervalutils in website
  Add a newline
  Name a variable
  Add a comment
  Fix a conditional
  Make migrations deterministic
  Fix linter error
  Fix linter errors
  Add a function to init token balances
  Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens
  Add DummyToken to gitignore
  Add DummyToken to artifacts list
  Increase mocha timeout
  ...

3 files changed, 4 insertions, 10 deletions

diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts
index d5b30d567..197dfae65 100644
--- a/packages/0x.js/src/order_watcher/event_watcher.ts
+++ b/packages/0x.js/src/order_watcher/event_watcher.ts
@@ -1,17 +1,14 @@
+import {intervalUtils} from '@0xproject/utils';
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
 import {
     BlockParamLiteral,
-    EventCallback,
     EventWatcherCallback,
     ZeroExError,
 } from '../types';
-import {AbiDecoder} from '../utils/abi_decoder';
 import {assert} from '../utils/assert';
-import {intervalUtils} from '../utils/interval_utils';
-import {utils} from '../utils/utils';
 
 const DEFAULT_EVENT_POLLING_INTERVAL_MS = 200;
 
diff --git a/packages/0x.js/src/order_watcher/expiration_watcher.ts b/packages/0x.js/src/order_watcher/expiration_watcher.ts
index 9a1bb1ca4..91e8151fd 100644
--- a/packages/0x.js/src/order_watcher/expiration_watcher.ts
+++ b/packages/0x.js/src/order_watcher/expiration_watcher.ts
@@ -1,10 +1,9 @@
+import {intervalUtils} from '@0xproject/utils';
 import {BigNumber} from 'bignumber.js';
 import {RBTree} from 'bintrees';
 import * as _ from 'lodash';
 
-import {ZeroEx} from '../0x';
-import {SignedOrder, ZeroExError} from '../types';
-import {intervalUtils} from '../utils/interval_utils';
+import {ZeroExError} from '../types';
 import {utils} from '../utils/utils';
 
 const DEFAULT_EXPIRATION_MARGIN_MS = 0;
diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts
index 08f52d6e1..c4a9eb1ad 100644
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -1,9 +1,9 @@
 import {schemas} from '@0xproject/json-schemas';
+import {intervalUtils} from '@0xproject/utils';
 import {Web3Wrapper} from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 
 import {ZeroEx} from '../0x';
-import {artifacts} from '../artifacts';
 import {ExchangeWrapper} from '../contract_wrappers/exchange_wrapper';
 import {TokenWrapper} from '../contract_wrappers/token_wrapper';
 import {BalanceAndProxyAllowanceLazyStore} from '../stores/balance_proxy_allowance_lazy_store';
@@ -24,12 +24,10 @@ import {
     SignedOrder,
     TokenEvents,
     TransferContractEventArgs,
-    Web3Provider,
     ZeroExError,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
 import {assert} from '../utils/assert';
-import {intervalUtils} from '../utils/interval_utils';
 import {OrderStateUtils} from '../utils/order_state_utils';
 import {utils} from '../utils/utils';