diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 47 | ||||
| -rw-r--r-- | src/index.ts | 1 | ||||
| -rw-r--r-- | src/types.ts | 5 | ||||
| -rw-r--r-- | src/utils/utils.ts | 4 |
4 files changed, 37 insertions, 20 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index 74b8d25c1..14d633d66 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -14,11 +14,11 @@ import { SignedOrder, ContractEvent, ExchangeEvents, + EventEmitter, SubscriptionOpts, IndexFilterValues, CreateContractEvent, ContractEventObj, - EventCallback, ContractResponse, OrderCancellationRequest, OrderFillRequest, @@ -47,7 +47,7 @@ export class ExchangeWrapper extends ContractWrapper { [ExchangeContractErrCodes.ERROR_FILL_BALANCE_ALLOWANCE]: ExchangeContractErrs.FILL_BALANCE_ALLOWANCE_ERROR, }; private _exchangeContractIfExists?: ExchangeContract; - private _exchangeLogEventObjs: ContractEventObj[]; + private _exchangeLogEventEmitters: EventEmitter[]; private _tokenWrapper: TokenWrapper; private static _getOrderAddressesAndValues(order: Order): [OrderAddresses, OrderValues] { const orderAddresses: OrderAddresses = [ @@ -70,10 +70,10 @@ export class ExchangeWrapper extends ContractWrapper { constructor(web3Wrapper: Web3Wrapper, tokenWrapper: TokenWrapper) { super(web3Wrapper); this._tokenWrapper = tokenWrapper; - this._exchangeLogEventObjs = []; + this._exchangeLogEventEmitters = []; } public async invalidateContractInstanceAsync(): Promise<void> { - await this._stopWatchingExchangeLogEventsAsync(); + await this.stopWatchingAllEventsAsync(); delete this._exchangeContractIfExists; } /** @@ -517,11 +517,11 @@ export class ExchangeWrapper extends ContractWrapper { * @param subscriptionOpts Subscriptions options that let you configure the subscription. * @param indexFilterValues A JS object where the keys are indexed args returned by the event and * the value is the value you are interested in. E.g `{maker: aUserAddressHex}` - * @param callback The callback that will be called everytime a matching event is found. + * @return EventEmitter object */ public async subscribeAsync(eventName: ExchangeEvents, subscriptionOpts: SubscriptionOpts, - indexFilterValues: IndexFilterValues, callback: EventCallback): - Promise<void> { + indexFilterValues: IndexFilterValues): + Promise<EventEmitter> { const exchangeContract = await this._getExchangeContractAsync(); let createLogEvent: CreateContractEvent; switch (eventName) { @@ -535,13 +535,13 @@ export class ExchangeWrapper extends ContractWrapper { createLogEvent = exchangeContract.LogCancel; break; default: - utils.spawnSwitchErr('ExchangeEvents', eventName); - return; + throw utils.spawnSwitchErr('ExchangeEvents', eventName); } const logEventObj: ContractEventObj = createLogEvent(indexFilterValues, subscriptionOpts); - logEventObj.watch(callback); - this._exchangeLogEventObjs.push(logEventObj); + const eventEmitter = this._wrapEventEmitter(logEventObj); + this._exchangeLogEventEmitters.push(eventEmitter); + return eventEmitter; } /** * Returns the ethereum address of the current exchange contract @@ -552,6 +552,24 @@ export class ExchangeWrapper extends ContractWrapper { const exchangeContract = await this._getExchangeContractAsync(); return exchangeContract.address; } + /** + * Stops watching for all exchange events + */ + public async stopWatchingAllEventsAsync(): Promise<void> { + const stopWatchingPromises = _.map(this._exchangeLogEventEmitters, + logEventObj => logEventObj.stopWatchingAsync()); + await Promise.all(stopWatchingPromises); + this._exchangeLogEventEmitters = []; + } + private _wrapEventEmitter(event: ContractEventObj): EventEmitter { + const zeroExEvent = { + watch: event.watch.bind(event), + stopWatchingAsync: async () => { + await promisify(event.stopWatching, event)(); + }, + }; + return zeroExEvent; + } private async _isValidSignatureUsingContractCallAsync(dataHex: string, ecSignature: ECSignature, signerAddressHex: string): Promise<boolean> { assert.isHexString('dataHex', dataHex); @@ -580,13 +598,6 @@ export class ExchangeWrapper extends ContractWrapper { const orderHashHex = await exchangeInstance.getOrderHash.call(orderAddresses, orderValues); return orderHashHex; } - private async _stopWatchingExchangeLogEventsAsync() { - const stopWatchingPromises = _.map(this._exchangeLogEventObjs, logEventObj => { - return promisify(logEventObj.stopWatching, logEventObj)(); - }); - await Promise.all(stopWatchingPromises); - this._exchangeLogEventObjs = []; - } private async _validateFillOrderAndThrowIfInvalidAsync(signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber, senderAddress: string): Promise<void> { diff --git a/src/index.ts b/src/index.ts index 16e48862b..b2963aca7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -22,4 +22,5 @@ export { OrderCancellationRequest, OrderFillRequest, DoneCallback, + EventEmitter, } from './types'; diff --git a/src/types.ts b/src/types.ts index 1b70d950b..2197fbfc3 100644 --- a/src/types.ts +++ b/src/types.ts @@ -275,3 +275,8 @@ export interface ContractInstance { export interface Artifact { networks: {[networkId: number]: any}; } + +export interface EventEmitter { + watch: (eventCallback: EventCallback) => void; + stopWatchingAsync: () => Promise<void>; +} diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 5786bab07..bad5b6498 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -22,11 +22,11 @@ export const utils = { isParityNode(nodeVersion: string): boolean { return _.includes(nodeVersion, 'Parity'); }, - isValidOrderHash(orderHashHex: string) { + isValidOrderHash(orderHashHex: string): boolean { const isValid = /^0x[0-9A-F]{64}$/i.test(orderHashHex); return isValid; }, - spawnSwitchErr(name: string, value: any) { + spawnSwitchErr(name: string, value: any): Error { return new Error(`Unexpected switch value: ${value} encountered for ${name}`); }, getOrderHashHex(order: Order|SignedOrder, exchangeContractAddr: string): string { |