refactor: use multihashes instead of bs58

Author: dignifiedquire

package.json

@@ -53,6 +53,7 @@
     "aegir": "^8.0.1",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
+    "detect-node": "^2.0.3",
     "execa": "^0.4.0",
     "expose-loader": "^0.7.1",
     "form-data": "^2.0.0",
@@ -74,9 +75,7 @@
     "babel-runtime": "^6.11.6",
     "bl": "^1.1.2",
     "boom": "^4.0.0",
-    "bs58": "^3.0.0",
     "debug": "^2.2.0",
-    "detect-node": "^2.0.3",
     "fs-pull-blob-store": "^0.3.0",
     "glob": "^7.0.6",
     "hapi": "^15.0.3",
@@ -101,7 +100,6 @@
     "lodash.sortby": "^4.7.0",
     "lodash.values": "^4.3.0",
     "mafmt": "^2.1.2",
-    "map-limit": "0.0.1",
     "multiaddr": "^2.0.3",
     "multihashes": "^0.2.2",
     "path-exists": "^3.0.0",
@@ -117,10 +115,6 @@
     "pull-stream-to-stream": "^1.3.3",
     "pull-zip": "^2.0.0",
     "read-pkg-up": "^1.0.1",
-    "run-parallel": "^1.1.6",
-    "run-parallel-limit": "^1.0.3",
-    "run-series": "^1.1.4",
-    "run-waterfall": "^1.1.3",
     "stream-to-pull-stream": "^1.7.0",
     "tar-stream": "^1.5.2",
     "temp": "^0.8.3",

src/cli/commands/block/get.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const utils = require('../../utils')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const debug = require('debug')
 const log = debug('cli:block')
 log.error = debug('cli:block:error')
@@ -19,11 +19,11 @@ module.exports = {
         throw err
       }
 
-      const mh = utils.isDaemonOn()
+      const hash = utils.isDaemonOn()
         ? argv.key
-        : new Buffer(bs58.decode(argv.key))
+        : mh.fromB58String(argv.key)
 
-      ipfs.block.get(mh, (err, block) => {
+      ipfs.block.get(hash, (err, block) => {
         if (err) {
           throw err
         }

src/cli/commands/block/put.js

@@ -1,11 +1,11 @@
 'use strict'
 
 const utils = require('../../utils')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const bl = require('bl')
 const fs = require('fs')
 const Block = require('ipfs-block')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const debug = require('debug')
 const log = debug('cli:block')
 log.error = debug('cli:block:error')
@@ -23,7 +23,7 @@ function addBlock (buf) {
       if (err) {
         throw err
       }
-      console.log(bs58.encode(block.key).toString())
+      console.log(mh.toB58String(block.key))
     })
   })
 }

src/cli/commands/block/rm.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const utils = require('../../utils')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const debug = require('debug')
 const log = debug('cli:block')
 log.error = debug('cli:block:error')
@@ -24,9 +24,7 @@ module.exports = {
         throw new Error('rm block with daemon running is not yet implemented')
       }
 
