aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/src
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2018-02-05 18:24:36 +0800
committerGitHub <noreply@github.com>2018-02-05 18:24:36 +0800
commit03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778 (patch)
treef5f41d05c24c289ff63b18de1dfd1f59daac7c5f /packages/0x.js/src
parent45ac9603083c38dbab6fb6eff26c744eea2b4429 (diff)
parentf6d963d45ac1e07e3cd56cdd47f7f1576dd7ac96 (diff)
downloaddexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.gz
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.bz2
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.lz
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.xz
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.zst
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.zip
Merge pull request #359 from 0xProject/feature/ts-2.7
TS 2.7
Diffstat (limited to 'packages/0x.js/src')
-rw-r--r--packages/0x.js/src/contract_wrappers/contract_wrapper.ts8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
index 873489dc9..2d5818618 100644
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -34,8 +34,8 @@ export class ContractWrapper {
protected _web3Wrapper: Web3Wrapper;
private _networkId: number;
private _abiDecoder?: AbiDecoder;
- private _blockAndLogStreamerIfExists: BlockAndLogStreamer | undefined;
- private _blockAndLogStreamInterval: NodeJS.Timer;
+ private _blockAndLogStreamerIfExists?: BlockAndLogStreamer;
+ private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
private _filters: { [filterToken: string]: Web3.FilterObject };
private _filterCallbacks: {
[filterToken: string]: EventCallback<ContractEventArgs>;
@@ -162,7 +162,7 @@ export class ContractWrapper {
);
const catchAllLogFilter = {};
this._blockAndLogStreamerIfExists.addLogFilter(catchAllLogFilter);
- this._blockAndLogStreamInterval = intervalUtils.setAsyncExcludingInterval(
+ this._blockAndLogStreamIntervalIfExists = intervalUtils.setAsyncExcludingInterval(
this._reconcileBlockAsync.bind(this),
constants.DEFAULT_BLOCK_POLLING_INTERVAL,
this._onReconcileBlockError.bind(this),
@@ -191,7 +191,7 @@ export class ContractWrapper {
}
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogAdded(this._onLogAddedSubscriptionToken as string);
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogRemoved(this._onLogRemovedSubscriptionToken as string);
- intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamInterval);
+ intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamIntervalIfExists as NodeJS.Timer);
delete this._blockAndLogStreamerIfExists;
}
private async _reconcileBlockAsync(): Promise<void> {