Merge pull request #29 from jwasinger/fix-bc-general-state-tests

Make sure blockchain init is complete before adding blocks
ethereumjs · Sep 11, 2017 · f0070b5 · f0070b5
2 parents 1598106 + 23e4fd3
commit f0070b5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -139,10 +139,13 @@ Blockchain.prototype.putBlocks = function (blocks, cb) {
 Blockchain.prototype.putBlock = function (block, cb, isGenesis) {
   const self = this
 
-  // perform put with mutex dance
-  lockUnlock(function (done) {
-    self._putBlock(block, done, isGenesis)
-  }, cb)
+  // make sure init has completed
+  self._initLock.await(() => {
+    // perform put with mutex dance
+    lockUnlock(function (done) {
+      self._putBlock(block, done, isGenesis)
+    }, cb)
+  })
 
   // lock, call fn, unlock
   function lockUnlock (fn, cb) {