From 6ad1900ada799eec18e870f48de785af14780a60 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 13 Jun 2017 15:52:50 +0200 Subject: Refactor subscription to return zeroExSignature object --- test/exchange_wrapper_test.ts | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index f9cf9651f..b9ac374dd 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -619,7 +619,7 @@ describe('ExchangeWrapper', () => { ); }); afterEach(async () => { - await (zeroEx.exchange as any)._stopWatchingExchangeLogEventsAsync(); + await zeroEx.exchange.stopWatchingAllEventsAsync(); }); // Hack: Mocha does not allow a test to be both async and have a `done` callback // Since we need to await the receipt of the event in the `subscribeAsync` callback, @@ -632,8 +632,9 @@ describe('ExchangeWrapper', () => { fromBlock: 0, toBlock: 'latest', }; - await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogFill, subscriptionOpts, - indexFilterValues, (err: Error, event: ContractEvent) => { + const zeroExEvent = await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogFill, subscriptionOpts, + indexFilterValues); + zeroExEvent.watch((err: Error, event: ContractEvent) => { expect(err).to.be.null(); expect(event).to.not.be.undefined(); done(); @@ -650,12 +651,13 @@ describe('ExchangeWrapper', () => { fromBlock: 0, toBlock: 'latest', }; - await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogCancel, subscriptionOpts, - indexFilterValues, (err: Error, event: ContractEvent) => { + const zeroExEvent = await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogCancel, subscriptionOpts, + indexFilterValues); + zeroExEvent.watch((err: Error, event: ContractEvent) => { expect(err).to.be.null(); expect(event).to.not.be.undefined(); done(); - }); + }); const cancelTakerAmountInBaseUnits = new BigNumber(1); await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelTakerAmountInBaseUnits); })(); @@ -666,16 +668,20 @@ describe('ExchangeWrapper', () => { fromBlock: 0, toBlock: 'latest', }; - await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogFill, subscriptionOpts, - indexFilterValues, (err: Error, event: ContractEvent) => { + const eventSubscriptionToBeCancelled = await zeroEx.exchange.subscribeAsync( + ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, + ); + eventSubscriptionToBeCancelled.watch((err: Error, event: ContractEvent) => { done(new Error('Expected this subscription to have been cancelled')); }); const newProvider = web3Factory.getRpcProvider(); await zeroEx.setProviderAsync(newProvider); - await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogFill, subscriptionOpts, - indexFilterValues, (err: Error, event: ContractEvent) => { + const eventSubscriptionToStay = await zeroEx.exchange.subscribeAsync( + ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, + ); + eventSubscriptionToStay.watch((err: Error, event: ContractEvent) => { expect(err).to.be.null(); expect(event).to.not.be.undefined(); done(); -- cgit v1.2.3 From 96a93c4b35673c951914e26d67140242c2a2de8f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 13 Jun 2017 17:39:43 +0200 Subject: Add tests for stopWatchingAsync --- test/exchange_wrapper_test.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'test') diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index b9ac374dd..35e42e4b2 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -693,6 +693,26 @@ describe('ExchangeWrapper', () => { ); })(); }); + it('Should be able to stop watching', (done: DoneCallback) => { + (async () => { + const subscriptionOpts: SubscriptionOpts = { + fromBlock: 0, + toBlock: 'latest', + }; + const eventSubscriptionToBeStopped = await zeroEx.exchange.subscribeAsync( + ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, + ); + eventSubscriptionToBeStopped.watch((err: Error, event: ContractEvent) => { + 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(); + })(); + }); }); describe('#getOrderHashHexUsingContractCallAsync', () => { let makerTokenAddress: string; -- cgit v1.2.3 From ac8116bbe4a615fd70cb4ae22713ca36db3ee963 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 13 Jun 2017 18:08:18 +0200 Subject: Address feedback --- test/exchange_wrapper_test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 35e42e4b2..6d927e218 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -633,7 +633,7 @@ describe('ExchangeWrapper', () => { toBlock: 'latest', }; const zeroExEvent = await zeroEx.exchange.subscribeAsync(ExchangeEvents.LogFill, subscriptionOpts, - indexFilterValues); + indexFilterValues); zeroExEvent.watch((err: Error, event: ContractEvent) => { expect(err).to.be.null(); expect(event).to.not.be.undefined(); @@ -693,7 +693,7 @@ describe('ExchangeWrapper', () => { ); })(); }); - it('Should be able to stop watching', (done: DoneCallback) => { + it('Should stop watch for events when stopWatchingAsync called on the eventEmitter', (done: DoneCallback) => { (async () => { const subscriptionOpts: SubscriptionOpts = { fromBlock: 0, -- cgit v1.2.3