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

1.0.7 Commented out assertion stops

Browse Source
This commit is contained in:
Vivek Teega 2021-05-17 12:59:36 +05:30
parent 3598c92e0f
commit 453d11c64c
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/services/header/index.js
View File

@ -145,7 +145,11 @@ HeaderService.prototype._adjustTipBackToCheckpoint = function() {
HeaderService.prototype._setGenesisBlock = function(callback) { HeaderService.prototype._setGenesisBlock = function(callback) {
assert(this._tip.hash === this.GENESIS_HASH, 'Expected tip hash to be genesis hash, but it was not.'); // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
if (this._tip.hash != this.GENESIS_HASH) {
log.error('Expected tip hash to be genesis hash, but it was not.');
}
// assert(this._tip.hash === this.GENESIS_HASH, 'Expected tip hash to be genesis hash, but it was not.');
var genesisHeader = { var genesisHeader = {
hash: this.GENESIS_HASH, hash: this.GENESIS_HASH,
@ -412,7 +416,10 @@ HeaderService.prototype._getDBOpForLastHeader = function(nextHeader) {
this._lastHeader.nextHash = nextHeader.hash; this._lastHeader.nextHash = nextHeader.hash;
var keyHash = this._encoding.encodeHeaderHashKey(this._lastHeader.hash); var keyHash = this._encoding.encodeHeaderHashKey(this._lastHeader.hash);
assert(this._lastHeader.height >= 0, 'Trying to save a header with incorrect height.'); // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
if (this._lastHeader.height < 0) { log.error('Trying to save a header with incorrect height.');
}
// assert(this._lastHeader.height >= 0, 'Trying to save a header with incorrect height.');
var keyHeight = this._encoding.encodeHeaderHeightKey(this._lastHeader.height); var keyHeight = this._encoding.encodeHeaderHeightKey(this._lastHeader.height);
var value = this._encoding.encodeHeaderValue(this._lastHeader); var value = this._encoding.encodeHeaderValue(this._lastHeader);
@ -466,9 +473,12 @@ HeaderService.prototype._onHeaders = function(headers) {
for(var i = 0; i < transformedHeaders.length; i++) { for(var i = 0; i < transformedHeaders.length; i++) {
var header = transformedHeaders[i]; var header = transformedHeaders[i];
assert(self._lastHeader.hash === header.prevHash, 'headers not in order: ' + self._lastHeader.hash + // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
' -and- ' + header.prevHash + ' Last header at height: ' + self._lastHeader.height); if (self._lastHeader.hash != header.prevHash) {
log.error('headers not in order: ' + self._lastHeader.hash + ' -and- ' + header.prevHash + ' Last header at height: ' + self._lastHeader.height);
}
// assert(self._lastHeader.hash === header.prevHash, 'headers not in order: ' + self._lastHeader.hash + ' -and- ' + header.prevHash + ' Last header at height: ' + self._lastHeader.height);
var ops = self._onHeader(header); var ops = self._onHeader(header);
@ -485,9 +495,8 @@ HeaderService.prototype._onHeaders = function(headers) {
}; };
HeaderService.prototype._handleError = function(err) { HeaderService.prototype._handleError = function(err) {
log.error('Header Service: ' + err); log.error('Error in Header Service: ' + err);
// FLO Crash Error Resolution by RanchiMall 10th May 2021 //this.node.stop();
// this.node.stop();
}; };
HeaderService.prototype._saveHeaders = function(dbOps, callback) { HeaderService.prototype._saveHeaders = function(dbOps, callback) {
@ -778,9 +787,11 @@ HeaderService.prototype._findReorgConditionInNewPeer = function(callback) {
// nothing matched... // nothing matched...
// at this point, we should wonder if we are connected to the wrong network // at this point, we should wonder if we are connected to the wrong network
assert(true, 'We tried to find a common header between current set of headers ' + // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
'and the new peer\'s set of headers, but there were none. This should be impossible ' + if (false) {
' if the new peer is using the same genesis block.'); log.error('We tried to find a common header between current set of headers ' + 'and the new peer\'s set of headers, but there were none. This should be impossible ' + ' if the new peer is using the same genesis block.');
}
// assert(true, 'We tried to find a common header between current set of headers ' +'and the new peer\'s set of headers, but there were none. This should be impossible ' +' if the new peer is using the same genesis block.');
}); });
self._getP2PHeaders(self.GENESIS_HASH); self._getP2PHeaders(self.GENESIS_HASH);
@ -881,7 +892,11 @@ HeaderService.prototype._sync = function() {
HeaderService.prototype.getEndHash = function(tip, blockCount, callback) { HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
assert(blockCount >= 1, 'Header Service: block count to getEndHash must be at least 1.'); // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
if (blockCount < 1) {
log.error('Header Service: block count to getEndHash must be at least 1.');
}
// assert(blockCount >= 1, 'Header Service: block count to getEndHash must be at least 1.');
var self = this; var self = this;
@ -922,8 +937,11 @@ HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
if (streamErr) { if (streamErr) {
return streamErr; return streamErr;
} }
// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
assert(results.length === numResultsNeeded, 'getEndHash returned incorrect number of results.'); if (results.length != numResultsNeeded) {
log.error('getEndHash returned incorrect number of results.');
}
// assert(results.length === numResultsNeeded, 'getEndHash returned incorrect number of results.');
var index = numResultsNeeded - 1; var index = numResultsNeeded - 1;
var endHash = index <= 0 || !results[index] ? 0 : results[index]; var endHash = index <= 0 || !results[index] ? 0 : results[index];
@ -941,7 +959,11 @@ HeaderService.prototype.getEndHash = function(tip, blockCount, callback) {
}; };
HeaderService.prototype.getLastHeader = function() { HeaderService.prototype.getLastHeader = function() {
assert(this._lastHeader, 'Last header should be populated.'); // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
if (this._lastHeader = false) {
log.error('Last header should be populated.'); return;
}
// assert(this._lastHeader, 'Last header should be populated.');
return this._lastHeader; return this._lastHeader;
}; };
@ -998,8 +1020,14 @@ HeaderService.prototype._adjustHeadersForCheckPointTip = function(callback) {
if (streamErr) { if (streamErr) {
return streamErr; return streamErr;
} }
assert(self._lastHeader, 'The last synced header was not in the database.'); // FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
if (self._lastHeader = false) {
log.error('The last synced header was not in the database.');
}
//assert(self._lastHeader, 'The last synced header was not in the database.');
self._tip.hash = self._lastHeader.hash; self._tip.hash = self._lastHeader.hash;
self._tip.height = self._lastHeader.height; self._tip.height = self._lastHeader.height;
self._db.batch(removalOps, callback); self._db.batch(removalOps, callback);