Merge branch 'master' into addEventSubscriptions

# Conflicts:
#	src/types.ts
#	test/exchange_wrapper_test.ts
#	test/utils/fill_scenarios.ts

2 files changed, 5 insertions, 9 deletions

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index ab6f2df67..a44d2728a 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -32,11 +32,11 @@ const NON_EXISTENT_ORDER_HASH = '0x79370342234e7acd6bbeac335bd3bb1d368383294b64b
 describe('ExchangeWrapper', () => {
     let web3: Web3;
     let zeroEx: ZeroEx;
-    let userAddresses: string[];
     let tokenUtils: TokenUtils;
     let tokens: Token[];
-    let fillScenarios: FillScenarios;
+    let userAddresses: string[];
     let zrxTokenAddress: string;
+    let fillScenarios: FillScenarios;
     before(async () => {
         web3 = web3Factory.create();
         zeroEx = new ZeroEx(web3);
diff --git a/test/utils/fill_scenarios.ts b/test/utils/fill_scenarios.ts
index ea5eb77eb..d186593b9 100644
--- a/test/utils/fill_scenarios.ts
+++ b/test/utils/fill_scenarios.ts
@@ -56,14 +56,10 @@ export class FillScenarios {
                                                        partialFillAmount: BigNumber.BigNumber) {
         const prevSenderAccount = await this.zeroEx.getTransactionSenderAccountIfExistsAsync();
         const [makerAddress] = this.userAddresses;
-        await this.zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress, fillableAmount);
-        await this.zeroEx.token.transferAsync(takerTokenAddress, makerAddress, takerAddress, fillableAmount);
-        await this.zeroEx.token.setProxyAllowanceAsync(takerTokenAddress, takerAddress, fillableAmount);
-
         const signedOrder = await this.createAsymmetricFillableSignedOrderAsync(
-             makerTokenAddress, takerTokenAddress, makerAddress, takerAddress,
-             fillableAmount, fillableAmount,
-         );
+            makerTokenAddress, takerTokenAddress, makerAddress, takerAddress,
+            fillableAmount, fillableAmount,
+        );
 
         this.zeroEx.setTransactionSenderAccount(takerAddress);
         const shouldCheckTransfer = false;