fix: apply CR

ipfs · Nov 25, 2016 · 698f708 · 698f708
1 parent 3bb3ba8
commit 698f708
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/src/cli/commands/object/get.js b/src/cli/commands/object/get.js
@@ -16,10 +16,7 @@ module.exports = {
   handler (argv) {
     waterfall([
       (cb) => utils.getIPFS(cb),
-      (ipfs, cb) => ipfs.object.get(
-        argv.key,
-        { enc: 'base58' },
-        cb)
+      (ipfs, cb) => ipfs.object.get(argv.key, {enc: 'base58'}, cb)
     ], (err, node) => {
       if (err) {
         throw err

diff --git a/src/http-api/resources/object.js b/src/http-api/resources/object.js
@@ -6,7 +6,6 @@ const dagPB = require('ipld-dag-pb')
 const DAGLink = dagPB.DAGLink
 const DAGNode = dagPB.DAGNode
 const waterfall = require('async/waterfall')
-const parallel = require('async/parallel')
 const series = require('async/series')
 const debug = require('debug')
 const log = debug('http-api:object')
@@ -472,16 +471,12 @@ exports.patchAddLink = {
       }
 
       waterfall([
-        (cb) => parallel([
-          (cb) => {
-            cb(null, linkedObj.size)
-          },
-          (cb) => {
-            cb(null, linkedObj.multihash)
-          }
-        ], cb),
-        (stats, cb) => {
-          cb(null, new DAGLink(name, stats[0], stats[1]))
+        (cb) => {
+          const link = new DAGLink(
+            name,
+            linkedObj.size,
+            linkedObj.multihash)
+          cb(null, link)
         },
         (link, cb) => ipfs.object.patch.addLink(root, link, cb)
       ], (err, node) => {

diff --git a/test/http-api/ipfs-api/test-object.js b/test/http-api/ipfs-api/test-object.js
@@ -77,7 +77,6 @@ module.exports = (ctl) => {
 
         ctl.object.put(filePath, {enc: 'json'}, asJson((err, res) => {
           expect(err).not.to.exist
-          console.log(res)
           expect(res).to.eql(expectedResult)
           done()
         }))