code cleanup and pin utils tests

JonKrone · Feb 24, 2018 · 40cf00f · 40cf00f
1 parent f5a05fe
commit 40cf00f
Show file tree

Hide file tree

Showing 10 changed files with 281 additions and 156 deletions.
diff --git a/src/cli/commands/pin/add.js b/src/cli/commands/pin/add.js
@@ -18,7 +18,7 @@ module.exports = {
     const paths = argv['ipfs-path'].split(' ')
     const recursive = argv.recursive
     const type = recursive ? 'recursive' : 'direct'
-    argv.ipfs.pin.add(paths[0], { recursive }, (err, results) => {
+    argv.ipfs.pin.add(paths[0], { recursive: recursive }, (err, results) => {
       if (err) { throw err }
       results.forEach((res) => {
         console.log(`pinned ${res.hash} ${type}ly`)

diff --git a/src/cli/commands/pin/ls.js b/src/cli/commands/pin/ls.js
@@ -29,7 +29,7 @@ module.exports = {
     const paths = argv.path && argv.path.split(' ')
     const type = argv.type
     const quiet = argv.quiet
-    argv.ipfs.pin.ls(paths, { type }, (err, results) => {
+    argv.ipfs.pin.ls(paths, { type: type }, (err, results) => {
       if (err) { throw err }
       results.forEach((res) => {
         let line = res.hash

diff --git a/src/cli/commands/pin/rm.js b/src/cli/commands/pin/rm.js
@@ -17,7 +17,7 @@ module.exports = {
   handler: (argv) => {
     const paths = argv['ipfs-path'].split(' ')
     const recursive = argv.recursive
-    argv.ipfs.pin.rm(paths, { recursive }, (err, results) => {
+    argv.ipfs.pin.rm(paths, { recursive: recursive }, (err, results) => {
       if (err) { throw err }
       results.forEach((res) => {
         console.log(`unpinned ${res.hash}`)

diff --git a/src/core/components/dag.js b/src/core/components/dag.js
@@ -77,7 +77,8 @@ module.exports = function dag (self) {
       )
     }),
 
-    getRecursive: promisify((multihash, callback) => {
+    // TODO - move to IPLD resolver and generalize to other IPLD formats
+    _getRecursive: promisify((multihash, callback) => {
       // gets flat array of all DAGNodes in tree given by multihash
       callback = once(callback)
       self.dag.get(new CID(multihash), (err, res) => {
@@ -90,7 +91,7 @@ module.exports = function dag (self) {
         }
         // branch case
         links.forEach(link => {
-          self.dag.getRecursive(link.multihash, (err, subNodes) => {
+          self.dag._getRecursive(link.multihash, (err, subNodes) => {
             if (err) { return callback(err) }
             nodes.push(subNodes)
             if (nodes.length === links.length + 1) {

diff --git a/src/core/components/pin-set.js b/src/core/components/pin-set.js
@@ -65,7 +65,6 @@ exports = module.exports = function (dag) {
     hasChild: (root, childhash, callback, _links, _checked, _seen) => {
       // callback (err, has)
       callback = once(callback)
-      if (callback.called) { return }
       if (typeof childhash === 'object') {
         childhash = toB58String(childhash)
       }
@@ -83,9 +82,7 @@ exports = module.exports = function (dag) {
           return callback(null, true)
         }
         dag.get(new CID(link.multihash), (err, res) => {
-          if (err) {
-            return callback(err)
-          }
+          if (err) { return callback(err) }
           // don't check the same links twice
           if (bs58link in _seen) { return }
           _seen[bs58link] = true
@@ -180,15 +177,9 @@ exports = module.exports = function (dag) {
           hashed[h].push(items[i])
         }
         const storeItemsCb = (err, child) => {
-          if (callback.called) { return }
-          if (err) {
-            return callback(err)
-          }
+          if (err) { return callback(err) }
           dag.put(child, (err) => {
-            if (callback.called) { return }
-            if (err) {
-              return callback(err)
-            }
+            if (err) { return callback(err) }
             logInternalKey(child.multihash)
             rootLinks[this.h] = new DAGLink(
               '', child.size, child.multihash
@@ -203,19 +194,18 @@ exports = module.exports = function (dag) {
             }
           })
         }
-        _subcalls += Object.keys(hashed).length
-        for (let h in hashed) {
-          if (hashed.hasOwnProperty(h)) {
-            pinSet.storeItems(
-              hashed[h],
-              logInternalKey,
-              storeItemsCb.bind({h: h}),
-              _depth + 1,
-              _subcalls,
-              _done
-            )
-          }
-        }
+        const hashedKeys = Object.keys(hashed)
+        _subcalls += hashedKeys.length
+        hashedKeys.forEach(h => {
+          pinSet.storeItems(
+            hashed[h],
+            logInternalKey,
+            storeItemsCb.bind({h: h}),
+            _depth + 1,
+            _subcalls,
+            _done
+          )
+        })
       }
     },