1 files changed, 25 insertions, 21 deletions

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 5833a8c23..2682c5d52 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -18,6 +18,7 @@ import {
     ExchangeContractErrs,
     OrderCancellationRequest,
     OrderFillRequest,
+    LogFillContractEventArgs,
 } from '../src';
 import {DoneCallback} from '../src/types';
 import {FillScenarios} from './utils/fill_scenarios';
@@ -680,6 +681,12 @@ describe('ExchangeWrapper', () => {
         let makerAddress: string;
         let fillableAmount: BigNumber.BigNumber;
         let signedOrder: SignedOrder;
+        const subscriptionOpts: SubscriptionOpts = {
+            fromBlock: 0,
+            toBlock: 'latest',
+        };
+        const fillTakerAmountInBaseUnits = new BigNumber(1);
+        const cancelTakerAmountInBaseUnits = new BigNumber(1);
         before(() => {
             [coinbase, makerAddress, takerAddress] = userAddresses;
             const [makerToken, takerToken] = tokens;
@@ -702,10 +709,6 @@ describe('ExchangeWrapper', () => {
         // Source: https://github.com/mochajs/mocha/issues/2407
         it('Should receive the LogFill event when an order is filled', (done: DoneCallback) => {
             (async () => {
-                const subscriptionOpts: SubscriptionOpts = {
-                    fromBlock: 0,
-                    toBlock: 'latest',
-                };
                 const zeroExEvent = await zeroEx.exchange.subscribeAsync(
                     ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, exchangeContractAddress,
                 );
@@ -715,7 +718,6 @@ describe('ExchangeWrapper', () => {
                     expect(event.event).to.be.equal('LogFill');
                     done();
                 });
-                const fillTakerAmountInBaseUnits = new BigNumber(1);
                 await zeroEx.exchange.fillOrderAsync(
                     signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer, takerAddress,
                 );
@@ -723,10 +725,6 @@ describe('ExchangeWrapper', () => {
         });
         it('Should receive the LogCancel event when an order is cancelled', (done: DoneCallback) => {
             (async () => {
-                const subscriptionOpts: SubscriptionOpts = {
-                    fromBlock: 0,
-                    toBlock: 'latest',
-                };
                 const zeroExEvent = await zeroEx.exchange.subscribeAsync(
                     ExchangeEvents.LogCancel, subscriptionOpts, indexFilterValues, exchangeContractAddress,
                 );
@@ -736,16 +734,11 @@ describe('ExchangeWrapper', () => {
                         expect(event.event).to.be.equal('LogCancel');
                         done();
                 });
-                const cancelTakerAmountInBaseUnits = new BigNumber(1);
                 await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelTakerAmountInBaseUnits);
             })();
         });
         it('Outstanding subscriptions are cancelled when zeroEx.setProviderAsync called', (done: DoneCallback) => {
             (async () => {
-                const subscriptionOpts: SubscriptionOpts = {
-                    fromBlock: 0,
-                    toBlock: 'latest',
-                };
                 const eventSubscriptionToBeCancelled = await zeroEx.exchange.subscribeAsync(
                     ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, exchangeContractAddress,
                 );
@@ -765,8 +758,6 @@ describe('ExchangeWrapper', () => {
                     expect(event.event).to.be.equal('LogFill');
                     done();
                 });
-
-                const fillTakerAmountInBaseUnits = new BigNumber(1);
                 await zeroEx.exchange.fillOrderAsync(
                     signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer, takerAddress,
                 );
@@ -774,10 +765,6 @@ describe('ExchangeWrapper', () => {
         });
         it('Should stop watch for events when stopWatchingAsync called on the eventEmitter', (done: DoneCallback) => {
             (async () => {
-                const subscriptionOpts: SubscriptionOpts = {
-                    fromBlock: 0,
-                    toBlock: 'latest',
-                };
                 const eventSubscriptionToBeStopped = await zeroEx.exchange.subscribeAsync(
                     ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, exchangeContractAddress,
                 );
@@ -785,13 +772,30 @@ describe('ExchangeWrapper', () => {
                     done(new Error('Expected this subscription to have been stopped'));
                 });
                 await eventSubscriptionToBeStopped.stopWatchingAsync();
-                const fillTakerAmountInBaseUnits = new BigNumber(1);
                 await zeroEx.exchange.fillOrderAsync(
                     signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer, takerAddress,
                 );
                 done();
             })();
         });
+        it('Should wrap all event args BigNumber instances in a newer version of BigNumber', (done: DoneCallback) => {
+            (async () => {
+                const zeroExEvent = await zeroEx.exchange.subscribeAsync(
+                    ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, exchangeContractAddress,
+                );
+                zeroExEvent.watch((err: Error, event: ContractEvent) => {
+                    const args = event.args as LogFillContractEventArgs;
+                    expect(args.filledValueM.isBigNumber).to.be.true();
+                    expect(args.filledValueT.isBigNumber).to.be.true();
+                    expect(args.feeMPaid.isBigNumber).to.be.true();
+                    expect(args.feeTPaid.isBigNumber).to.be.true();
+                    done();
+                });
+                await zeroEx.exchange.fillOrderAsync(
+                    signedOrder, fillTakerAmountInBaseUnits, shouldCheckTransfer, takerAddress,
+                );
+            })();
+        });
     });
     describe('#getOrderHashHexUsingContractCallAsync', () => {
         let makerTokenAddress: string;