Add test for add with --hash option. Pass raw cid/multihash to ipfs object get/data

Author: alanshaw

src/files/add.js

@@ -30,7 +30,7 @@ module.exports = (send) => {
     }
 
     if (opts['raw-leaves'] != null) {
-      qs['raw-leaves'] = opts['raw-version']
+      qs['raw-leaves'] = opts['raw-leaves']
     } else if (opts.rawLeaves != null) {
       qs['raw-leaves'] = opts.rawLeaves
     }

src/utils/get-dagnode.js

@@ -2,22 +2,16 @@
 
 const DAGNode = require('ipld-dag-pb').DAGNode
 const parallel = require('async/parallel')
-const CID = require('cids')
-const mh = require('multihashes')
 const streamToValue = require('./stream-to-value')
 
 module.exports = function (send, hash, callback) {
-  // Until js-ipfs supports object/get and object/data by CID
-  // we need to convert our CID or multihash hash into a multihash
-  const multihash = mh.toB58String(new CID(hash).multihash)
-
   // Retrieve the object and its data in parallel, then produce a DAGNode
   // instance using this information.
   parallel([
     function get (done) {
       send({
         path: 'object/get',
-        args: multihash
+        args: hash
       }, done)
     },
 
@@ -27,7 +21,7 @@ module.exports = function (send, hash, callback) {
       // See https://github.com/ipfs/go-ipfs/issues/1582 for more details.
       send({
         path: 'object/data',
-        args: multihash
+        args: hash
       }, done)
     }],
 

test/files.spec.js

@@ -8,13 +8,27 @@ const expect = chai.expect
 chai.use(dirtyChai)
 const isNode = require('detect-node')
 const loadFixture = require('aegir/fixtures')
+const mh = require('multihashes')
+const CID = require('cids')
 
 const FactoryClient = require('./ipfs-factory/client')
 
 const testfile = isNode
   ? loadFixture(__dirname, '/fixtures/testfile.txt')
   : loadFixture(__dirname, 'fixtures/testfile.txt')
 
+// TODO: Test against all algorithms Object.keys(mh.names)
+// This subset is known to work with both go-ipfs and js-ipfs as of 2017-09-05
+const HASH_ALGS = [
+  'sha1',
+  'sha2-256',
+  'sha2-512',
+  'keccak-224',
+  'keccak-256',
+  'keccak-384',
+  'keccak-512'
+]
+
 describe('.files (the MFS API part)', () => {
   let ipfs
   let fc
@@ -59,6 +73,25 @@ describe('.files (the MFS API part)', () => {
       })
     })
 
+    HASH_ALGS.forEach((name) => {
+      it(`files.add with hash=${name} and raw-leaves=false`, (done) => {
+        const content = String(Math.random() + Date.now())
+        const file = {
+          path: content + '.txt',
+          content: Buffer.from(content)
+        }
+        const options = { hash: name, 'raw-leaves': false }
+
+        ipfs.files.add([file], options, (err, res) => {
+          if (err) return done(err)
+          expect(res).to.have.length(1)
+          const cid = new CID(res[0].hash)
+          expect(mh.decode(cid.multihash).name).to.equal(name)
+          done()
+        })
+      })
+    })
+
     it('files.mkdir', (done) => {
       ipfs.files.mkdir('/test-folder', done)
     })
@@ -196,6 +229,24 @@ describe('.files (the MFS API part)', () => {
         })
     })
 
+    HASH_ALGS.forEach((name) => {
+      it(`files.add with hash=${name} and raw-leaves=false`, () => {
+        const content = String(Math.random() + Date.now())
+        const file = {
+          path: content + '.txt',
+          content: Buffer.from(content)
+        }
+        const options = { hash: name, 'raw-leaves': false }
+
+        return ipfs.files.add([file], options)
+          .then((res) => {
+            expect(res).to.have.length(1)
+            const cid = new CID(res[0].hash)
+            expect(mh.decode(cid.multihash).name).to.equal(name)
+          })
+      })
+    })
+
     it('files.mkdir', () => {
       return ipfs.files.mkdir('/test-folder')
     })