Revert "refactor: make code promisify free"

Just reverting on order to make a proper breaking change commit
message with that commit.

This reverts commit 1a98e16.

Author: vmx

package.json

@@ -40,12 +40,12 @@
     "dirty-chai": "^2.0.1",
     "ethereumjs-block": "^2.2.0",
     "fs-extra": "^8.0.1",
-    "ipfs-block-service": "^0.16.0",
-    "ipfs-repo": "^0.27.0",
+    "ipfs-block-service": "~0.15.2",
+    "ipfs-repo": "~0.26.5",
     "ipld-bitcoin": "~0.3.0",
     "ipld-ethereum": "^4.0.0",
     "ipld-git": "~0.5.0",
-    "ipld-in-memory": "^3.0.0",
+    "ipld-in-memory": "^2.0.0",
     "ipld-zcash": "~0.3.0",
     "merkle-patricia-tree": "^3.0.0",
     "multihashes": "~0.4.14",
@@ -60,6 +60,7 @@
     "ipld-raw": "^4.0.0",
     "merge-options": "^1.0.1",
     "multicodec": "~0.5.1",
+    "promisify-es6": "^1.0.3",
     "typical": "^5.0.0"
   },
   "contributors": [

src/index.js

@@ -7,6 +7,7 @@ const ipldDagCbor = require('ipld-dag-cbor')
 const ipldDagPb = require('ipld-dag-pb')
 const ipldRaw = require('ipld-raw')
 const multicodec = require('multicodec')
+const promisify = require('promisify-es6')
 const typical = require('typical')
 const { extendIterator } = require('./util')
 
@@ -94,7 +95,7 @@ class IPLDResolver {
         // get block
         // use local resolver
         // update path value
-        const block = await this.bs.get(cid)
+        const block = await promisify(this.bs.get.bind(this.bs))(cid)
         const result = format.resolver.resolve(block.data, path)
 
         // Prepare for the next iteration if there is a `remainderPath`
@@ -128,7 +129,7 @@ class IPLDResolver {
    * @returns {Promise.<Object>} - Returns a Promise with the IPLD Node that correspond to the given `cid`.
    */
   async get (cid) {
-    const block = await this.bs.get(cid)
+    const block = await promisify(this.bs.get.bind(this.bs))(cid)
     const format = await this._getFormat(block.cid.codec)
     const node = format.util.deserialize(block.data)
 
@@ -193,7 +194,7 @@ class IPLDResolver {
 
     if (!options.onlyHash) {
       const block = new Block(serialized, cid)
-      await this.bs.put(block)
+      await promisify(this.bs.put.bind(this.bs))(block)
     }
 
     return cid
@@ -254,7 +255,7 @@ class IPLDResolver {
    * @return {Promise.<CID>} The CID of the removed IPLD Node.
    */
   async remove (cid) { // eslint-disable-line require-await
-    return this.bs.delete(cid)
+    return promisify(this.bs.delete.bind(this.bs))(cid)
   }
 
   /**
@@ -335,7 +336,7 @@ class IPLDResolver {
         if (treePaths.length === 0 && queue.length > 0) {
           ({ cid, basePath } = queue.shift())
           const format = await this._getFormat(cid.codec)
-          block = await this.bs.get(cid)
+          block = await promisify(this.bs.get.bind(this.bs))(cid)
 
           const paths = format.resolver.tree(block.data)
           treePaths.push(...paths)

test/basics.js

@@ -23,8 +23,8 @@ module.exports = (repo) => {
       expect(r.bs).to.exist()
     })
 
-    it('creates an in memory repo if no blockService is passed', async () => {
-      await inMemory(IPLDResolver, (err, r) => {
+    it('creates an in memory repo if no blockService is passed', () => {
+      inMemory(IPLDResolver, (err, r) => {
         expect(err).to.not.exist()
         expect(r.bs).to.exist()
       })

test/browser.js

@@ -4,6 +4,7 @@
 'use strict'
 
 const IPFSRepo = require('ipfs-repo')
+const promisify = require('promisify-es6')
 
 const basePath = 'ipfs' + Math.random()
 
@@ -18,13 +19,17 @@ idb.deleteDatabase(basePath + '/blocks')
 describe('Browser', () => {
   const repo = new IPFSRepo(basePath)
 
+  const repoInit = promisify(repo.init.bind(repo))
+  const repoOpen = promisify(repo.open.bind(repo))
+  const repoClose = promisify(repo.close.bind(repo))
+
   before(async () => {
-    await repo.init({})
-    await repo.open()
+    await repoInit({})
+    await repoOpen()
   })
 
   after(async () => {
-    await repo.close()
+    await repoClose()
     idb.deleteDatabase(basePath)
     idb.deleteDatabase(basePath + '/blocks')
   })

test/ipld-all.js

@@ -17,6 +17,7 @@ const dagPB = require('ipld-dag-pb')
 const CID = require('cids')
 const inMemory = require('ipld-in-memory')
 const multicodec = require('multicodec')
+const promisify = require('promisify-es6')
 
 const IPLDResolver = require('../src')
 
@@ -29,7 +30,12 @@ describe('IPLD Resolver for dag-cbor + dag-pb', () => {
   let cidPb
 
   before(async () => {
-    resolver = await inMemory(IPLDResolver)
+    resolver = await new Promise((resolve, reject) => {
+      inMemory(IPLDResolver, (error, res) => {
+        if (error) reject(error)
+        else resolve(res)
+      })
+    })
 
     nodePb = dagPB.DAGNode.create(Buffer.from('I am inside a Protobuf'))
     cidPb = await resolver.put(nodePb, multicodec.DAG_PB, { cidVersion: 0 })
@@ -59,7 +65,7 @@ describe('IPLD Resolver for dag-cbor + dag-pb', () => {
       cidVersion: 1,
       hashAlg: multicodec.SHA2_256
     })
-    const result = await resolver.bs._repo.blocks.has(cid)
+    const result = await promisify(resolver.bs._repo.blocks.has)(cid)
     expect(result).to.be.false()
   })
 

test/node.js

@@ -3,20 +3,24 @@
 
 const fs = require('fs-extra')
 const IPFSRepo = require('ipfs-repo')
+const promisify = require('promisify-es6')
 const os = require('os')
 
 describe('Node.js', () => {
   const repoExample = process.cwd() + '/test/example-repo'
   const repoTests = os.tmpdir() + '/t-r-' + Date.now()
   const repo = new IPFSRepo(repoTests)
 
+  const repoOpen = promisify(repo.open.bind(repo))
+  const repoClose = promisify(repo.close.bind(repo))
+
   before(async () => {
     await fs.copy(repoExample, repoTests)
-    await repo.open()
+    await repoOpen()
   })
 
   after(async () => {
-    await repo.close()
+    await repoClose()
     await fs.remove(repoTests)
   })