Merge a3d8cd2 into 768eac1

ethereumjs · Feb 26, 2019 · 7dc83f4 · 7dc83f4
2 parents 768eac1 + a3d8cd2
commit 7dc83f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/baseTrie.js b/src/baseTrie.js
@@ -132,7 +132,7 @@ module.exports = class Trie {
   // retrieves a node from dbs by hash
   _lookupNode (node, cb) {
     if (TrieNode.isRawNode(node)) {
-      cb(new TrieNode(node))
+      cb(null, new TrieNode(node))
     } else {
       this.db.get(node, (err, value) => {
         if (err) {
@@ -141,9 +141,11 @@ module.exports = class Trie {
 
         if (value) {
           value = new TrieNode(rlp.decode(value))
+        }else{
+          err = err || "Missing node in DB"
         }
 
-        cb(value)
+        cb(err, value)
       })
     }
   }
@@ -375,7 +377,8 @@ module.exports = class Trie {
       return onDone()
     }
 
-    this._lookupNode(root, node => {
+    this._lookupNode(root, (e, node) => {
+      if(e){ return onDone(e, node) }
       processNode(root, node, null, err => {
         if (err) {
           return onDone(err)
@@ -421,7 +424,8 @@ module.exports = class Trie {
             const childKey = key.concat(keyExtension)
             const priority = childKey.length
             taskExecutor.execute(priority, taskCallback => {
-              self._lookupNode(childRef, childNode => {
+              self._lookupNode(childRef, (e, childNode) => {
+                if(e){ return cb(e, node) }
                 taskCallback()
                 processNode(childRef, childNode, childKey, cb)
               })
@@ -434,7 +438,8 @@ module.exports = class Trie {
           childKey.push(childIndex)
           const priority = childKey.length
           taskExecutor.execute(priority, taskCallback => {
-            self._lookupNode(childRef, childNode => {
+            self._lookupNode(childRef, (e, childNode) => {
+              if(e){ return cb(e, node) }
               taskCallback()
               processNode(childRef, childNode, childKey, cb)
             })
@@ -585,7 +590,7 @@ module.exports = class Trie {
         const branchNodeKey = branchNodes[0][0]
 
         // look up node
-        this._lookupNode(branchNode, foundNode => {
+        this._lookupNode(branchNode, (e, foundNode) => {
           key = processBranchNode(key, branchNodeKey, foundNode, parentNode, stack, opStack)
           this._saveStack(key, stack, opStack, cb)
         })
@@ -694,7 +699,7 @@ module.exports = class Trie {
    */
   checkRoot (root, cb) {
     root = ethUtil.toBuffer(root)
-    this._lookupNode(root, value => {
+    this._lookupNode(root, (e, value) => {
       cb(null, !!value)
     })
   }

diff --git a/test/index.js b/test/index.js
@@ -12,7 +12,9 @@ tape('simple save and retrive', function (tester) {
 
     trie.get('test', function (err, value) {
       t.equal(value, null)
-      t.end(err)
+
+      t.notEqual(err, null)
+      t.end()
     })
   })