tests: get interface-ipfs-core tests in

Author: daviddias

package.json

@@ -88,11 +88,13 @@
     "ipfs-repo": "^0.11.1",
     "ipfs-unixfs": "^0.1.8",
     "ipfs-unixfs-engine": "^0.14.0",
+    "ipld-dag-cbor": "^0.8.2",
+    "ipld-dag-pb": "^0.9.3",
     "ipld-resolver": "^0.3.0",
     "isstream": "^0.1.2",
     "joi": "^10.0.1",
-    "libp2p-ipfs-nodejs": "^0.16.0",
     "libp2p-ipfs-browser": "^0.17.0",
+    "libp2p-ipfs-nodejs": "^0.16.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
@@ -149,4 +151,4 @@
     "nginnever <[email protected]>",
     "npmcdn-to-unpkg-bot <[email protected]>"
   ]
-}
+}

src/core/components/dag.js

@@ -1,44 +1,38 @@
 'use strict'
 
 const promisify = require('promisify-es6')
-// const dagPB = require('ipld-dag-pb')
-// const dagCBOR = require('ipld-dag-cbor')
-
-// const CID = require('cids')
-// const mh = require('multihashes')
+const dagPB = require('ipld-dag-pb')
+const dagCBOR = require('ipld-dag-cbor')
 
 module.exports = function dag (self) {
   return {
     put: promisify((dagNode, multicodec, hashAlg, callback) => {
-      // TODO
-      // serialize
-      // get right hash
-      // generate cid
-      // put in IPLD Resolver
-
-      /*
-      self._ipldResolver.put({
-        node: node,
-        cid: new CID(node.multihash)
-      }
-      */
       switch (multicodec) {
-        case 'dag-pb': {} break
-        case 'dag-cbor': {} break
-        default:
-          callback(new Error('IPLD Format not supported'))
+        case 'dag-pb': dagPB.util.cid(dagNode, gotCid); break
+        case 'dag-cbor': dagCBOR.util.cid(dagNode, gotCid); break
+        default: callback(new Error('IPLD Format not supported'))
+      }
+
+      function gotCid (err, cid) {
+        if (err) {
+          return callback(err)
+        }
+        self._ipldResolver.put({
+          node: dagNode,
+          cid: cid
+        }, callback)
       }
     }),
     get: promisify((cid, callback) => {
-      self.ipldResolver.get(cid, callback)
+      self._ipldResolver.get(cid, callback)
     }),
     rm: promisify((cid, callback) => {
       // TODO once pinning is complete, this remove operation has to first
       // verify that some pinning chain is not broken with the operation
-      self.ipldResolver.remove(cid, callback)
+      self._ipldResolver.remove(cid, callback)
     }),
     resolve: promisify((cid, path, callback) => {
-      self.ipldResolver.resolve(cid, path, callback)
+      self._ipldResolver.resolve(cid, path, callback)
     })
   }
 }

src/core/index.js

@@ -18,6 +18,7 @@ const bootstrap = require('./components/bootstrap')
 const config = require('./components/config')
 const block = require('./components/block')
 const object = require('./components/object')
+const dag = require('./components/dag')
 const libp2p = require('./components/libp2p')
 const swarm = require('./components/swarm')
 const ping = require('./components/ping')
@@ -62,6 +63,7 @@ function IPFS (repoInstance) {
   this.config = config(this)
   this.block = block(this)
   this.object = object(this)
+  this.dag = dag(this)
   this.libp2p = libp2p(this)
   this.swarm = swarm(this)
   this.files = files(this)

test/core/both/index.js

@@ -2,12 +2,13 @@
 'use strict'
 
 describe('--both', () => {
-  require('./test-bitswap')
   require('./test-block')
   require('./test-bootstrap')
   require('./test-config')
   require('./test-files')
   require('./test-generic')
   require('./test-init')
   require('./test-object')
+  require('./test-dag')
+  require('./test-bitswap')
 })