Merge pull request #452 from 0xProject/feature/utils/console-log

Consolidate all console.log utils into @0xproject/utils

3 files changed, 13 insertions, 17 deletions

diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts
index ced8063db..83977709b 100644
--- a/packages/deployer/src/compiler.ts
+++ b/packages/deployer/src/compiler.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { logUtils, promisify } from '@0xproject/utils';
 import * as ethUtil from 'ethereumjs-util';
 import * as fs from 'fs';
 import 'isomorphic-fetch';
@@ -59,9 +59,9 @@ export class Compiler {
                     };
                     const source = await fsWrapper.readFileAsync(contentPath, opts);
                     sources[fileName] = source;
-                    utils.consoleLog(`Reading ${fileName} source...`);
+                    logUtils.log(`Reading ${fileName} source...`);
                 } catch (err) {
-                    utils.consoleLog(`Could not find file at ${contentPath}`);
+                    logUtils.log(`Could not find file at ${contentPath}`);
                 }
             } else {
                 try {
@@ -71,7 +71,7 @@ export class Compiler {
                         ...nestedSources,
                     };
                 } catch (err) {
-                    utils.consoleLog(`${contentPath} is not a directory or ${constants.SOLIDITY_FILE_EXTENSION} file`);
+                    logUtils.log(`${contentPath} is not a directory or ${constants.SOLIDITY_FILE_EXTENSION} file`);
                 }
             }
         }
@@ -164,7 +164,7 @@ export class Compiler {
         });
         await Promise.all(_.map(fileNames, async fileName => this._compileContractAsync(fileName)));
         this._solcErrors.forEach(errMsg => {
-            utils.consoleLog(errMsg);
+            logUtils.log(errMsg);
         });
     }
     /**
@@ -195,7 +195,7 @@ export class Compiler {
         if (isCompilerAvailableLocally) {
             solcjs = fs.readFileSync(compilerBinFilename).toString();
         } else {
-            utils.consoleLog(`Downloading ${fullSolcVersion}...`);
+            logUtils.log(`Downloading ${fullSolcVersion}...`);
             const url = `${constants.BASE_COMPILER_URL}${fullSolcVersion}`;
             const response = await fetch(url);
             if (response.status !== 200) {
@@ -206,7 +206,7 @@ export class Compiler {
         }
         const solcInstance = solc.setupMethods(requireFromString(solcjs, compilerBinFilename));
 
-        utils.consoleLog(`Compiling ${fileName}...`);
+        logUtils.log(`Compiling ${fileName}...`);
         const source = this._contractSources[fileName];
         const input = {
             [fileName]: source,
@@ -270,7 +270,7 @@ export class Compiler {
         const artifactString = utils.stringifyWithFormatting(newArtifact);
         const currentArtifactPath = `${this._artifactsDir}/${contractName}.json`;
         await fsWrapper.writeFileAsync(currentArtifactPath, artifactString);
-        utils.consoleLog(`${fileName} artifact saved!`);
+        logUtils.log(`${fileName} artifact saved!`);
     }
     /**
      * Sets the source tree hash for a file and its dependencies.
@@ -323,7 +323,7 @@ export class Compiler {
      */
     private async _createArtifactsDirIfDoesNotExistAsync(): Promise<void> {
         if (!fsWrapper.doesPathExistSync(this._artifactsDir)) {
-            utils.consoleLog('Creating artifacts directory...');
+            logUtils.log('Creating artifacts directory...');
             await fsWrapper.mkdirAsync(this._artifactsDir);
         }
     }
@@ -344,7 +344,7 @@ export class Compiler {
             contractArtifact = JSON.parse(contractArtifactString);
             return contractArtifact;
         } catch (err) {
-            utils.consoleLog(`Artifact for ${fileName} does not exist`);
+            logUtils.log(`Artifact for ${fileName} does not exist`);
             return undefined;
         }
     }
diff --git a/packages/deployer/src/deployer.ts b/packages/deployer/src/deployer.ts
index 27c346524..6c247d328 100644
--- a/packages/deployer/src/deployer.ts
+++ b/packages/deployer/src/deployer.ts
@@ -1,4 +1,5 @@
 import { AbiType, TxData } from '@0xproject/types';
+import { logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
@@ -74,7 +75,7 @@ export class Deployer {
             );
         }
         const web3ContractInstance = await this._deployFromAbiAsync(abi, args, txData);
-        utils.consoleLog(`${contractName}.sol successfully deployed at ${web3ContractInstance.address}`);
+        logUtils.log(`${contractName}.sol successfully deployed at ${web3ContractInstance.address}`);
         const contractInstance = new Contract(web3ContractInstance, this._defaults);
         return contractInstance;
     }
@@ -107,7 +108,7 @@ export class Deployer {
                 if (err) {
                     reject(err);
                 } else if (_.isUndefined(res.address) && !_.isUndefined(res.transactionHash)) {
-                    utils.consoleLog(`transactionHash: ${res.transactionHash}`);
+                    logUtils.log(`transactionHash: ${res.transactionHash}`);
                 } else {
                     resolve(res);
                 }
diff --git a/packages/deployer/src/utils/utils.ts b/packages/deployer/src/utils/utils.ts
index 4390d8813..9b1e59f9d 100644
--- a/packages/deployer/src/utils/utils.ts
+++ b/packages/deployer/src/utils/utils.ts
@@ -1,9 +1,4 @@
 export const utils = {
-    consoleLog(message: string): void {
-        /* tslint:disable */
-        console.log(message);
-        /* tslint:enable */
-    },
     stringifyWithFormatting(obj: any): string {
         const jsonReplacer: null = null;
         const numberOfJsonSpaces = 4;