Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors

This commit is contained in:
Brandon Millman
2017-12-20 00:44:08 -05:00
committed by Leonid Logvinov
parent 972e1675f6
commit cb11aec84d
93 changed files with 1418 additions and 1345 deletions

View File

@@ -1,21 +1,21 @@
import {RPC} from './rpc';
export class BlockchainLifecycle {
private rpc: RPC;
private snapshotIdsStack: number[];
private _rpc: RPC;
private _snapshotIdsStack: number[];
constructor(url: string) {
this.rpc = new RPC(url);
this.snapshotIdsStack = [];
this._rpc = new RPC(url);
this._snapshotIdsStack = [];
}
// TODO: In order to run these tests on an actual node, we should check if we are running against
// TestRPC, if so, use snapshots, otherwise re-deploy contracts before every test
public async startAsync(): Promise<void> {
const snapshotId = await this.rpc.takeSnapshotAsync();
this.snapshotIdsStack.push(snapshotId);
const snapshotId = await this._rpc.takeSnapshotAsync();
this._snapshotIdsStack.push(snapshotId);
}
public async revertAsync(): Promise<void> {
const snapshotId = this.snapshotIdsStack.pop() as number;
const didRevert = await this.rpc.revertSnapshotAsync(snapshotId);
const snapshotId = this._snapshotIdsStack.pop() as number;
const didRevert = await this._rpc.revertSnapshotAsync(snapshotId);
if (!didRevert) {
throw new Error(`Snapshot with id #${snapshotId} failed to revert`);
}

View File

@@ -2,52 +2,52 @@ import * as ethUtil from 'ethereumjs-util';
import * as request from 'request-promise-native';
export class RPC {
private url: string;
private id: number;
private _url: string;
private _id: number;
constructor(url: string) {
this.url = url;
this.id = 0;
this._url = url;
this._id = 0;
}
public async takeSnapshotAsync(): Promise<number> {
const method = 'evm_snapshot';
const params: any[] = [];
const payload = this.toPayload(method, params);
const snapshotIdHex = await this.sendAsync(payload);
const payload = this._toPayload(method, params);
const snapshotIdHex = await this._sendAsync(payload);
const snapshotId = ethUtil.bufferToInt(ethUtil.toBuffer(snapshotIdHex));
return snapshotId;
}
public async revertSnapshotAsync(snapshotId: number): Promise<boolean> {
const method = 'evm_revert';
const params = [snapshotId];
const payload = this.toPayload(method, params);
const didRevert = await this.sendAsync(payload);
const payload = this._toPayload(method, params);
const didRevert = await this._sendAsync(payload);
return didRevert;
}
public async increaseTimeAsync(time: number) {
const method = 'evm_increaseTime';
const params = [time];
const payload = this.toPayload(method, params);
return this.sendAsync(payload);
const payload = this._toPayload(method, params);
return this._sendAsync(payload);
}
public async mineBlockAsync(): Promise<void> {
const method = 'evm_mine';
const params: any[] = [];
const payload = this.toPayload(method, params);
await this.sendAsync(payload);
const payload = this._toPayload(method, params);
await this._sendAsync(payload);
}
private toPayload(method: string, params: any[] = []): string {
private _toPayload(method: string, params: any[] = []): string {
const payload = JSON.stringify({
id: this.id,
id: this._id,
method,
params,
});
this.id += 1;
this._url += 1;
return payload;
}
private async sendAsync(payload: string): Promise<any> {
private async _sendAsync(payload: string): Promise<any> {
const opts = {
method: 'POST',
uri: this.url,
uri: this._url,
body: payload,
headers: {
'content-type': 'application/json',