RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #410 from pnagurny/bug/sync-percentage

Browse Source 
Fix sync percentage
This commit is contained in:
Braydon Fuller 2015-10-22 14:37:01 -04:00
commit 2a14955d74
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/status.js
View File

@ -59,10 +59,14 @@ StatusController.prototype.sync = function(req, res) {
status = 'finished'; status = 'finished';
} }
// Not exactly the total blockchain height,
// but we will reach 100% when our db and bitcoind are both fully synced
var totalHeight = this.node.services.bitcoind.height / (this.node.services.bitcoind.syncPercentage() / 100);
var info = { var info = {
status: status, status: status,
blockChainHeight: this.node.services.bitcoind.height, blockChainHeight: this.node.services.bitcoind.height,
syncPercentage: this.node.services.db.tip.__height / this.node.services.bitcoind.height * 100, syncPercentage: Math.round(this.node.services.db.tip.__height / totalHeight * 100),
height: this.node.services.db.tip.__height, height: this.node.services.db.tip.__height,
error: null, error: null,
type: 'bitcore node' type: 'bitcore node'

3
test/status.js
View File

@ -125,7 +125,8 @@ describe('Status', function() {
}, },
bitcoind: { bitcoind: {
height: 500000, height: 500000,
isSynced: sinon.stub().returns(true) isSynced: sinon.stub().returns(true),
syncPercentage: sinon.stub().returns(99.99)
} }
} }
}; };