Merge pull request #154 from MineMoneroPRO/master

longRunner's "Cannot read property 'hash' of null"
This commit is contained in:
Snipa22 2017-11-11 04:11:16 -08:00 committed by GitHub
commit 01ef225985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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;