diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-16 02:44:10 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-03-16 02:44:10 +0800 |
commit | 8d1e27a1a53f4c88ec9fefb5fd37b30c652782a6 (patch) | |
tree | 831b8d07c48d3700ec5662c7948ebab5e903b1b9 /packages/website/ts/blockchain.ts | |
parent | f9ad97b978ae4017adca032168ae7963c94e4157 (diff) | |
parent | 8137d41ce54b582032770c9b168016ce379711bf (diff) | |
download | dexon-sol-tools-8d1e27a1a53f4c88ec9fefb5fd37b30c652782a6.tar.gz dexon-sol-tools-8d1e27a1a53f4c88ec9fefb5fd37b30c652782a6.tar.zst dexon-sol-tools-8d1e27a1a53f4c88ec9fefb5fd37b30c652782a6.zip |
Merge branch 'development' into addExtraDocs
* development:
Add changelog entry about pragma addition
Add pragma above command-line script
Keep console.log in monorepo-scripts
Enable coverage for all other packages with tests
Fix parallel coverage results reporting
Fix linter issuesx
Update CHANGELOGs
Consolidate all console.log into the @0xproject/utils package
# Conflicts:
# packages/deployer/package.json
Diffstat (limited to 'packages/website/ts/blockchain.ts')
-rw-r--r-- | packages/website/ts/blockchain.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index c92023541..a3427baee 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -23,7 +23,7 @@ import { LedgerWalletSubprovider, RedundantRPCSubprovider, } from '@0xproject/subproviders'; -import { BigNumber, intervalUtils, promisify } from '@0xproject/utils'; +import { BigNumber, intervalUtils, logUtils, promisify } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import * as React from 'react'; @@ -405,7 +405,7 @@ export class Blockchain { }, 5000, (err: Error) => { - utils.consoleLog(`Polling tokenBalance failed: ${err}`); + logUtils.log(`Polling tokenBalance failed: ${err}`); intervalUtils.clearAsyncExcludingInterval(tokenPollInterval); reject(err); }, @@ -822,7 +822,7 @@ export class Blockchain { if (!_.isUndefined(contractAddress)) { const doesContractExist = await this.doesContractExistAtAddressAsync(contractAddress); if (!doesContractExist) { - utils.consoleLog(`Contract does not exist: ${artifact.contract_name} at ${contractAddress}`); + logUtils.log(`Contract does not exist: ${artifact.contract_name} at ${contractAddress}`); throw new Error(BlockchainCallErrs.ContractDoesNotExist); } } @@ -832,7 +832,7 @@ export class Blockchain { return contractInstance; } catch (err) { const errMsg = `${err}`; - utils.consoleLog(`Notice: Error encountered: ${err} ${err.stack}`); + logUtils.log(`Notice: Error encountered: ${err} ${err.stack}`); if (_.includes(errMsg, 'not been deployed to detected network')) { throw new Error(BlockchainCallErrs.ContractDoesNotExist); } else { |