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

Rename MempoolEventCallback to EventWatcherCallback

Browse Source
This commit is contained in:
Fabio Berger
2017-11-09 16:43:19 -05:00
parent 530f5a700e
commit 6f5a55b5fe
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/index.ts
View File

@@ -36,7 +36,7 @@ export {
FilterObject,
LogEvent,
DecodedLogEvent,
MempoolEventCallback,
EventWatcherCallback,
OnOrderStateChangeCallback,
OrderStateValid,
OrderStateInvalid,

6
src/order_watcher/event_watcher.ts
View File

@@ -1,7 +1,7 @@
import * as Web3 from 'web3';
import * as _ from 'lodash';
import {Web3Wrapper} from '../web3_wrapper';
import {BlockParamLiteral, EventCallback, MempoolEventCallback} from '../types';
import {BlockParamLiteral, EventCallback, EventWatcherCallback} from '../types';
import {AbiDecoder} from '../utils/abi_decoder';
import {intervalUtils} from '../utils/interval_utils';
@@ -12,14 +12,14 @@ export class EventWatcher {
private _pollingIntervalMs: number;
private _intervalId: NodeJS.Timer;
private _lastEvents: Web3.LogEntry[] = [];
private _callbackAsync?: MempoolEventCallback;
private _callbackAsync?: EventWatcherCallback;
constructor(web3Wrapper: Web3Wrapper, pollingIntervalMs: undefined|number) {
this._web3Wrapper = web3Wrapper;
this._pollingIntervalMs = _.isUndefined(pollingIntervalMs) ?
DEFAULT_EVENT_POLLING_INTERVAL :
pollingIntervalMs;
}
public subscribe(callback: MempoolEventCallback, numConfirmations: number): void {
public subscribe(callback: EventWatcherCallback, numConfirmations: number): void {
this._callbackAsync = callback;
this._intervalId = intervalUtils.setAsyncExcludingInterval(
this._pollForMempoolEventsAsync.bind(this, numConfirmations), this._pollingIntervalMs,

4
src/order_watcher/order_state_watcher.ts
View File

@@ -90,7 +90,7 @@ export class OrderStateWatcher {
throw new Error(ZeroExError.SubscriptionAlreadyPresent);
}
this._callbackAsync = callback;
this._eventWatcher.subscribe(this._onMempoolEventCallbackAsync.bind(this), numConfirmations);
this._eventWatcher.subscribe(this._onEventWatcherCallbackAsync.bind(this), numConfirmations);
}
/**
* Ends an orderStateWatcher subscription.
@@ -100,7 +100,7 @@ export class OrderStateWatcher {
delete this._callbackAsync;
this._eventWatcher.unsubscribe();
}
private async _onMempoolEventCallbackAsync(log: LogEvent): Promise<void> {
private async _onEventWatcherCallbackAsync(log: LogEvent): Promise<void> {
const maybeDecodedLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
const isDecodedLog = !_.isUndefined((maybeDecodedLog as LogWithDecodedArgs<any>).event);
if (!isDecodedLog) {

6
src/types.ts
View File

@@ -45,9 +45,9 @@ export type EventCallbackAsync<ArgsType> = (log: DecodedLogEvent<ArgsType>) => P
export type EventCallbackSync<ArgsType> = (log: DecodedLogEvent<ArgsType>) => void;
export type EventCallback<ArgsType> = EventCallbackSync<ArgsType>|EventCallbackAsync<ArgsType>;
export type MempoolEventCallbackSync = (log: LogEvent) => void;
export type MempoolEventCallbackAsync = (log: LogEvent) => Promise<void>;
export type MempoolEventCallback = MempoolEventCallbackSync|MempoolEventCallbackAsync;
export type EventWatcherCallbackSync = (log: LogEvent) => void;
export type EventWatcherCallbackAsync = (log: LogEvent) => Promise<void>;
export type EventWatcherCallback = EventWatcherCallbackSync|EventWatcherCallbackAsync;
export interface ExchangeContract extends Web3.ContractInstance {
isValidSignature: {