7 files changed, 33 insertions, 24 deletions
diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts
index 2c7c2a971..616d8fda0 100644
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -1,31 +1,33 @@
-import 'mocha';
+import BigNumber from 'bignumber.js';
 import * as chai from 'chai';
 import * as _ from 'lodash';
+import 'mocha';
 import * as Web3 from 'web3';
-import BigNumber from 'bignumber.js';
-import {chaiSetup} from './utils/chai_setup';
-import {web3Factory} from './utils/web3_factory';
-import {Web3Wrapper} from '../src/web3_wrapper';
-import {OrderStateWatcher} from '../src/order_watcher/order_state_watcher';
+
 import {
-    Token,
-    ZeroEx,
-    LogEvent,
     DecodedLogEvent,
-    ZeroExConfig,
+    ExchangeContractErrs,
+    LogEvent,
     OrderState,
+    OrderStateInvalid,
+    OrderStateValid,
     SignedOrder,
+    Token,
+    ZeroEx,
+    ZeroExConfig,
     ZeroExError,
-    OrderStateValid,
-    OrderStateInvalid,
-    ExchangeContractErrs,
 } from '../src';
-import {constants} from './utils/constants';
-import {TokenUtils} from './utils/token_utils';
-import {FillScenarios} from './utils/fill_scenarios';
+import {OrderStateWatcher} from '../src/order_watcher/order_state_watcher';
 import {DoneCallback} from '../src/types';
+import {Web3Wrapper} from '../src/web3_wrapper';
+
 import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
+import {chaiSetup} from './utils/chai_setup';
+import {constants} from './utils/constants';
+import {FillScenarios} from './utils/fill_scenarios';
 import {reportCallbackErrors} from './utils/report_callback_errors';
+import {TokenUtils} from './utils/token_utils';
+import {web3Factory} from './utils/web3_factory';
 
 const TIMEOUT_MS = 150;
 
diff --git a/packages/0x.js/test/utils/chai_setup.ts b/packages/0x.js/test/utils/chai_setup.ts
index c18988106..078edd309 100644
--- a/packages/0x.js/test/utils/chai_setup.ts
+++ b/packages/0x.js/test/utils/chai_setup.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai';
-import * as dirtyChai from 'dirty-chai';
-import ChaiBigNumber = require('chai-bignumber');
 import chaiAsPromised = require('chai-as-promised');
+import ChaiBigNumber = require('chai-bignumber');
+import * as dirtyChai from 'dirty-chai';
 
 export const chaiSetup = {
     configure() {
diff --git a/packages/0x.js/test/utils/fill_scenarios.ts b/packages/0x.js/test/utils/fill_scenarios.ts
index a0632b12c..090493935 100644
--- a/packages/0x.js/test/utils/fill_scenarios.ts
+++ b/packages/0x.js/test/utils/fill_scenarios.ts
@@ -1,6 +1,8 @@
 import BigNumber from 'bignumber.js';
-import {ZeroEx, Token, SignedOrder} from '../../src';
+
+import {SignedOrder, Token, ZeroEx} from '../../src';
 import {orderFactory} from '../utils/order_factory';
+
 import {constants} from './constants';
 
 export class FillScenarios {
diff --git a/packages/0x.js/test/utils/order_factory.ts b/packages/0x.js/test/utils/order_factory.ts
index e3161e262..41d93e340 100644
--- a/packages/0x.js/test/utils/order_factory.ts
+++ b/packages/0x.js/test/utils/order_factory.ts
@@ -1,6 +1,7 @@
-import * as _ from 'lodash';
 import BigNumber from 'bignumber.js';
-import {ZeroEx, SignedOrder} from '../../src';
+import * as _ from 'lodash';
+
+import {SignedOrder, ZeroEx} from '../../src';
 
 export const orderFactory = {
     async createSignedOrderAsync(
diff --git a/packages/0x.js/test/utils/rpc.ts b/packages/0x.js/test/utils/rpc.ts
index 299e72e79..309a96d5e 100644
--- a/packages/0x.js/test/utils/rpc.ts
+++ b/packages/0x.js/test/utils/rpc.ts
@@ -1,5 +1,6 @@
 import * as ethUtil from 'ethereumjs-util';
 import * as request from 'request-promise-native';
+
 import {constants} from './constants';
 
 export class RPC {
diff --git a/packages/0x.js/test/utils/token_utils.ts b/packages/0x.js/test/utils/token_utils.ts
index 51cb9411c..9c20f52a1 100644
--- a/packages/0x.js/test/utils/token_utils.ts
+++ b/packages/0x.js/test/utils/token_utils.ts
@@ -1,5 +1,6 @@
 import * as _ from 'lodash';
-import {Token, InternalZeroExError} from '../../src/types';
+
+import {InternalZeroExError, Token} from '../../src/types';
 
 const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
 
diff --git a/packages/0x.js/test/utils/web3_factory.ts b/packages/0x.js/test/utils/web3_factory.ts
index b20070c74..b4bf1acd3 100644
--- a/packages/0x.js/test/utils/web3_factory.ts
+++ b/packages/0x.js/test/utils/web3_factory.ts
@@ -3,12 +3,14 @@
 // we are not running in a browser env.
 // Filed issue: https://github.com/ethereum/web3.js/issues/844
 (global as any).XMLHttpRequest = undefined;
+import * as Web3 from 'web3';
 import ProviderEngine = require('web3-provider-engine');
 import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
-import * as Web3 from 'web3';
-import {constants} from './constants';
+
 import {EmptyWalletSubProvider} from '../../src/subproviders/empty_wallet_subprovider';
 
+import {constants} from './constants';
+
 export const web3Factory = {
     create(hasAddresses: boolean = true): Web3 {
         const provider = this.getRpcProvider(hasAddresses);