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

Rename _callbackAsync to _callbackIfExistsAsync for clarity

Browse Source
This commit is contained in:
Fabio Berger
2017-11-09 17:48:05 -05:00
parent 0e69356ca9
commit b0491b0ee2
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/order_watcher/event_watcher.ts
View File

@@ -12,7 +12,7 @@ export class EventWatcher {
private _pollingIntervalMs: number;
private _intervalId: NodeJS.Timer;
private _lastEvents: Web3.LogEntry[] = [];
private _callbackAsync?: EventWatcherCallback;
private _callbackIfExistsAsync?: EventWatcherCallback;
constructor(web3Wrapper: Web3Wrapper, pollingIntervalMs: undefined|number) {
this._web3Wrapper = web3Wrapper;
this._pollingIntervalMs = _.isUndefined(pollingIntervalMs) ?
@@ -20,13 +20,13 @@ export class EventWatcher {
pollingIntervalMs;
}
public subscribe(callback: EventWatcherCallback, numConfirmations: number): void {
this._callbackAsync = callback;
this._callbackIfExistsAsync = callback;
this._intervalId = intervalUtils.setAsyncExcludingInterval(
this._pollForMempoolEventsAsync.bind(this, numConfirmations), this._pollingIntervalMs,
);
}
public unsubscribe(): void {
delete this._callbackAsync;
delete this._callbackIfExistsAsync;
this._lastEvents = [];
intervalUtils.clearAsyncExcludingInterval(this._intervalId);
}
@@ -70,8 +70,8 @@ export class EventWatcher {
removed: isRemoved,
...log,
};
if (!_.isUndefined(this._callbackAsync)) {
await this._callbackAsync(logEvent);
if (!_.isUndefined(this._callbackIfExistsAsync)) {
await this._callbackIfExistsAsync(logEvent);
}
}
}

12
src/order_watcher/order_state_watcher.ts
View File

@@ -36,7 +36,7 @@ export class OrderStateWatcher {
private _orders: OrderByOrderHash;
private _dependentOrderHashes: DependentOrderHashes;
private _web3Wrapper: Web3Wrapper;
private _callbackAsync?: OnOrderStateChangeCallback;
private _callbackIfExistsAsync?: OnOrderStateChangeCallback;
private _eventWatcher: EventWatcher;
private _abiDecoder: AbiDecoder;
private _orderStateUtils: OrderStateUtils;
@@ -89,10 +89,10 @@ export class OrderStateWatcher {
*/
public subscribe(callback: OnOrderStateChangeCallback, numConfirmations: number): void {
assert.isFunction('callback', callback);
if (!_.isUndefined(this._callbackAsync)) {
if (!_.isUndefined(this._callbackIfExistsAsync)) {
throw new Error(ZeroExError.SubscriptionAlreadyPresent);
}
this._callbackAsync = callback;
this._callbackIfExistsAsync = callback;
this._eventWatcher.subscribe(this._onEventWatcherCallbackAsync.bind(this), numConfirmations);
}
/**
@@ -100,7 +100,7 @@ export class OrderStateWatcher {
* @param signedOrder The order you wish to stop watching.
*/
public unsubscribe(): void {
delete this._callbackAsync;
delete this._callbackIfExistsAsync;
this._eventWatcher.unsubscribe();
}
private async _onEventWatcherCallbackAsync(log: LogEvent): Promise<void> {
@@ -158,8 +158,8 @@ export class OrderStateWatcher {
for (const orderHash of orderHashes) {
const signedOrder = this._orders[orderHash] as SignedOrder;
const orderState = await this._orderStateUtils.getOrderStateAsync(signedOrder, methodOpts);
if (!_.isUndefined(this._callbackAsync)) {
await this._callbackAsync(orderState);
if (!_.isUndefined(this._callbackIfExistsAsync)) {
await this._callbackIfExistsAsync(orderState);
} else {
break; // Unsubscribe was called
}