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

Refactor while condition

Browse Source
This commit is contained in:
Leonid Logvinov
2017-11-22 11:44:34 -06:00
parent beed223281
commit 3fc0eae4c0
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/0x.js/src/order_watcher/expiration_watcher.ts
View File

@@ -54,13 +54,19 @@ export class ExpirationWatcher {
} }
private async pruneExpiredOrdersAsync(callbackAsync: (orderHash: string) => Promise<void>): Promise<void> { private async pruneExpiredOrdersAsync(callbackAsync: (orderHash: string) => Promise<void>): Promise<void> {
const currentUnixTimestampMs = utils.getCurrentUnixTimestampMs(); const currentUnixTimestampMs = utils.getCurrentUnixTimestampMs();
while ( while (true) {
this.orderHashByExpirationRBTree.size !== 0 && const noOrdersLeft = this.orderHashByExpirationRBTree.size === 0;
this.expiration[this.orderHashByExpirationRBTree.min()].lessThan( if (noOrdersLeft) {
break;
}
const nextOrderHashToExpire = this.orderHashByExpirationRBTree.min();
const noExpiredOrdersLeft = this.expiration[nextOrderHashToExpire].greaterThan(
currentUnixTimestampMs.plus(this.expirationMarginMs), currentUnixTimestampMs.plus(this.expirationMarginMs),
) && );
!_.isUndefined(this.orderExpirationCheckingIntervalIdIfExists) const noActiveSubscription = _.isUndefined(this.orderExpirationCheckingIntervalIdIfExists);
) { if (noExpiredOrdersLeft || noActiveSubscription) {
break;
}
const orderHash = this.orderHashByExpirationRBTree.min(); const orderHash = this.orderHashByExpirationRBTree.min();
this.orderHashByExpirationRBTree.remove(orderHash); this.orderHashByExpirationRBTree.remove(orderHash);
delete this.expiration[orderHash]; delete this.expiration[orderHash];