refactor: use new block interface

Author: dignifiedquire

package.json

@@ -5,15 +5,15 @@
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
-    "test": "aegir-test",
+    "test": "PHANTOM=off aegir-test",
     "test:node": "aegir-test node",
-    "test:browser": "aegir-test browser",
+    "test:browser": "PHANTOM=off aegir-test browser",
     "build": "aegir-build",
-    "coverage": "aegir-coverage",
     "lint": "aegir-lint",
-    "release": "aegir-release",
-    "release-minor": "aegir-release --type minor",
-    "release-major": "aegir-release --type major",
+    "release": "PHANTOM=off aegir-release",
+    "release-minor": "PHANTOM=off aegir-release --type minor",
+    "release-major": "PHANTOM=off aegir-release --type major",
+    "coverage": "aegir-coverage",
     "coverage-publish": "aegir-coverage publish"
   },
   "repository": {
@@ -42,6 +42,7 @@
     "rimraf": "^2.5.4"
   },
   "dependencies": {
+    "async": "^2.0.1",
     "babel-runtime": "^6.11.6",
     "base32.js": "^0.1.0",
     "ipfs-block": "^0.3.0",
@@ -50,8 +51,6 @@
     "pull-defer": "^0.2.2",
     "pull-stream": "^3.4.5",
     "pull-write": "^1.1.0",
-    "run-parallel": "^1.1.6",
-    "run-series": "^1.1.4",
     "safe-buffer": "^5.0.1"
   },
   "license": "MIT",
@@ -67,4 +66,4 @@
     "nginnever <[email protected]>",
     "npmcdn-to-unpkg-bot <[email protected]>"
   ]
-}
+}

src/stores/blockstore.js

@@ -6,7 +6,7 @@ const Lock = require('lock')
 const base32 = require('base32.js')
 const path = require('path')
 const write = require('pull-write')
-const parallel = require('run-parallel')
+const parallel = require('async/parallel')
 const defer = require('pull-defer/source')
 
 const PREFIX_LENGTH = 5
@@ -63,9 +63,13 @@ exports.setUp = (basePath, BlobStore, locks) => {
               return deferred.abort(err)
             }
 
-            deferred.resolve(pull.values([
-              new Block(Buffer.concat(data), ext)
-            ]))
+            Block.create(Buffer.concat(data), ext, (err, block) => {
+              if (err) {
+                return deferred.abort(err)
+              }
+
+              deferred.resolve(pull.values([block]))
+            })
           }))
         )
       })

src/stores/config.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const pull = require('pull-stream')
-const series = require('run-series')
+const series = require('async/series')
 
 exports = module.exports
 

src/stores/locks.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const pull = require('pull-stream')
-const series = require('run-series')
+const series = require('async/series')
 
 exports = module.exports
 

src/stores/version.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const pull = require('pull-stream')
-const series = require('run-series')
+const series = require('async/series')
 const toBuffer = require('safe-buffer').Buffer.from
 
 exports = module.exports

test/blockstore-test.js

@@ -5,18 +5,40 @@ const expect = require('chai').expect
 const Block = require('ipfs-block')
 const mh = require('multihashes')
 const pull = require('pull-stream')