-      const mh = new Buffer(bs58.decode(argv.key))
-
-      ipfs.block.del(mh, (err) => {
+      ipfs.block.del(mh.fromB58String(argv.key), (err) => {
         if (err) {
           throw err
         }

src/cli/commands/object/get.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const utils = require('../../utils')
 const debug = require('debug')
 const log = debug('cli:object')

src/cli/commands/object/new.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const utils = require('../../utils')
 const debug = require('debug')
 const log = debug('cli:object')

src/cli/commands/object/patch/add-link.js

@@ -4,8 +4,8 @@ const utils = require('../../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
 const mDAG = require('ipfs-merkle-dag')
-const waterfall = require('run-waterfall')
-const parallel = require('run-parallel')
+const waterfall = require('async/waterfall')
+const parallel = require('async/parallel')
 const DAGLink = mDAG.DAGLink
 log.error = debug('cli:object:error')
 

src/cli/commands/object/patch/append-data.js

@@ -3,7 +3,7 @@
 const utils = require('../../../utils')
 const bl = require('bl')
 const fs = require('fs')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')

src/cli/commands/object/patch/rm-link.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const DAGLink = require('ipfs-merkle-dag').DAGLink
 const utils = require('../../../utils')
 const debug = require('debug')

src/cli/commands/object/patch/set-data.js

@@ -3,7 +3,7 @@
 const utils = require('../../../utils')
 const bl = require('bl')
 const fs = require('fs')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')

src/cli/commands/object/put.js

@@ -3,7 +3,7 @@
 const utils = require('../../utils')
 const bl = require('bl')
 const fs = require('fs')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')

src/cli/commands/swarm/disconnect.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const utils = require('../../utils')
-// const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')

src/core/components/files.js

@@ -11,7 +11,7 @@ const pull = require('pull-stream')
 const sort = require('pull-sort')
 const toStream = require('pull-stream-to-stream')
 const toPull = require('stream-to-pull-stream')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 
 module.exports = function files (self) {
   const createAddPullStream = () => {

src/core/components/init.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const peerId = require('peer-id')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 
 const addDefaultAssets = require('./init-assets')
 

src/core/components/load.js

@@ -3,7 +3,7 @@
 const peerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const multiaddr = require('multiaddr')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 
 const utils = require('../utils')
 

src/core/components/object.js

@@ -3,7 +3,7 @@
 const mDAG = require('ipfs-merkle-dag')
 const waterfall = require('async/waterfall')
 const promisify = require('promisify-es6')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const DAGNode = mDAG.DAGNode
 const DAGLink = mDAG.DAGLink
 
@@ -39,7 +39,7 @@ function parseJSONBuffer (buf) {
       return new DAGLink(
         link.Name,
         link.Size,
-        new Buffer(bs58.decode(link.Hash))
+        mh.fromB58String(link.Hash)
       )
     })
     return new DAGNode(new Buffer(parsed.Data), links)

src/http-api/resources/block.js

@@ -3,7 +3,7 @@
 const mh = require('multihashes')
 const multipart = require('ipfs-multipart')
 const Block = require('ipfs-block')
-const waterfall = require('run-waterfall')
+const waterfall = require('async/waterfall')
 const debug = require('debug')
 const log = debug('http-api:block')
 log.error = debug('http-api:block:error')

src/http-api/resources/files.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const multipart = require('ipfs-multipart')
 const debug = require('debug')
 const tar = require('tar-stream')
@@ -22,7 +22,7 @@ exports.parseKey = (request, reply) => {
 
   try {
     return reply({
-      key: new Buffer(bs58.decode(request.query.arg))
+      key: mh.fromB58String(request.query.arg)
     })
   } catch (err) {
     log.error(err)

src/http-api/resources/object.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const multipart = require('ipfs-multipart')
 const mDAG = require('ipfs-merkle-dag')
 const DAGLink = mDAG.DAGLink
-const waterfall = require('run-waterfall')
-const parallel = require('run-parallel')
+const waterfall = require('async/waterfall')
+const parallel = require('async/parallel')
 const debug = require('debug')
 const log = debug('http-api:object')
 log.error = debug('http-api:object:error')
@@ -21,7 +21,7 @@ exports.parseKey = (request, reply) => {
 
   try {
     return reply({
-      key: new Buffer(bs58.decode(request.query.arg))
+      key: mh.fromB58String(request.query.arg)
     })
   } catch (err) {
     log.error(err)
@@ -247,7 +247,8 @@ exports.parseKeyAndData = (request, reply) => {
     try {
       return reply({
         data: file,
-        key: new Buffer(bs58.decode(request.query.arg)) // TODO: support ipfs paths: https://github.com/ipfs/http-api-spec/pull/68/files#diff-2625016b50d68d922257f74801cac29cR3880
+        // TODO: support ipfs paths: https://github.com/ipfs/http-api-spec/pull/68/files#diff-2625016b50d68d922257f74801cac29cR3880
+        key: mh.fromB58String(request.query.arg)
       })
     } catch (err) {
       return reply({
@@ -343,9 +344,9 @@ exports.patchAddLink = {
 
     try {
       return reply({
-        root: new Buffer(bs58.decode(request.query.arg[0])),
+        root: mh.fromB58String(request.query.arg[0]),
         name: request.query.arg[1],
-        ref: new Buffer(bs58.decode(request.query.arg[2]))
+        ref: mh.fromB58String(request.query.arg[2])
       })
     } catch (err) {
       log.error(err)
@@ -411,7 +412,7 @@ exports.patchRmLink = {
 
     try {
       return reply({
-        root: new Buffer(bs58.decode(request.query.arg[0])),
+        root: mh.fromB58String(request.query.arg[0]),
         link: request.query.arg[1]
       })
     } catch (err) {

test/cli/index.js

@@ -9,7 +9,7 @@ const clean = require('../utils/clean')
 
 describe('cli', () => {
   const repoExample = path.join(__dirname, '../go-ipfs-repo')
-  const repoTests = exports.repoPath = path.join(__dirname, '../repo-tests-run-cli')
+  const repoTests = exports.repoPath = path.join(__dirname, '../repo-tests-async/cli')
 
   before((done) => {
     clean(repoTests)

test/core/both/test-bitswap.js

@@ -9,7 +9,7 @@ const waterfall = require('async/waterfall')
 const parallel = require('async/parallel')
 const leftPad = require('left-pad')
 const Block = require('ipfs-block')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const bl = require('bl')
 const API = require('ipfs-api')
 const multiaddr = require('multiaddr')
@@ -170,7 +170,6 @@ describe('bitswap', () => {
           (cb) => inProcNode.block.put(blocks[5], cb),
           // 3. Fetch blocks on all nodes
           (cb) => parallel(_.range(6).map((i) => (cbI) => {
-            const toMh = (k) => bs58.encode(k).toString()
             const check = (n, k, callback) => {
               n.block.get(k, (err, b) => {
                 expect(err).to.not.exist
@@ -184,8 +183,8 @@ describe('bitswap', () => {
             }
 
             series([
-              (cbJ) => check(remoteNodes[0], toMh(keys[i]), cbJ),
-              (cbJ) => check(remoteNodes[1], toMh(keys[i]), cbJ),
+              (cbJ) => check(remoteNodes[0], mh.toB58String(keys[i]), cbJ),
+              (cbJ) => check(remoteNodes[1], mh.toB58String(keys[i]), cbJ),
               (cbJ) => check(inProcNode, keys[i], cbJ)
             ], cbI)
           }), cb)
@@ -213,7 +212,7 @@ describe('bitswap', () => {
           (cb) => node.add([{path: 'awesome.txt', content: file}], cb),
           // 2. Request file from local instance
           (val, cb) => {
-            const hash = bs58.encode(val[0].multihash).toString()
+            const hash = mh.toB58String(val[0].multihash)
 
             inProcNode.files.cat(hash, (err, res) => {
               expect(err).to.not.exist

test/core/node-only/test-swarm.js

@@ -2,7 +2,7 @@
 'use strict'
 
 const expect = require('chai').expect
-const parallel = require('run-parallel')
+const parallel = require('async/parallel')
 
 const createTempNode = require('../../utils/temp-node')
 

test/http-api/index.js

@@ -11,7 +11,7 @@ const clean = require('../utils/clean')
 
 describe('HTTP API', () => {
   const repoExample = path.join(__dirname, '../go-ipfs-repo')
-  const repoTests = path.join(__dirname, '../repo-tests-run-http')
+  const repoTests = path.join(__dirname, '../repo-tests-async/http')
 
   let http = {}
 

test/http-api/inject/test-config.js

@@ -9,7 +9,7 @@ const path = require('path')
 
 module.exports = (http) => {
   describe('/config', () => {
-    const configPath = path.join(__dirname, '../../repo-tests-run-http/config')
+    const configPath = path.join(__dirname, '../../repo-tests-async/http/config')
     const originalConfigPath = path.join(__dirname, '../../go-ipfs-repo/config')
 
     let updatedConfig

test/http-api/ipfs-api/test-config.js

@@ -7,7 +7,7 @@ const path = require('path')
 
 module.exports = (ctl) => {
   describe('.config', () => {
-    const configPath = path.join(__dirname, '../../repo-tests-run-http/config')
+    const configPath = path.join(__dirname, '../../repo-tests-async/http/config')
     let updatedConfig
 
     before(() => {