crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Callback for subscribe no longer supports an Async Callback

Browse Source
This commit is contained in:
Jacob Evans
2017-11-14 10:56:57 -05:00
parent bc61b92070
commit a12069f03f
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/0x.js/src/contract_wrappers/contract_wrapper.ts
View File

@@ -52,8 +52,7 @@ export class ContractWrapper {
throw new Error(ZeroExError.SubscriptionNotFound); throw new Error(ZeroExError.SubscriptionNotFound);
} }
if (!_.isUndefined(err)) { if (!_.isUndefined(err)) {
const callback = this._filterCallbacks[filterToken]; this._filterCallbacks[filterToken](err, undefined);
callback(err, undefined);
} }
delete this._filters[filterToken]; delete this._filters[filterToken];
delete this._filterCallbacks[filterToken]; delete this._filterCallbacks[filterToken];

2
packages/0x.js/src/index.ts
View File

@@ -6,8 +6,6 @@ export {
ECSignature, ECSignature,
ZeroExError, ZeroExError,
EventCallback, EventCallback,
EventCallbackAsync,
EventCallbackSync,
ExchangeContractErrs, ExchangeContractErrs,
ContractEvent, ContractEvent,
Token, Token,

2
packages/0x.js/src/order_watcher/event_watcher.ts
View File

@@ -81,7 +81,7 @@ export class EventWatcher {
...log, ...log,
}; };
if (!_.isUndefined(this._intervalIdIfExists)) { if (!_.isUndefined(this._intervalIdIfExists)) {
await callback(logEvent); callback(logEvent);
} }
} }
} }

9
packages/0x.js/src/types.ts
View File

@@ -42,13 +42,8 @@ export type OrderValues = [BigNumber, BigNumber, BigNumber,
export type LogEvent = Web3.LogEntryEvent; export type LogEvent = Web3.LogEntryEvent;
export type DecodedLogEvent<ArgsType> = Web3.DecodedLogEntryEvent<ArgsType>; export type DecodedLogEvent<ArgsType> = Web3.DecodedLogEntryEvent<ArgsType>;
export type EventCallbackAsync<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => Promise<void>; export type EventCallback<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void;
export type EventCallbackSync<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void; export type EventWatcherCallback = (log: LogEvent) => void;
export type EventCallback<ArgsType> = EventCallbackSync<ArgsType>|EventCallbackAsync<ArgsType>;
export type EventWatcherCallbackSync = (log: LogEvent) => void;
export type EventWatcherCallbackAsync = (log: LogEvent) => Promise<void>;
export type EventWatcherCallback = EventWatcherCallbackSync|EventWatcherCallbackAsync;
export interface ExchangeContract extends Web3.ContractInstance { export interface ExchangeContract extends Web3.ContractInstance {
isValidSignature: { isValidSignature: {