Use multihashes for sanitization.

hackergrrl · hackergrrl · commit 641a8a11ae1a · 2016-08-04T08:16:36.000-07:00
diff --git a/package.json b/package.json
@@ -37,7 +37,6 @@
     "aegir": "^4.0.0",
     "async": "^1.5.2",
     "block-stream2": "^1.1.0",
-    "bs58": "^3.0.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "concat-stream": "^1.5.1",
@@ -61,6 +60,7 @@
     "ipfs-unixfs": "^0.1.0",
     "is-ipfs": "^0.2.0",
     "isstream": "^0.1.2",
+    "multihashes": "^0.2.2",
     "readable-stream": "^1.1.13",
     "run-series": "^1.1.4",
     "streamifier": "^0.1.1",
diff --git a/src/clean-multihash.js b/src/clean-multihash.js
@@ -1,14 +1,14 @@
 'use strict'
 
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const isIPFS = require('is-ipfs')
 
 module.exports = function (multihash) {
   if (!isIPFS.multihash(multihash)) {
     throw new Error('not valid multihash')
   }
   if (Buffer.isBuffer(multihash)) {
-    return bs58.encode(multihash)
+    return mh.toB58String(multihash)
   }
   return multihash
 }

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`'use strict'`
`2`	`2`
`3`		`-const bs58 = require('bs58')`
	`3`	`+const mh = require('multihashes')`
`4`	`4`	`const isIPFS = require('is-ipfs')`
`5`	`5`
`6`	`6`	`module.exports = function (multihash) {`
`7`	`7`	`if (!isIPFS.multihash(multihash)) {`
`8`	`8`	`throw new Error('not valid multihash')`
`9`	`9`	`}`
`10`	`10`	`if (Buffer.isBuffer(multihash)) {`
`11`		`- return bs58.encode(multihash)`
	`11`	`+ return mh.toB58String(multihash)`
`12`	`12`	`}`
`13`	`13`	`return multihash`
`14`	`14`	`}`