RanchiMall/node-stratum-pool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zone117x/node-stratum

Browse Source 
Conflicts:
	lib/pool.js
This commit is contained in:
Andrea Baccega 2014-02-13 22:25:33 +01:00
commit e1c143de18
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pool.js
View File

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