diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-07-04 02:39:26 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-07-04 06:54:05 +0800 |
commit | 5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b (patch) | |
tree | 6980d7de11f4ff45fc6d7d33c9087e7193dc102b /src/contract_wrappers/exchange_wrapper.ts | |
parent | c9edeae6d8dad1fba6c4f5eca63ff5db3e6555e2 (diff) | |
download | dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.tar dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.tar.gz dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.tar.bz2 dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.tar.lz dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.tar.xz dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.tar.zst dexon-0x-contracts-5a8eb77ff0a6b00e4df5d933426e451c8ef09f7b.zip |
Add initial implementation and tests for zeroEx.token.subscribeAsync
Diffstat (limited to 'src/contract_wrappers/exchange_wrapper.ts')
-rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index 57a116aea..722910a61 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -34,6 +34,7 @@ import { } from '../types'; import {assert} from '../utils/assert'; import {utils} from '../utils/utils'; +import {eventUtils} from '../utils/event_utils'; import {ContractWrapper} from './contract_wrapper'; import {ProxyWrapper} from './proxy_wrapper'; import {ExchangeArtifactsByName} from '../exchange_artifacts_by_name'; @@ -601,7 +602,7 @@ export class ExchangeWrapper extends ContractWrapper { } const logEventObj: ContractEventObj = createLogEvent(indexFilterValues, subscriptionOpts); - const eventEmitter = this._wrapEventEmitter(logEventObj); + const eventEmitter = eventUtils.wrapEventEmitter(logEventObj); this._exchangeLogEventEmitters.push(eventEmitter); return eventEmitter; } @@ -655,37 +656,6 @@ export class ExchangeWrapper extends ContractWrapper { const isAuthorized = await this._proxyWrapper.isAuthorizedAsync(exchangeContractAddress); return isAuthorized; } - private _wrapEventEmitter(event: ContractEventObj): ContractEventEmitter { - const watch = (eventCallback: EventCallback) => { - const bignumberWrappingEventCallback = this._getBigNumberWrappingEventCallback(eventCallback); - event.watch(bignumberWrappingEventCallback); - }; - const zeroExEvent = { - watch, - stopWatchingAsync: async () => { - await promisify(event.stopWatching, event)(); - }, - }; - return zeroExEvent; - } - private _getBigNumberWrappingEventCallback(eventCallback: EventCallback): EventCallback { - const bignumberWrappingEventCallback = (err: Error, event: ContractEvent) => { - if (_.isNull(err)) { - const wrapIfBigNumber = (value: ContractEventArg): ContractEventArg => { - // HACK: The old version of BigNumber used by Web3@0.19.0 does not support the `isBigNumber` - // and checking for a BigNumber instance using `instanceof` does not work either. We therefore - // compare the constructor functions of the possible BigNumber instance and the BigNumber used by - // Web3. - const web3BigNumber = (Web3.prototype as any).BigNumber; - const isWeb3BigNumber = web3BigNumber.toString() === value.constructor.toString(); - return isWeb3BigNumber ? new BigNumber(value) : value; - }; - event.args = _.mapValues(event.args, wrapIfBigNumber); - } - eventCallback(err, event); - }; - return bignumberWrappingEventCallback; - } private async _isValidSignatureUsingContractCallAsync(dataHex: string, ecSignature: ECSignature, signerAddressHex: string, exchangeContractAddress: string): Promise<boolean> { |