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

Make an RPC constructor param implicit

Browse Source
This commit is contained in:
Leonid Logvinov
2018-01-30 14:03:54 +01:00
parent 6ebf8a57d1
commit 6205209fbb
23 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/0x.js/test/0x.js_test.ts
View File

@@ -11,7 +11,7 @@ import { chaiSetup } from './utils/chai_setup';
import { constants } from './utils/constants';
import { TokenUtils } from './utils/token_utils';
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
chaiSetup.configure();
const expect = chai.expect;

2
packages/0x.js/test/ether_token_wrapper_test.ts
View File

@@ -27,7 +27,7 @@ import { TokenUtils } from './utils/token_utils';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
// Since the address depositing/withdrawing ETH/WETH also needs to pay gas costs for the transaction,
// a small amount of ETH will be used to pay this gas cost. We therefore check that the difference between

2
packages/0x.js/test/exchange_transfer_simulator_test.ts
View File

@@ -11,7 +11,7 @@ import { constants } from './utils/constants';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('ExchangeTransferSimulator', () => {
const web3 = web3Factory.create();

2
packages/0x.js/test/exchange_wrapper_test.ts
View File

@@ -28,7 +28,7 @@ import { TokenUtils } from './utils/token_utils';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
const NON_EXISTENT_ORDER_HASH = '0x79370342234e7acd6bbeac335bd3bb1d368383294b64b8160a00f4060e4d3777';

2
packages/0x.js/test/expiration_watcher_test.ts
View File

@@ -19,7 +19,7 @@ import { TokenUtils } from './utils/token_utils';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('ExpirationWatcher', () => {
let web3: Web3;

2
packages/0x.js/test/order_state_watcher_test.ts
View File

@@ -27,7 +27,7 @@ const TIMEOUT_MS = 150;
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('OrderStateWatcher', () => {
let web3: Web3;

2
packages/0x.js/test/order_validation_test.ts
View File

@@ -16,7 +16,7 @@ import { TokenUtils } from './utils/token_utils';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('OrderValidation', () => {
let web3: Web3;

2
packages/0x.js/test/subscription_test.ts
View File

@@ -13,7 +13,7 @@ import { constants } from './utils/constants';
import { assertNodeCallbackError } from './utils/report_callback_errors';
chaiSetup.configure();
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('SubscriptionTest', () => {
let web3: Web3;

2
packages/0x.js/test/token_registry_wrapper_test.ts
View File

@@ -11,7 +11,7 @@ import { constants } from './utils/constants';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
const TOKEN_REGISTRY_SIZE_AFTER_MIGRATION = 7;

2
packages/0x.js/test/token_wrapper_test.ts
View File

@@ -25,7 +25,7 @@ import { TokenUtils } from './utils/token_utils';
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('TokenWrapper', () => {
let web3: Web3;

2
packages/contracts/test/ether_token.ts
View File

@@ -14,7 +14,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('EtherToken', () => {
let account: string;

2
packages/contracts/test/exchange/core.ts
View File

@@ -27,7 +27,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('Exchange', () => {
let maker: string;

2
packages/contracts/test/exchange/helpers.ts
View File

@@ -18,7 +18,7 @@ const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('Exchange', () => {
let maker: string;

2
packages/contracts/test/exchange/wrapper.ts
View File

@@ -19,7 +19,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('Exchange', () => {
let maker: string;

6
packages/contracts/test/multi_sig_with_time_lock.ts
View File

@@ -1,5 +1,5 @@
import { LogWithDecodedArgs, ZeroEx } from '0x.js';
import { BlockchainLifecycle, devConstants, RPC, web3Factory } from '@0xproject/dev-utils';
import { BlockchainLifecycle, RPC, web3Factory } from '@0xproject/dev-utils';
import { AbiDecoder, BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
@@ -20,7 +20,7 @@ const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
const abiDecoder = new AbiDecoder([MULTI_SIG_ABI]);
@@ -40,7 +40,7 @@ describe('MultiSigWalletWithTimeLock', () => {
let rpc: RPC;
before(async () => {
rpc = new RPC(devConstants.RPC_URL);
rpc = new RPC();
});
beforeEach(async () => {
await blockchainLifecycle.startAsync();

2
packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
View File

@@ -22,7 +22,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
const abiDecoder = new AbiDecoder([MUTISIG_WALLET_WITH_TIME_LOCK_EXCEPT_REMOVE_AUTHORIZED_ADDRESS_ABI]);
describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {

2
packages/contracts/test/token_registry.ts
View File

@@ -17,7 +17,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('TokenRegistry', () => {
let owner: string;

2
packages/contracts/test/token_transfer_proxy/auth.ts
View File

@@ -12,7 +12,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('TokenTransferProxy', () => {
let owner: string;

2
packages/contracts/test/token_transfer_proxy/transfer_from.ts
View File

@@ -13,7 +13,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('TokenTransferProxy', () => {
let accounts: string[];

2
packages/contracts/test/unlimited_allowance_token.ts
View File

@@ -15,7 +15,7 @@ const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('UnlimitedAllowanceToken', () => {
let owner: string;

2
packages/contracts/test/unlimited_allowance_token_v2.ts
View File

@@ -15,7 +15,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('UnlimitedAllowanceTokenV2', () => {
const config = {

2
packages/contracts/test/zrx_token.ts
View File

@@ -15,7 +15,7 @@ chaiSetup.configure();
const expect = chai.expect;
const web3 = web3Factory.create();
const web3Wrapper = new Web3Wrapper(web3.currentProvider);
const blockchainLifecycle = new BlockchainLifecycle(devConstants.RPC_URL);
const blockchainLifecycle = new BlockchainLifecycle();
describe('ZRXToken', () => {
let owner: string;

5
packages/dev-utils/src/blockchain_lifecycle.ts
View File

@@ -1,10 +1,11 @@
import { constants } from './constants';
import { RPC } from './rpc';
export class BlockchainLifecycle {
private _rpc: RPC;
private _snapshotIdsStack: number[];
constructor(url: string) {
this._rpc = new RPC(url);
constructor() {
this._rpc = new RPC(constants.RPC_URL);
this._snapshotIdsStack = [];
}
// TODO: In order to run these tests on an actual node, we should check if we are running against