Fix rebasing issues

3 files changed, 13 insertions, 10 deletions

diff --git a/packages/0x.js/src/order_watcher/remaining_fillable_calculator.ts b/packages/0x.js/src/order_watcher/remaining_fillable_calculator.ts
index c77d4428c..e8601e678 100644
--- a/packages/0x.js/src/order_watcher/remaining_fillable_calculator.ts
+++ b/packages/0x.js/src/order_watcher/remaining_fillable_calculator.ts
@@ -1,6 +1,7 @@
-import {SignedOrder} from '../types';
 import {BigNumber} from 'bignumber.js';
 
+import {SignedOrder} from '../types';
+
 export class RemainingFillableCalculator {
     private signedOrder: SignedOrder;
     private isMakerTokenZRX: boolean;
diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts
index 616d8fda0..ba37d1ce5 100644
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -358,7 +358,7 @@ describe('OrderStateWatcher', () => {
 
                     const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
                     const transferTokenAmount = makerFee.sub(remainingTokenAmount);
-                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
+                    zeroEx.orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                         expect(orderState.isValid).to.be.true();
@@ -388,7 +388,7 @@ describe('OrderStateWatcher', () => {
 
                     const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
                     const transferTokenAmount = makerFee.sub(remainingTokenAmount);
-                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
+                    zeroEx.orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                         const validOrderState = orderState as OrderStateValid;
@@ -413,7 +413,7 @@ describe('OrderStateWatcher', () => {
                         taker, fillableAmount, feeRecipient);
 
                     const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
+                    zeroEx.orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                         const validOrderState = orderState as OrderStateValid;
@@ -497,4 +497,4 @@ describe('OrderStateWatcher', () => {
             })().catch(done);
         });
     });
-});
+}); // tslint:disable:max-file-line-count
diff --git a/packages/0x.js/test/remaining_fillable_calculator_test.ts b/packages/0x.js/test/remaining_fillable_calculator_test.ts
index 65b65efd8..610bf9b1a 100644
--- a/packages/0x.js/test/remaining_fillable_calculator_test.ts
+++ b/packages/0x.js/test/remaining_fillable_calculator_test.ts
@@ -1,11 +1,13 @@
-import 'mocha';
-import * as chai from 'chai';
 import BigNumber from 'bignumber.js';
-import { chaiSetup } from './utils/chai_setup';
+import * as chai from 'chai';
+import 'mocha';
+
+import { ZeroEx } from '../src/0x';
 import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator';
-import { SignedOrder, ECSignature } from '../src/types';
+import { ECSignature, SignedOrder } from '../src/types';
+
+import { chaiSetup } from './utils/chai_setup';
 import { TokenUtils } from './utils/token_utils';
-import { ZeroEx } from '../src/0x';
 
 chaiSetup.configure();
 const expect = chai.expect;