zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wait for bitcoind to catch up if tip is not found

This commit is contained in:
Patrick Nagurny 2015-10-02 13:35:42 -04:00
parent 56f375a3b7
commit 9acb896f10
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/services/db.js
View File

@ -51,6 +51,8 @@ function DB(options) {
this.levelupStore = options.store; this.levelupStore = options.store;
} }
this.retryInterval = 60000;
this.subscriptions = { this.subscriptions = {
transaction: [], transaction: [],
block: [] block: []
@ -217,11 +219,24 @@ DB.prototype.loadTip = function(callback) {
var hash = tipData.toString('hex'); var hash = tipData.toString('hex');
self.getBlock(hash, function(err, tip) { var times = 0;
async.retry({times: 3, interval: self.retryInterval}, function(done) {
self.getBlock(hash, function(err, tip) {
if(err) {
times++;
log.warn('Bitcoind does not have our tip (' + hash + '). Bitcoind may have crashed and needs to catch up.');
if(times < 3) {
log.warn('Retrying in ' + (self.retryInterval / 1000) + ' seconds.');
}
return done(err);
}
done(null, tip);
});
}, function(err, tip) {
if(err) { if(err) {
log.warn('Database is in an inconsistent state, a reindex is needed. Could not get current tip:', log.warn('Giving up after 3 tries. Please report this bug to https://github.com/bitpay/bitcore-node/issues');
hash log.warn('Please reindex your database.');
);
return callback(err); return callback(err);
} }

4
test/services/db.unit.js
View File

@ -306,7 +306,7 @@ describe('DB Service', function() {
}); });
}); });
it('give error from getBlock', function(done) { it('should try 3 times before giving error from getBlock', function(done) {
var node = { var node = {
network: Networks.testnet, network: Networks.testnet,
datadir: 'testdir', datadir: 'testdir',
@ -319,6 +319,7 @@ describe('DB Service', function() {
} }
}; };
var db = new DB({node: node}); var db = new DB({node: node});
db.retryInterval = 10;
var tipHash = '00000000b873e79784647a6c82962c70d228557d24a747ea4d1b8bbe878e1206'; var tipHash = '00000000b873e79784647a6c82962c70d228557d24a747ea4d1b8bbe878e1206';
db.store = { db.store = {
get: sinon.stub().callsArgWith(2, null, new Buffer(tipHash, 'hex')) get: sinon.stub().callsArgWith(2, null, new Buffer(tipHash, 'hex'))
@ -326,6 +327,7 @@ describe('DB Service', function() {
db.getBlock = sinon.stub().callsArgWith(1, new Error('test')); db.getBlock = sinon.stub().callsArgWith(1, new Error('test'));
db.loadTip(function(err) { db.loadTip(function(err) {
should.exist(err); should.exist(err);
db.getBlock.callCount.should.equal(3);
err.message.should.equal('test'); err.message.should.equal('test');
done(); done();
}); });