Merge pull request #113 from matiu/bug/fix-reorg-tests

Bug/fix reorg tests
bitpay · Jun 3, 2014 · fcbd1f6 · fcbd1f6
2 parents a77d5a9 + 65a5093
commit fcbd1f6
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 395 deletions.
diff --git a/lib/PeerSync.js b/lib/PeerSync.js
@@ -91,7 +91,7 @@ PeerSync.prototype.handleBlock = function(info) {
   }, self.allowReorgs, function(err, height) {
     if (err && err.message.match(/NEED_SYNC/) && self.historicSync) {
       console.log('[p2p_sync] Orphan block received. Triggering sync');
-      self.historicSync.start({}, function(){
+      self.historicSync.start({forceRPC:1}, function(){
         console.log('[p2p_sync] Done resync.');
       });
     }

diff --git a/lib/Sync.js b/lib/Sync.js
@@ -83,8 +83,18 @@ Sync.prototype.storeTipBlock = function(b, allowReorgs, cb) {
     allowReorgs = true;
   }
   if (!b) return cb();
-
   var self = this;
+
+  if ( self.storingBlock ) {
+    console.log('## Storing a block already. Delaying storeTipBlock with:' +
+                b.hash);
+    return setTimeout( function() {
+      console.log('## Retrying storeTipBlock with: ' + b.hash);
+      self.storeTipBlock(b,allowReorgs,cb);
+    }, 1000);
+  }
+
+  self.storingBlock=1;
   var oldTip, oldNext, oldHeight, needReorg = false, height = -1;
   var newPrev = b.previousblockhash;
 
@@ -164,6 +174,7 @@ Sync.prototype.storeTipBlock = function(b, allowReorgs, cb) {
       if (err && err.toString().match(/WARN/)) {
         err = null;
       }
+      self.storingBlock=0;
       return cb(err, height);
     });
 };
@@ -177,7 +188,10 @@ Sync.prototype.processReorg = function(oldTip, oldNext, newPrev, oldHeight, cb)
 
       function(c) {
         self.bDb.getHeight(newPrev, function(err, height) {
-          if (!height) return c(new Error('Could not found block:' + newPrev));
+          if (!height) {
+            // Case 3 + allowReorgs = true
+            return c(new Error('Could not found block:' + newPrev));
+          }
           if (height<0) return c();
 
           newHeight = height + 1;