Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alexander Blair
2017-11-13 10:45:29 -08:00
2 changed files with 12 additions and 8 deletions
+11 -7
View File
@@ -581,12 +581,16 @@ function Database(){
let oldestLockedBlock = this.getOldestLockedBlock();
async.waterfall([
function(callback){
global.coinFuncs.getBlockHeaderByHash(oldestLockedBlock.hash, (err, result) => {
oldestLockedBlock.height = result.height;
console.log(`Got the oldest block`);
callback(null, oldestLockedBlock);
});
},
if (oldestLockedBlock === null) {
callback(null, oldestLockedBlock)
} else {
global.coinFuncs.getBlockHeaderByHash(oldestLockedBlock.hash, (err, result) => {
oldestLockedBlock.height = result.height;
console.log(`Got the oldest block`);
callback(null, oldestLockedBlock);
});
}
},
function(oldestLockedBlock, callback){
global.coinFuncs.getLastBlockHeader(function(err, body){
if (oldestLockedBlock === null){
@@ -691,4 +695,4 @@ function Database(){
}, 900000); // Set DB env reload for every 15 minutes.
}
module.exports = Database;
module.exports = Database;