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

Use _.get for optional configs

Browse Source
This commit is contained in:
Fabio Berger
2017-11-09 16:30:14 -05:00
parent ce11a38d70
commit ecc54b07c7
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/0x.ts
View File

@@ -1,5 +1,6 @@
import * as _ from 'lodash'; import * as _ from 'lodash';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import * as Web3 from 'web3';
import {SchemaValidator, schemas} from '0x-json-schemas'; import {SchemaValidator, schemas} from '0x-json-schemas';
import {bigNumberConfigs} from './bignumber_config'; import {bigNumberConfigs} from './bignumber_config';
import * as ethUtil from 'ethereumjs-util'; import * as ethUtil from 'ethereumjs-util';
@@ -187,7 +188,7 @@ export class ZeroEx {
const artifactJSONs = _.values(artifacts); const artifactJSONs = _.values(artifacts);
const abiArrays = _.map(artifactJSONs, artifact => artifact.abi); const abiArrays = _.map(artifactJSONs, artifact => artifact.abi);
this._abiDecoder = new AbiDecoder(abiArrays); this._abiDecoder = new AbiDecoder(abiArrays);
const gasPrice = _.isUndefined(config) ? undefined : config.gasPrice; const gasPrice: number|undefined = _.get(config, 'gasPrice');
const defaults = { const defaults = {
gasPrice, gasPrice,
}; };
@@ -197,7 +198,7 @@ export class ZeroEx {
this._abiDecoder, this._abiDecoder,
this._getTokenTransferProxyAddressAsync.bind(this), this._getTokenTransferProxyAddressAsync.bind(this),
); );
const exchageContractAddressIfExists = _.isUndefined(config) ? undefined : config.exchangeContractAddress; const exchageContractAddressIfExists: string|undefined = _.get(config, 'exchangeContractAddress');
this.exchange = new ExchangeWrapper( this.exchange = new ExchangeWrapper(
this._web3Wrapper, this._web3Wrapper,
this._abiDecoder, this._abiDecoder,
@@ -208,13 +209,11 @@ export class ZeroEx {
this._web3Wrapper, this._web3Wrapper,
this._getTokenTransferProxyAddressAsync.bind(this), this._getTokenTransferProxyAddressAsync.bind(this),
); );
const tokenRegistryContractAddressIfExists = _.isUndefined(config) ? const tokenRegistryContractAddressIfExists = _.get(config, 'tokenRegistryContractAddress');
undefined : this.tokenRegistry = new TokenRegistryWrapper(this._web3Wrapper, 'tokenRegistryContractAddressIfExists');
config.tokenRegistryContractAddress; const etherTokenContractAddressIfExists = _.get(config, 'etherTokenContractAddress');
this.tokenRegistry = new TokenRegistryWrapper(this._web3Wrapper, tokenRegistryContractAddressIfExists); this.etherToken = new EtherTokenWrapper(this._web3Wrapper, this.token, 'etherTokenContractAddressIfExists');
const etherTokenContractAddressIfExists = _.isUndefined(config) ? undefined : config.etherTokenContractAddress; const mempoolPollingIntervalMs: number|undefined = _.get(config, 'mempoolPollingIntervalMs');
this.etherToken = new EtherTokenWrapper(this._web3Wrapper, this.token, etherTokenContractAddressIfExists);
const mempoolPollingIntervalMs = _.isUndefined(config) ? undefined : config.mempoolPollingIntervalMs;
const orderStateUtils = new OrderStateUtils(this.token, this.exchange); const orderStateUtils = new OrderStateUtils(this.token, this.exchange);
this.orderStateWatcher = new OrderStateWatcher( this.orderStateWatcher = new OrderStateWatcher(
this._web3Wrapper, this._abiDecoder, orderStateUtils, mempoolPollingIntervalMs, this._web3Wrapper, this._abiDecoder, orderStateUtils, mempoolPollingIntervalMs,