fix: updates ipld-dag-pb dep to version without .cid properties (#388)

ipfs-inactive · Nov 12, 2018 · b8f7b9a · b8f7b9a
1 parent 8483084
commit b8f7b9a
Show file tree

Hide file tree

Showing 14 changed files with 549 additions and 312 deletions.
diff --git a/js/src/dag/get.js b/js/src/dag/get.js
@@ -46,7 +46,7 @@ module.exports = (createCommon, options) => {
         (cb) => {
           const someData = Buffer.from('some other data')
 
-          pbNode = DAGNode.create(someData, (err, node) => {
+          DAGNode.create(someData, (err, node) => {
             expect(err).to.not.exist()
             pbNode = node
             cb()

diff --git a/js/src/dag/put.js b/js/src/dag/put.js
@@ -41,7 +41,7 @@ module.exports = (createCommon, options) => {
     before((done) => {
       const someData = Buffer.from('some data')
 
-      pbNode = DAGNode.create(someData, (err, node) => {
+      DAGNode.create(someData, (err, node) => {
         expect(err).to.not.exist()
         pbNode = node
         done()

diff --git a/js/src/object/data.js b/js/src/object/data.js
@@ -1,9 +1,13 @@
 /* eslint-env mocha */
+/* eslint-disable max-nested-callbacks */
 'use strict'
 
 const bs58 = require('bs58')
 const hat = require('hat')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
+const {
+  calculateCid
+} = require('../utils/dag-pb')
 
 module.exports = (createCommon, options) => {
   const describe = getDescribe(options)
@@ -41,36 +45,40 @@ module.exports = (createCommon, options) => {
       ipfs.object.put(testObj, (err, node) => {
         expect(err).to.not.exist()
 
-        ipfs.object.data(node.multihash, (err, data) => {
+        calculateCid(node, (err, nodeCid) => {
           expect(err).to.not.exist()
 
-          // because js-ipfs-api can't infer
-          // if the returned Data is Buffer or String
-          if (typeof data === 'string') {
-            data = Buffer.from(data)
-          }
-          expect(node.data).to.eql(data)
-          done()
+          ipfs.object.data(nodeCid, (err, data) => {
+            expect(err).to.not.exist()
+
+            // because js-ipfs-api can't infer
+            // if the returned Data is Buffer or String
+            if (typeof data === 'string') {
+              data = Buffer.from(data)
+            }
+            expect(node.data).to.eql(data)
+            done()
+          })
         })
       })
     })
 
-    it('should get data by multihash (promised)', () => {
+    it('should get data by multihash (promised)', async () => {
       const testObj = {
         Data: Buffer.from(hat()),
         Links: []
       }
 
-      return ipfs.object.put(testObj).then((node) => {
-        return ipfs.object.data(node.multihash).then((data) => {
-          // because js-ipfs-api can't infer
-          // if the returned Data is Buffer or String
-          if (typeof data === 'string') {
-            data = Buffer.from(data)
-          }
-          expect(node.data).to.deep.equal(data)
-        })
-      })
+      const node = await ipfs.object.put(testObj)
+      const nodeCid = await calculateCid(node)
+      let data = await ipfs.object.data(nodeCid)
+
+      // because js-ipfs-api can't infer
+      // if the returned Data is Buffer or String
+      if (typeof data === 'string') {
+        data = Buffer.from(data)
+      }
+      expect(node.data).to.deep.equal(data)
     })
 
     it('should get data by base58 encoded multihash', (done) => {
@@ -82,16 +90,20 @@ module.exports = (createCommon, options) => {
       ipfs.object.put(testObj, (err, node) => {
         expect(err).to.not.exist()
 
-        ipfs.object.data(bs58.encode(node.multihash), { enc: 'base58' }, (err, data) => {
+        calculateCid(node, (err, nodeCid) => {
           expect(err).to.not.exist()
 
-          // because js-ipfs-api can't infer
-          // if the returned Data is Buffer or String
-          if (typeof data === 'string') {
-            data = Buffer.from(data)
-          }
-          expect(node.data).to.eql(data)
-          done()
+          ipfs.object.data(bs58.encode(nodeCid.buffer), { enc: 'base58' }, (err, data) => {
+            expect(err).to.not.exist()
+
+            // because js-ipfs-api can't infer
+            // if the returned Data is Buffer or String
+            if (typeof data === 'string') {
+              data = Buffer.from(data)
+            }
+            expect(node.data).to.eql(data)
+            done()
+          })
         })
       })
     })
@@ -105,16 +117,20 @@ module.exports = (createCommon, options) => {
       ipfs.object.put(testObj, (err, node) => {
         expect(err).to.not.exist()
 
-        ipfs.object.data(bs58.encode(node.multihash).toString(), { enc: 'base58' }, (err, data) => {
+        calculateCid(node, (err, nodeCid) => {
           expect(err).to.not.exist()
 
-          // because js-ipfs-api can't infer if the
-          // returned Data is Buffer or String
-          if (typeof data === 'string') {
-            data = Buffer.from(data)
-          }
-          expect(node.data).to.eql(data)
-          done()
+          ipfs.object.data(bs58.encode(nodeCid.buffer).toString(), { enc: 'base58' }, (err, data) => {
+            expect(err).to.not.exist()
+
+            // because js-ipfs-api can't infer if the
+            // returned Data is Buffer or String
+            if (typeof data === 'string') {
+              data = Buffer.from(data)
+            }
+            expect(node.data).to.eql(data)
+            done()
+          })
         })
       })
     })