-const parallel = require('run-parallel')
+const parallel = require('async/parallel')
+const waterfall = require('async/waterfall')
+const map = require('async/map')
 const _ = require('lodash')
 
 module.exports = (repo) => {
   describe('blockstore', () => {
     const helloKey = 'CIQLS/CIQLSTJHXGJU2PQIUUXFFV62PWV7VREE57RXUU4A52IIR55M4LX432I.data'
     const helloIpldKey = 'CIQO2/CIQO2EUTF47PSTAHSL54KUTDS2AAN2DH4URM7H5KRATUGQFCM4OUIQI.ipld'
-    const blockCollection = _.range(100).map((i) => new Block(new Buffer(`hello-${i}-${Math.random()}`)))
+    let blockCollection
+    let b
+    let ipldBlock
 
     describe('.putStream', () => {
+      before((done) => {
+        parallel([
+          (cb) => map(_.range(100), (i, cb) => {
+            Block.create(`hello-${i}-${Math.random()}`, cb)
+          }, cb),
+          (cb) => Block.create('hello world', cb),
+          (cb) => Block.create('hello world 2', 'ipld', cb)
+        ], (err, results) => {
+          if (err) {
+            return done(err)
+          }
+
+          blockCollection = results[0]
+          b = results[1]
+          ipldBlock = results[2]
+          done()
+        })
+      })
+
       it('simple', (done) => {
-        const b = new Block('hello world')
         pull(
           pull.values([b]),
           repo.blockstore.putStream(),
@@ -29,8 +51,6 @@ module.exports = (repo) => {
       })
 
       it('multi write (locks)', (done) => {
-        const b = new Block('hello world')
-
         let i = 0
         const finish = (err, meta) => {
           expect(err).to.not.exist
@@ -68,9 +88,8 @@ module.exports = (repo) => {
       })
 
       it('custom extension', function (done) {
-        const b = new Block('hello world 2', 'ipld')
         pull(
-          pull.values([b]),
+          pull.values([ipldBlock]),
           repo.blockstore.putStream(),
           pull.collect((err, meta) => {
             expect(err).to.not.exist
@@ -94,8 +113,6 @@ module.exports = (repo) => {
 
     describe('.getStream', () => {
       it('simple', (done) => {
-        const b = new Block('hello world')
-
         pull(
           repo.blockstore.getStream(b.key),
           pull.collect((err, data) => {
@@ -122,13 +139,11 @@ module.exports = (repo) => {
       })
 
       it('custom extension', (done) => {
-        const b = new Block('hello world 2', 'ipld')
-
         pull(
-          repo.blockstore.getStream(b.key, b.extension),
+          repo.blockstore.getStream(ipldBlock.key, ipldBlock.extension),
           pull.collect((err, data) => {
             expect(err).to.not.exist
-            expect(data[0]).to.be.eql(b)
+            expect(data[0]).to.be.eql(ipldBlock)
 
             done()
           })
@@ -148,8 +163,6 @@ module.exports = (repo) => {
 
     describe('.has', () => {
       it('existing block', (done) => {
-        const b = new Block('hello world')
-
         repo.blockstore.has(b.key, (err, exists) => {
           expect(err).to.not.exist
           expect(exists).to.equal(true)
@@ -158,8 +171,6 @@ module.exports = (repo) => {
       })
 
       it('with extension', (done) => {
-        const b = new Block('hello world')
-
         repo.blockstore.has(b.key, 'data', (err, exists) => {
           expect(err).to.not.exist
           expect(exists).to.equal(true)
@@ -168,9 +179,10 @@ module.exports = (repo) => {
       })
 
       it('non existent block', (done) => {
-        const b = new Block('wooot')
-
-        repo.blockstore.has(b.key, (err, exists) => {
+        waterfall([
+          (cb) => Block.create('wooot', cb),
+          (block, cb) => repo.blockstore.has(block.key, cb)
+        ], (err, exists) => {
           expect(err).to.not.exist
           expect(exists).to.equal(false)
           done()
@@ -180,8 +192,6 @@ module.exports = (repo) => {
 
     describe('.delete', () => {
       it('simple', (done) => {
-        const b = new Block('hello world')
-
         repo.blockstore.delete(b.key, (err) => {
           expect(err).to.not.exist
 
@@ -194,16 +204,17 @@ module.exports = (repo) => {
       })
 
       it('custom extension', (done) => {
-        const b = new Block('hello world', 'ipld')
-
-        repo.blockstore.delete(b.key, b.extension, (err) => {
-          expect(err).to.not.exist
-
-          repo.blockstore.has(b.key, b.extension, (err, exists) => {
+        waterfall([
+          (cb) => Block.create('hello world', 'ipld', cb),
+          (block, cb) => repo.blockstore.delete(block.key, block.extension, (err) => {
             expect(err).to.not.exist
-            expect(exists).to.equal(false)
-            done()
-          })
+            cb(null, block)
+          }),
+          (block, cb) => repo.blockstore.has(block.key, block.extension, cb)
+        ], (err, exists) => {
+          expect(err).to.not.exist
+          expect(exists).to.equal(false)
+          done()
         })
       })
     })

test/browser.js

@@ -2,7 +2,7 @@
 
 'use strict'
 
-const series = require('run-series')
+const series = require('async/series')
 const Store = require('idb-pull-blob-store')
 const _ = require('lodash')
 const pull = require('pull-stream')

test/repo-test.js

@@ -2,7 +2,7 @@
 'use strict'
 
 const expect = require('chai').expect
-const series = require('run-series')
+const series = require('async/series')
 
 const Repo = require('../src/index')