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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Matt 2014-03-07 15:19:56 -07:00
commit cb881670fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/varDiff.js
View File

@ -54,7 +54,7 @@ var varDiff = module.exports = function varDiff(ports){
var variance = varDiffOptions.targetTime * (varDiffOptions.variancePercent / 100); var variance = varDiffOptions.targetTime * (varDiffOptions.variancePercent / 100);
portsCalcInfo[parseInt(ports)] = { portsCalcInfo[parseInt(port)] = {
bufferSize: varDiffOptions.retargetTime / varDiffOptions.targetTime * 4, bufferSize: varDiffOptions.retargetTime / varDiffOptions.targetTime * 4,
tMin: varDiffOptions.targetTime - variance, tMin: varDiffOptions.targetTime - variance,
tMax: varDiffOptions.targetTime + variance tMax: varDiffOptions.targetTime + variance
@ -74,7 +74,7 @@ var varDiff = module.exports = function varDiff(ports){
return; return;
var calcInfo = portsCalcInfo[stratumPort]; var calcInfo = portsCalcInfo[stratumPort];
var options = ports[stratumPort]; var options = ports[stratumPort].varDiff;
var lastTs; var lastTs;
var lastRtc; var lastRtc;
@ -127,4 +127,4 @@ var varDiff = module.exports = function varDiff(ports){
}); });
}; };
}; };
varDiff.prototype.__proto__ = events.EventEmitter.prototype; varDiff.prototype.__proto__ = events.EventEmitter.prototype;