fix some more tests

Author: dignifiedquire

src/exporter/index.js

@@ -2,7 +2,11 @@
 
 const traverse = require('pull-traverse')
 const pull = require('pull-stream')
+<<<<<<< HEAD:src/exporter/index.js
 const CID = require('cids')
+=======
+const isIPFS = require('is-ipfs')
+>>>>>>> fix some more tests:src/exporter.js
 
 const util = require('./../util')
 const switchType = util.switchType
@@ -12,12 +16,11 @@ const dirExporter = require('./dir')
 const fileExporter = require('./file')
 
 module.exports = (hash, ipldResolver, options) => {
-  try {
-    hash = cleanMultihash(hash)
-  } catch (err) {
-    return pull.error(err)
+  if (!isIPFS.multihash(hash)) {
+    return pull.error(new Error('not valid multihash'))
   }
 
+  hash = cleanMultihash(hash)
   options = options || {}
 
   function visitor (item) {

src/importer.js

@@ -28,9 +28,14 @@ module.exports = (dagService, options) => {
     null,
     100,
     (err) => {
-      if (err) return source.end(err)
+      if (err) {
+        return source.end(err)
+      }
 
-      createAndStoreTree(files, dagService, source, () => {
+      createAndStoreTree(files, dagService, source, (err) => {
+        if (err) {
+          return source.end(err)
+        }
         source.end()
       })
     }

src/util.js

@@ -3,7 +3,6 @@
 const UnixFS = require('ipfs-unixfs')
 const pull = require('pull-stream')
 const mh = require('multihashes')
-const isIPFS = require('is-ipfs')
 const parallel = require('async/parallel')
 
 exports.switchType = (node, dirHandler, fileHandler) => {
@@ -17,10 +16,6 @@ exports.switchType = (node, dirHandler, fileHandler) => {
 }
 
 exports.cleanMultihash = (multihash) => {
-  if (!isIPFS.multihash(multihash)) {
-    throw new Error('not valid multihash')
-  }
-
   if (Buffer.isBuffer(multihash)) {
     return mh.toB58String(multihash)
   }