Mv _getBlock to DBManager

Author: s1na

src/dbManager.js

@@ -129,4 +129,33 @@ module.exports = class DBManager {
     this._cache.header.set(key, encodedHeader)
     return new Block.Header(rlp.decode(encodedHeader), {common: this._common})
   }
+
+  async _getBlock (blockTag) {
+    // determine BlockTag type
+    if (Number.isInteger(blockTag)) {
+      blockTag = new BN(blockTag)
+    }
+
+    let number
+    let hash
+    if (Buffer.isBuffer(blockTag)) {
+      hash = blockTag
+      number = await this._hashToNumber(blockTag)
+    } else if (BN.isBN(blockTag)) {
+      number = blockTag
+      hash = await this._numberToHash(blockTag)
+    } else {
+      throw new Error('Unknown blockTag type')
+    }
+
+    const header = (await this._getHeader(hash, number)).raw
+    let body
+    try {
+      body = await this._getBody(hash, number)
+    } catch (e) {
+      body = [[], []]
+    }
+
+    return new Block([header].concat(body), {common: this._common})
+  }
 }

src/index.js

@@ -474,50 +474,7 @@ module.exports = class Blockchain {
   }
 
   _getBlock (blockTag, cb) {
-    const self = this
-
-    // determine BlockTag type
-    if (Number.isInteger(blockTag)) {
-      blockTag = new BN(blockTag)
-    }
-    async.waterfall([
-      (cb) => {
-        if (Buffer.isBuffer(blockTag)) {
-          self._hashToNumber(blockTag, (err, number) => {
-            if (err) return cb(err)
-            cb(null, blockTag, number)
-          })
-        } else if (BN.isBN(blockTag)) {
-          self._numberToHash(blockTag, (err, hash) => {
-            if (err) return cb(err)
-            cb(null, hash, blockTag)
-          })
-        } else {
-          cb(new Error('Unknown blockTag type'))
-        }
-      },
-      lookupByHashAndNumber
-    ], cb)
-
-    function lookupByHashAndNumber (hash, number, cb) {
-      async.parallel({
-        header: (cb) => {
-          self._getHeader(hash, number, (err, header) => {
-            if (err) return cb(err)
-            cb(null, header.raw)
-          })
-        },
-        body: (cb) => {
-          self._getBody(hash, number, (err, body) => {
-            if (err) return cb(null, [[], []])
-            cb(null, body)
-          })
-        }
-      }, (err, parts) => {
-        if (err) return cb(err)
-        cb(null, new Block([parts.header].concat(parts.body), {common: self._common}))
-      })
-    }
+    util.callbackify(this.dbManager._getBlock.bind(this.dbManager))(blockTag, cb)
   }
 
   /**