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

rename folder to order_watcher

Browse Source
This commit is contained in:
Fabio Berger
2017-11-09 16:41:57 -05:00
parent 6aa91d89e0
commit 441c1f9ab7
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/0x.ts
View File

@@ -17,7 +17,7 @@ import {TokenRegistryWrapper} from './contract_wrappers/token_registry_wrapper';
import {EtherTokenWrapper} from './contract_wrappers/ether_token_wrapper';
import {TokenWrapper} from './contract_wrappers/token_wrapper';
import {TokenTransferProxyWrapper} from './contract_wrappers/token_transfer_proxy_wrapper';
import {OrderStateWatcher} from './mempool/order_state_watcher';
import {OrderStateWatcher} from './order_watcher/order_state_watcher';
import {OrderStateUtils} from './utils/order_state_utils';
import {
ECSignature,

14
src/mempool/event_watcher.ts → src/order_watcher/event_watcher.ts
View File

@@ -5,18 +5,18 @@ import {BlockParamLiteral, EventCallback, MempoolEventCallback} from '../types';
import {AbiDecoder} from '../utils/abi_decoder';
import {intervalUtils} from '../utils/interval_utils';
const DEFAULT_MEMPOOL_POLLING_INTERVAL = 200;
const DEFAULT_EVENT_POLLING_INTERVAL = 200;
export class EventWatcher {
private _web3Wrapper: Web3Wrapper;
private _pollingIntervalMs: number;
private _intervalId: NodeJS.Timer;
private _lastMempoolEvents: Web3.LogEntry[] = [];
private _lastEvents: Web3.LogEntry[] = [];
private _callbackAsync?: MempoolEventCallback;
constructor(web3Wrapper: Web3Wrapper, pollingIntervalMs: undefined|number) {
this._web3Wrapper = web3Wrapper;
this._pollingIntervalMs = _.isUndefined(pollingIntervalMs) ?
DEFAULT_MEMPOOL_POLLING_INTERVAL :
DEFAULT_EVENT_POLLING_INTERVAL :
pollingIntervalMs;
}
public subscribe(callback: MempoolEventCallback, numConfirmations: number): void {
@@ -27,7 +27,7 @@ export class EventWatcher {
}
public unsubscribe(): void {
delete this._callbackAsync;
this._lastMempoolEvents = [];
this._lastEvents = [];
intervalUtils.clearAsyncExcludingInterval(this._intervalId);
}
private async _pollForMempoolEventsAsync(numConfirmations: number): Promise<void> {
@@ -38,13 +38,13 @@ export class EventWatcher {
// that's why we just ignore those cases.
return;
}
const removedEvents = _.differenceBy(this._lastMempoolEvents, pendingEvents, JSON.stringify);
const newEvents = _.differenceBy(pendingEvents, this._lastMempoolEvents, JSON.stringify);
const removedEvents = _.differenceBy(this._lastEvents, pendingEvents, JSON.stringify);
const newEvents = _.differenceBy(pendingEvents, this._lastEvents, JSON.stringify);
let isRemoved = true;
await this._emitDifferencesAsync(removedEvents, isRemoved);
isRemoved = false;
await this._emitDifferencesAsync(newEvents, isRemoved);
this._lastMempoolEvents = pendingEvents;
this._lastEvents = pendingEvents;
}
private async _getMempoolEventsAsync(numConfirmations: number): Promise<Web3.LogEntry[]> {
let fromBlock: BlockParamLiteral|number;

4
src/mempool/order_state_watcher.ts → src/order_watcher/order_state_watcher.ts
View File

@@ -41,12 +41,12 @@ export class OrderStateWatcher {
private _orderStateUtils: OrderStateUtils;
constructor(
web3Wrapper: Web3Wrapper, abiDecoder: AbiDecoder, orderStateUtils: OrderStateUtils,
mempoolPollingIntervalMs?: number) {
eventPollingIntervalMs?: number) {
this._web3Wrapper = web3Wrapper;
this._orders = {};
this._dependentOrderHashes = {};
this._eventWatcher = new EventWatcher(
this._web3Wrapper, mempoolPollingIntervalMs,
this._web3Wrapper, eventPollingIntervalMs,
);
this._abiDecoder = abiDecoder;
this._orderStateUtils = orderStateUtils;