Conflicts:
	lib/pool.js
This commit is contained in:
Andrea Baccega 2014-02-13 22:25:33 +01:00
commit e1c143de18

View File

@ -81,10 +81,8 @@ var pool = module.exports = function pool(options, authorizeFn){
_this.daemon.cmd('submitblock',
[blockHex],
function(error, result){
console.log(JSON.stringify([error,result]));
emitLog('submitblock', JSON.stringify([error,result]));
if (error)
emitErrorLog('submitblock', 'rpc error when submitting block with submitblock')
else
@ -96,7 +94,8 @@ var pool = module.exports = function pool(options, authorizeFn){
_this.daemon.cmd('getblocktemplate',
[{'mode': 'submit', 'data': blockHex}],
function(error, result){
console.log(error, result);
emitLog('submitblock', JSON.stringify([error,result]));
if (error)
emitErrorLog('submitblock', 'rpc error when submitting block with getblocktemplate')
else