From 06292d53f9bf04c2f038ea285f5ee1349078fbd9 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 13 Apr 2018 17:12:24 -0400 Subject: [PATCH] cleanup --- src/compiler.js | 2 -- src/deployer.js | 12 ++---------- src/provider.js | 4 +--- src/txProcess.js | 9 +-------- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/compiler.js b/src/compiler.js index b3c73008b0..6dfb321abe 100644 --- a/src/compiler.js +++ b/src/compiler.js @@ -38,8 +38,6 @@ function compileFileOrFiles (filename, isDirectory, cb) { compiler.compile(sources, filepath) } ], function (err, result) { - console.dir(err); - console.dir(result); let errors = (result.errors || []).filter((e) => e.type === 'Error') if (errors.length > 0) { console.dir(errors) diff --git a/src/deployer.js b/src/deployer.js index 7f8d07ed31..ec65d991cf 100644 --- a/src/deployer.js +++ b/src/deployer.js @@ -79,17 +79,11 @@ function deployAll (compileResult, web3, callback) { let deployObject = contractObject.deploy({arguments: [], data: contractCode}) deployObject.estimateGas().then((gasValue) => { - console.dir("got gas estimation " + gasValue); - console.dir(accounts); deployObject.send({ from: accounts[0], - //gas: Math.ceil(gasValue * 1.2) - gas: 1200000 + gas: Math.ceil(gasValue * 1.2) + //gas: 1200000 }).on('receipt', function (receipt) { - - console.dir("==== got the receipt"); - console.dir(receipt); - contractObject.options.address = receipt.contractAddress contractObject.options.from = accounts[0] contractObject.options.gas = 5000 * 1000 @@ -99,8 +93,6 @@ function deployAll (compileResult, web3, callback) { nextEach() }).on('error', function(err) { - console.dir("==============="); - console.dir("error"); console.dir(err); }) }) diff --git a/src/provider.js b/src/provider.js index 785ac31a80..428c66269a 100644 --- a/src/provider.js +++ b/src/provider.js @@ -23,14 +23,12 @@ Provider = function() { Provider.prototype.sendAsync = function(payload, callback) { const self = this; - //console.log("=========== sendAsync"); - //console.dir(payload); if (payload.method === 'eth_accounts') { return callback(null, jsonRPCResponse(payload.id, this.accounts.map((x) => x.address))) } if (payload.method === 'eth_estimateGas') { - callback(null, jsonRPCResponse(payload.id, 1200000)) + callback(null, jsonRPCResponse(payload.id, 3000000)) } if (payload.method === 'eth_gasPrice') { callback(null, jsonRPCResponse(payload.id, 1)) diff --git a/src/txProcess.js b/src/txProcess.js index 334a01e80d..830cc56cef 100644 --- a/src/txProcess.js +++ b/src/txProcess.js @@ -8,13 +8,9 @@ function jsonRPCResponse(id, result) { } function runTx(payload, from, to, data, value, gasLimit, txRunner, callbacks, isCall, callback) { - console.log('-- runTx'); let finalCallback = function(err, result) { let toReturn; if (isCall) { - console.dir('---- result is '); - console.dir(result.result.vm.return); - console.dir(result.result.vm); toReturn = "0x" + result.result.vm.return.toString('hex') if (toReturn === '0x') { toReturn = '0x0' @@ -30,8 +26,6 @@ function runTx(payload, from, to, data, value, gasLimit, txRunner, callbacks, is } function createContract(payload, from, data, value, gasLimit, txRunner, callbacks, callback) { - console.log('-- createContract'); - console.dir(arguments); let finalCallback = function(err, result) { if (err) { return callback(err); @@ -44,7 +38,6 @@ function createContract(payload, from, data, value, gasLimit, txRunner, callback } function processTx(accounts, payload, isCall, callback) { - console.log('-- processTx'); let api = { logMessage: (msg) => { }, @@ -75,7 +68,7 @@ function processTx(accounts, payload, isCall, callback) { let txRunner = new TxRunner(accounts, api); let { from: from, to: to, data: data, value: value, gas: gas } = payload.params[0]; - gas = gas || 1200000; + gas = gas || 3000000; let callbacks = { confirmationCb: (network, tx, gasEstimation, continueTxExecution, cancelCb) => {