fix some more tests

Author: dignifiedquire

src/exporter.js

@@ -2,6 +2,7 @@
 
 const traverse = require('pull-traverse')
 const pull = require('pull-stream')
+const isIPFS = require('is-ipfs')
 
 const util = require('./util')
 const switchType = util.switchType
@@ -11,11 +12,11 @@ const dirExporter = require('./exporters/dir')
 const fileExporter = require('./exporters/file')
 
 module.exports = (hash, dagService, 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/tree.js

@@ -34,9 +34,9 @@ module.exports = (files, dagService, source, cb) => {
     if (splitted[0] === '') {
       splitted = splitted.slice(1)
     }
-    var tmpTree = fileTree
+    let tmpTree = fileTree
 
-    for (var i = 0; i < splitted.length; i++) {
+    for (let i = 0; i < splitted.length; i++) {
       if (!tmpTree[splitted[i]]) {
         tmpTree[splitted[i]] = {}
       }
@@ -73,15 +73,12 @@ module.exports = (files, dagService, source, cb) => {
   //   Once finished, add the result as a link to the dir node
   // If the value is not an object
   //   add as a link to the dirNode
-
-  let pendingWrites = 0
-
   function traverse (tree, path, done) {
     const keys = Object.keys(tree)
 
     mapValues(tree, (node, key, cb) => {
       if (typeof node === 'object' && !Buffer.isBuffer(node)) {
-        traverse.call(this, node, path ? `${path}/${key}` : key, cb)
+        traverse(node, path ? `${path}/${key}` : key, cb)
       } else {
         cb(null, node)
       }
@@ -107,9 +104,7 @@ module.exports = (files, dagService, source, cb) => {
 
       n.data = d.marshal()
 
-      pendingWrites++
       dagService.put(n, (err) => {
-        pendingWrites--
         if (err) {
           source.push(new Error('failed to store dirNode'))
         } else if (path) {
@@ -124,10 +119,7 @@ module.exports = (files, dagService, source, cb) => {
             })
           })
         }
-
-        if (pendingWrites <= 0) {
-          finish()
-        }
+        finish()
       })
 
       function finish () {

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)
   }