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

Change all packages to use web3providerengine without excess polling

Browse Source
This commit is contained in:
Jacob Evans 2019-03-18 13:48:12 +01:00
parent 6a28e41bc8
commit 180c65cfeb
No known key found for this signature in database
GPG Key ID: 2036DA2ADDFB0842
13 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contract-wrappers/test/erc20_wrapper_test.ts
View File

@ -2,7 +2,7 @@ import { ContractAddresses } from '@0x/contract-addresses';
import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils';
import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0x/subproviders'; import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0x/subproviders';
import { DoneCallback } from '@0x/types'; import { DoneCallback } from '@0x/types';
import { BigNumber } from '@0x/utils'; import { BigNumber, providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import 'mocha'; import 'mocha';
@ -628,6 +628,6 @@ function addEmptyWalletSubprovider(p: Web3ProviderEngine): Web3ProviderEngine {
for (const subprovider of currentSubproviders) { for (const subprovider of currentSubproviders) {
providerEngine.addProvider(subprovider); providerEngine.addProvider(subprovider);
} }
providerEngine.start(); providerUtils.startProviderEngine(providerEngine);
return providerEngine; return providerEngine;
} }

4
packages/contract-wrappers/test/erc721_wrapper_test.ts
View File

@ -1,7 +1,7 @@
import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils';
import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0x/subproviders'; import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0x/subproviders';
import { DoneCallback } from '@0x/types'; import { DoneCallback } from '@0x/types';
import { BigNumber } from '@0x/utils'; import { BigNumber, providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import 'mocha'; import 'mocha';
@ -460,6 +460,6 @@ function addEmptyWalletSubprovider(p: Web3ProviderEngine): Web3ProviderEngine {
for (const subprovider of currentSubproviders) { for (const subprovider of currentSubproviders) {
providerEngine.addProvider(subprovider); providerEngine.addProvider(subprovider);
} }
providerEngine.start(); providerUtils.startProviderEngine(providerEngine);
return providerEngine; return providerEngine;
} }

3
packages/dev-utils/src/web3_factory.ts
View File

@ -5,6 +5,7 @@ import {
RPCSubprovider, RPCSubprovider,
Web3ProviderEngine, Web3ProviderEngine,
} from '@0x/subproviders'; } from '@0x/subproviders';
import { providerUtils } from '@0x/utils';
import * as fs from 'fs'; import * as fs from 'fs';
import * as _ from 'lodash'; import * as _ from 'lodash';
@ -68,7 +69,7 @@ export const web3Factory = {
} else { } else {
provider.addProvider(new RPCSubprovider(config.rpcUrl || constants.RPC_URL)); provider.addProvider(new RPCSubprovider(config.rpcUrl || constants.RPC_URL));
} }
provider.start(); providerUtils.startProviderEngine(provider);
return provider; return provider;
}, },
}; };

1
packages/metacoin/test/metacoin_test.ts
View File

