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

Fix redundant expired order removal bug

Browse Source
This commit is contained in:
Ara Kevonian
2018-04-17 07:25:13 -07:00
parent bf4873e519
commit cbca2061f7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/0x.js/src/order_watcher/order_state_watcher.ts
View File

@@ -123,7 +123,7 @@ export class OrderStateWatcher {
* Removes an order from the orderStateWatcher * Removes an order from the orderStateWatcher
* @param orderHash The orderHash of the order you wish to stop watching. * @param orderHash The orderHash of the order you wish to stop watching.
*/ */
public removeOrder(orderHash: string): void { public removeOrder(orderHash: string, removeFromExpirationWatcher: boolean = true): void {
assert.doesConformToSchema('orderHash', orderHash, schemas.orderHashSchema); assert.doesConformToSchema('orderHash', orderHash, schemas.orderHashSchema);
const signedOrder = this._orderByOrderHash[orderHash]; const signedOrder = this._orderByOrderHash[orderHash];
if (_.isUndefined(signedOrder)) { if (_.isUndefined(signedOrder)) {
@@ -139,7 +139,9 @@ export class OrderStateWatcher {
this._removeFromDependentOrderHashes(signedOrder.maker, signedOrder.makerTokenAddress, orderHash); this._removeFromDependentOrderHashes(signedOrder.maker, signedOrder.makerTokenAddress, orderHash);
} }
this._expirationWatcher.removeOrder(orderHash); if (removeFromExpirationWatcher) {
this._expirationWatcher.removeOrder(orderHash);
}
} }
/** /**
* Starts an orderStateWatcher subscription. The callback will be called every time a watched order's * Starts an orderStateWatcher subscription. The callback will be called every time a watched order's
@@ -212,7 +214,7 @@ export class OrderStateWatcher {
error: ExchangeContractErrs.OrderFillExpired, error: ExchangeContractErrs.OrderFillExpired,
}; };
if (!_.isUndefined(this._orderByOrderHash[orderHash])) { if (!_.isUndefined(this._orderByOrderHash[orderHash])) {
this.removeOrder(orderHash); this.removeOrder(orderHash, false);
if (!_.isUndefined(this._callbackIfExists)) { if (!_.isUndefined(this._callbackIfExists)) {
this._callbackIfExists(null, orderState); this._callbackIfExists(null, orderState);
} }