dedupe tests

package.json

@@ -84,7 +84,7 @@
     "cross-env": "^6.0.0",
     "detect-node": "^2.0.4",
     "go-ipfs-dep": "^0.4.22",
-    "interface-ipfs-core": "~0.125.0",
+    "interface-ipfs-core": "github:ipfs/interface-js-ipfs-core#fix/dedupe",
     "ipfsd-ctl": "^1.0.0",
     "ndjson": "^1.5.0",
     "nock": "^11.4.0",

src/dag/get.js

@@ -1,5 +1,6 @@
 'use strict'
-
+const CID = require('cids')
+const errCode = require('err-code')
 const dagPB = require('ipld-dag-pb')
 const dagCBOR = require('ipld-dag-cbor')
 const raw = require('ipld-raw')
@@ -11,18 +12,58 @@ const resolvers = {
   raw: raw.resolver
 }
 
+// TODO this function needs to be extracted and re-used by ipfs-http-client and ipfs
+function parseArgs (cid, path, options) {
+  options = options || {}
+
+  // Allow options in path position
+  if (path !== undefined && typeof path !== 'string') {
+    options = path
+    path = undefined
+  }
+
+  if (typeof cid === 'string') {
+    if (cid.startsWith('/ipfs/')) {
+      cid = cid.substring(6)
+    }
+
+    const split = cid.split('/')
+
+    try {
+      cid = new CID(split[0])
+    } catch (err) {
+      throw errCode(err, 'ERR_INVALID_CID')
+    }
+
+    split.shift()
+
+    if (split.length > 0) {
+      path = split.join('/')
+    } else {
+      path = path || '/'
+    }
+  } else if (Buffer.isBuffer(cid)) {
+    try {
+      cid = new CID(cid)
+    } catch (err) {
+      throw errCode(err, 'ERR_INVALID_CID')
+    }
+  }
+
+  return [
+    cid,
+    path,
+    options
+  ]
+}
+
 module.exports = config => {
   const getBlock = require('../block/get')(config)
   const dagResolve = require('./resolve')(config)
 
   return configure(({ ky }) => {
     return async (cid, path, options) => {
-      if (typeof path === 'object') {
-        options = path
-        path = null
-      }
-
-      options = options || {}
+      [cid, path, options] = parseArgs(cid, path, options)
 
       const resolved = await dagResolve(cid, path, options)
       const block = await getBlock(resolved.cid, options)