RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chaindb: refactor reset and removeChain.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-11-10 15:23:54 -08:00
parent e68a64d1f9
commit 51e3228d83
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/chain/chaindb.js
View File

@ -1346,7 +1346,7 @@ ChainDB.prototype.reset = co(function* reset(block) {
this.logger.debug('Resetting main chain to: %s', entry.rhash); this.logger.debug('Resetting main chain to: %s', entry.rhash);
while (!tip.isGenesis()) { for (;;) {
this.start(); this.start();
if (tip.hash === entry.hash) { if (tip.hash === entry.hash) {
@ -1355,6 +1355,8 @@ ChainDB.prototype.reset = co(function* reset(block) {
break; break;
} }
assert(!tip.isGenesis());
this.del(layout.H(tip.height)); this.del(layout.H(tip.height));
this.del(layout.h(tip.hash)); this.del(layout.h(tip.hash));
this.del(layout.e(tip.hash)); this.del(layout.e(tip.hash));
@ -1391,24 +1393,29 @@ ChainDB.prototype.reset = co(function* reset(block) {
ChainDB.prototype.removeChain = co(function* removeChain(tip, entry) { ChainDB.prototype.removeChain = co(function* removeChain(tip, entry) {
this.logger.debug('Removing alternate chain: %s->%s', tip.rhash, entry.rhash); this.logger.debug('Removing alternate chain: %s->%s', tip.rhash, entry.rhash);
while (!tip.isGenesis()) { this.start();
for (;;) }
if (tip.hash === entry.hash) if (tip.hash === entry.hash)
break; break;
this.start(); if (tip.isGenesis()) {
this.drop();
throw new Error('Target entry not in chain.');
}
this.del(layout.h(tip.hash)); this.del(layout.h(tip.hash));
this.del(layout.e(tip.hash)); this.del(layout.e(tip.hash));
this.del(layout.b(tip.hash)); this.del(layout.b(tip.hash));
yield this.commit(); this.cacheHash.unpush(tip.hash);
this.cacheHash.remove(tip.hash);
tip = yield this.get(tip.prevBlock); tip = yield this.get(tip.prevBlock);
assert(tip); assert(tip);
} }
yield this.commit();
return tip; return tip;
}); });