@ -41,7 +41,6 @@ describe('Metacoin', () => {
const amount = INITIAL_BALANCE.div(2); const amount = INITIAL_BALANCE.div(2);
const oldBalance = await metacoin.balances.callAsync(ZERO_ADDRESS); const oldBalance = await metacoin.balances.callAsync(ZERO_ADDRESS);
expect(oldBalance).to.be.bignumber.equal(0); expect(oldBalance).to.be.bignumber.equal(0);
// profiler.start();
const txHash = await metacoin.transfer1.sendTransactionAsync( const txHash = await metacoin.transfer1.sendTransactionAsync(
{ {
to: ZERO_ADDRESS, to: ZERO_ADDRESS,

4
packages/migrations/src/cli.ts
View File

@ -1,6 +1,6 @@
#!/usr/bin/env node #!/usr/bin/env node
import { RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders'; import { RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
import { logUtils } from '@0x/utils'; import { logUtils, providerUtils } from '@0x/utils';
import * as yargs from 'yargs'; import * as yargs from 'yargs';
import { runMigrationsAsync } from './migration'; import { runMigrationsAsync } from './migration';
@ -26,7 +26,7 @@ const args = yargs
const rpcSubprovider = new RPCSubprovider(args['rpc-url']); const rpcSubprovider = new RPCSubprovider(args['rpc-url']);
const provider = new Web3ProviderEngine(); const provider = new Web3ProviderEngine();
provider.addProvider(rpcSubprovider); provider.addProvider(rpcSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
const normalizedFromAddress = (args.from as string).toLowerCase(); const normalizedFromAddress = (args.from as string).toLowerCase();
const txDefaults = { const txDefaults = {
from: normalizedFromAddress, from: normalizedFromAddress,

5
packages/migrations/src/utils/provider_factory.ts
View File

@ -1,4 +1,5 @@
import { LedgerEthereumClient, LedgerSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders'; import { LedgerEthereumClient, LedgerSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
import { providerUtils } from '@0x/utils';
import Eth from '@ledgerhq/hw-app-eth'; import Eth from '@ledgerhq/hw-app-eth';
// tslint:disable:no-implicit-dependencies // tslint:disable:no-implicit-dependencies
import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'; import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
@ -21,7 +22,7 @@ export const providerFactory = {
const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs); const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs);
provider.addProvider(ledgerSubprovider); provider.addProvider(ledgerSubprovider);
provider.addProvider(new RPCSubprovider(constants.KOVAN_RPC_URL)); provider.addProvider(new RPCSubprovider(constants.KOVAN_RPC_URL));
provider.start(); providerUtils.startProviderEngine(provider);
return provider; return provider;
}, },
async getMainnetLedgerProviderAsync(): Promise<Provider> { async getMainnetLedgerProviderAsync(): Promise<Provider> {
@ -33,7 +34,7 @@ export const providerFactory = {
const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs); const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs);
provider.addProvider(ledgerSubprovider); provider.addProvider(ledgerSubprovider);
provider.addProvider(new RPCSubprovider(constants.MAINNET_RPC_URL)); provider.addProvider(new RPCSubprovider(constants.MAINNET_RPC_URL));
provider.start(); providerUtils.startProviderEngine(provider);
return provider; return provider;
}, },
}; };

6
packages/subproviders/test/integration/ledger_subprovider_test.ts
View File

@ -1,5 +1,5 @@
import { DoneCallback } from '@0x/types'; import { DoneCallback } from '@0x/types';
import { promisify } from '@0x/utils'; import { promisify, providerUtils } from '@0x/utils';
import Eth from '@ledgerhq/hw-app-eth'; import Eth from '@ledgerhq/hw-app-eth';
// HACK: This dependency is optional and tslint skips optional dependencies // HACK: This dependency is optional and tslint skips optional dependencies
// tslint:disable-next-line:no-implicit-dependencies // tslint:disable-next-line:no-implicit-dependencies
@ -86,11 +86,11 @@ describe('LedgerSubprovider', () => {
ledgerProvider.addProvider(ledgerSubprovider); ledgerProvider.addProvider(ledgerSubprovider);
const httpProvider = new RPCSubprovider('http://localhost:8545'); const httpProvider = new RPCSubprovider('http://localhost:8545');
ledgerProvider.addProvider(httpProvider); ledgerProvider.addProvider(httpProvider);
ledgerProvider.start(); providerUtils.startProviderEngine(ledgerProvider);
defaultProvider = new Web3ProviderEngine(); defaultProvider = new Web3ProviderEngine();
defaultProvider.addProvider(httpProvider); defaultProvider.addProvider(httpProvider);
defaultProvider.start(); providerUtils.startProviderEngine(defaultProvider);
}); });
it('returns a list of accounts', (done: DoneCallback) => { it('returns a list of accounts', (done: DoneCallback) => {
const payload = { const payload = {

3
packages/subproviders/test/unit/eth_lightwallet_subprovider_test.ts
View File

@ -1,3 +1,4 @@
import { providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import * as lightwallet from 'eth-lightwallet'; import * as lightwallet from 'eth-lightwallet';
import { JSONRPCResponsePayload } from 'ethereum-types'; import { JSONRPCResponsePayload } from 'ethereum-types';
@ -88,7 +89,7 @@ describe('EthLightwalletSubprovider', () => {
provider = new Web3ProviderEngine(); provider = new Web3ProviderEngine();
provider.addProvider(ethLightwalletSubprovider); provider.addProvider(ethLightwalletSubprovider);
provider.addProvider(ganacheSubprovider); provider.addProvider(ganacheSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
}); });
describe('success cases', () => { describe('success cases', () => {
it('returns a list of accounts', (done: DoneCallback) => { it('returns a list of accounts', (done: DoneCallback) => {

3
packages/subproviders/test/unit/ledger_subprovider_test.ts
View File

@ -1,3 +1,4 @@
import { providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import { JSONRPCResponsePayload } from 'ethereum-types'; import { JSONRPCResponsePayload } from 'ethereum-types';
import * as ethUtils from 'ethereumjs-util'; import * as ethUtils from 'ethereumjs-util';
@ -105,7 +106,7 @@ describe('LedgerSubprovider', () => {
provider = new Web3ProviderEngine(); provider = new Web3ProviderEngine();
provider.addProvider(ledgerSubprovider); provider.addProvider(ledgerSubprovider);
provider.addProvider(ganacheSubprovider); provider.addProvider(ganacheSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
}); });
describe('success cases', () => { describe('success cases', () => {
it('returns a list of accounts', (done: DoneCallback) => { it('returns a list of accounts', (done: DoneCallback) => {

3
packages/subproviders/test/unit/mnemonic_wallet_subprovider_test.ts
View File

@ -1,3 +1,4 @@
import { providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import { JSONRPCResponsePayload } from 'ethereum-types'; import { JSONRPCResponsePayload } from 'ethereum-types';
import * as ethUtils from 'ethereumjs-util'; import * as ethUtils from 'ethereumjs-util';
@ -77,7 +78,7 @@ describe('MnemonicWalletSubprovider', () => {
provider.addProvider(subprovider); provider.addProvider(subprovider);
const ganacheSubprovider = new GanacheSubprovider({}); const ganacheSubprovider = new GanacheSubprovider({});
provider.addProvider(ganacheSubprovider); provider.addProvider(ganacheSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
}); });
describe('success cases', () => { describe('success cases', () => {
it('returns a list of accounts', (done: DoneCallback) => { it('returns a list of accounts', (done: DoneCallback) => {

10
packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
View File

@ -1,7 +1,7 @@
import * as chai from 'chai'; import * as chai from 'chai';
import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture'); import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture');
import { promisify } from '@0x/utils'; import { promisify, providerUtils } from '@0x/utils';
import EthereumTx = require('ethereumjs-tx'); import EthereumTx = require('ethereumjs-tx');
import { NonceTrackerSubprovider, Web3ProviderEngine } from '../../src'; import { NonceTrackerSubprovider, Web3ProviderEngine } from '../../src';
@ -56,7 +56,7 @@ describe('NonceTrackerSubprovider', () => {
const nonceTrackerSubprovider = new NonceTrackerSubprovider(); const nonceTrackerSubprovider = new NonceTrackerSubprovider();
provider.addProvider(nonceTrackerSubprovider); provider.addProvider(nonceTrackerSubprovider);
provider.addProvider(createFixtureSubprovider()); provider.addProvider(createFixtureSubprovider());
provider.start(); providerUtils.startProviderEngine(provider);
const payload = { ...getTransactionCountPayload, params: ['0x0', 'pending'] }; const payload = { ...getTransactionCountPayload, params: ['0x0', 'pending'] };
@ -70,7 +70,7 @@ describe('NonceTrackerSubprovider', () => {
const nonceTrackerSubprovider = new NonceTrackerSubprovider(); const nonceTrackerSubprovider = new NonceTrackerSubprovider();
provider.addProvider(nonceTrackerSubprovider); provider.addProvider(nonceTrackerSubprovider);
provider.addProvider(createFixtureSubprovider()); provider.addProvider(createFixtureSubprovider());
provider.start(); providerUtils.startProviderEngine(provider);
const payload = { ...getTransactionCountPayload, params: ['0x0', 'latest'] }; const payload = { ...getTransactionCountPayload, params: ['0x0', 'latest'] };
@ -91,7 +91,7 @@ describe('NonceTrackerSubprovider', () => {
}, },
}), }),
); );
provider.start(); providerUtils.startProviderEngine(provider);
const noncePayload = { const noncePayload = {
...getTransactionCountPayload, ...getTransactionCountPayload,
@ -126,7 +126,7 @@ describe('NonceTrackerSubprovider', () => {
}, },
}), }),
); );
provider.start(); providerUtils.startProviderEngine(provider);
const noncePayload = { const noncePayload = {
...getTransactionCountPayload, ...getTransactionCountPayload,

3
packages/subproviders/test/unit/private_key_wallet_subprovider_test.ts
View File

@ -1,3 +1,4 @@
import { providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import { JSONRPCResponsePayload } from 'ethereum-types'; import { JSONRPCResponsePayload } from 'ethereum-types';
import * as ethUtils from 'ethereumjs-util'; import * as ethUtils from 'ethereumjs-util';
@ -48,7 +49,7 @@ describe('PrivateKeyWalletSubprovider', () => {
provider.addProvider(subprovider); provider.addProvider(subprovider);
const ganacheSubprovider = new GanacheSubprovider({}); const ganacheSubprovider = new GanacheSubprovider({});
provider.addProvider(ganacheSubprovider); provider.addProvider(ganacheSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
}); });
describe('success cases', () => { describe('success cases', () => {
it('returns a list of accounts', (done: DoneCallback) => { it('returns a list of accounts', (done: DoneCallback) => {

5
packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
View File

@ -1,4 +1,5 @@
import { DoneCallback } from '@0x/types'; import { DoneCallback } from '@0x/types';
import { providerUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import { JSONRPCResponsePayload } from 'ethereum-types'; import { JSONRPCResponsePayload } from 'ethereum-types';
import * as Sinon from 'sinon'; import * as Sinon from 'sinon';
@ -20,7 +21,7 @@ describe('RedundantSubprovider', () => {
const subproviders = [ganacheSubprovider]; const subproviders = [ganacheSubprovider];
const redundantSubprovider = new RedundantSubprovider(subproviders); const redundantSubprovider = new RedundantSubprovider(subproviders);
provider.addProvider(redundantSubprovider); provider.addProvider(redundantSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
const payload = { const payload = {
jsonrpc: '2.0', jsonrpc: '2.0',
@ -44,7 +45,7 @@ describe('RedundantSubprovider', () => {
const subproviders = [nonExistentSubprovider as Subprovider, ganacheSubprovider]; const subproviders = [nonExistentSubprovider as Subprovider, ganacheSubprovider];
const redundantSubprovider = new RedundantSubprovider(subproviders); const redundantSubprovider = new RedundantSubprovider(subproviders);
provider.addProvider(redundantSubprovider); provider.addProvider(redundantSubprovider);
provider.start(); providerUtils.startProviderEngine(provider);
const payload = { const payload = {
jsonrpc: '2.0', jsonrpc: '2.0',