fix: allow CID inputs to Object API

License: MIT
Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>

src/object/addLink.js

@@ -2,10 +2,9 @@
 
 const promisify = require('promisify-es6')
 const CID = require('cids')
-const cleanMultihash = require('../utils/clean-multihash')
 
 module.exports = (send) => {
-  return promisify((multihash, dLink, opts, callback) => {
+  return promisify((cid, dLink, opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = {}
@@ -15,17 +14,17 @@ module.exports = (send) => {
     }
 
     try {
-      multihash = cleanMultihash(multihash, opts)
+      cid = new CID(cid)
     } catch (err) {
       return callback(err)
     }
 
     send({
       path: 'object/patch/add-link',
       args: [
-        multihash,
+        cid.toString(),
         dLink.name,
-        cleanMultihash(dLink.cid.buffer)
+        dLink.cid.toString()
       ]
     }, (err, result) => {
       if (err) {

src/object/appendData.js

@@ -3,13 +3,12 @@
 const promisify = require('promisify-es6')
 const once = require('once')
 const CID = require('cids')
-const cleanMultihash = require('../utils/clean-multihash')
 const SendOneFile = require('../utils/send-one-file')
 
 module.exports = (send) => {
   const sendOneFile = SendOneFile(send, 'object/patch/append-data')
 
-  return promisify((multihash, data, opts, _callback) => {
+  return promisify((cid, data, opts, _callback) => {
     if (typeof opts === 'function') {
       _callback = opts
       opts = {}
@@ -20,12 +19,12 @@ module.exports = (send) => {
     }
 
     try {
-      multihash = cleanMultihash(multihash, opts)
+      cid = new CID(cid)
     } catch (err) {
       return callback(err)
     }
 
-    sendOneFile(data, { args: [multihash] }, (err, result) => {
+    sendOneFile(data, { args: [cid.toString()] }, (err, result) => {
       if (err) {
         return callback(err)
       }

src/object/get.js

@@ -4,7 +4,6 @@ const promisify = require('promisify-es6')
 const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
 const DAGLink = dagPB.DAGLink
-const bs58 = require('bs58')
 const CID = require('cids')
 const LRU = require('lru-cache')
 const lruOptions = {

src/object/links.js

@@ -3,7 +3,7 @@
 const promisify = require('promisify-es6')
 const dagPB = require('ipld-dag-pb')
 const DAGLink = dagPB.DAGLink
-const cleanMultihash = require('../utils/clean-multihash')
+const CID = require('cids')
 const LRU = require('lru-cache')
 const lruOptions = {
   max: 128
@@ -12,7 +12,7 @@ const lruOptions = {
 const cache = new LRU(lruOptions)
 
 module.exports = (send) => {
-  return promisify((multihash, options, callback) => {
+  return promisify((cid, options, callback) => {
     if (typeof options === 'function') {
       callback = options
       options = {}
@@ -22,20 +22,20 @@ module.exports = (send) => {
     }
 
     try {
-      multihash = cleanMultihash(multihash, options)
+      cid = new CID(cid)
     } catch (err) {
       return callback(err)
     }
 
-    const node = cache.get(multihash)
+    const node = cache.get(cid.toString())
 
     if (node) {
       return callback(null, node.links)
     }
 
     send({
       path: 'object/links',
-      args: multihash
+      args: cid.toString()
     }, (err, result) => {
       if (err) {
         return callback(err)
@@ -44,9 +44,7 @@ module.exports = (send) => {
       let links = []
 
       if (result.Links) {
-        links = result.Links.map((l) => {
-          return new DAGLink(l.Name, l.Size, l.Hash)
-        })
+        links = result.Links.map((l) => new DAGLink(l.Name, l.Size, l.Hash))
       }
       callback(null, links)
     })

src/object/rmLink.js

@@ -2,10 +2,9 @@
 
 const promisify = require('promisify-es6')
 const CID = require('cids')
-const cleanMultihash = require('../utils/clean-multihash')
 
 module.exports = (send) => {
-  return promisify((multihash, dLink, opts, callback) => {
+  return promisify((cid, dLink, opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = {}
@@ -15,15 +14,15 @@ module.exports = (send) => {
     }
 
     try {
-      multihash = cleanMultihash(multihash, opts)
+      cid = new CID(cid)
     } catch (err) {
       return callback(err)
     }
 
     send({
       path: 'object/patch/rm-link',
       args: [
-        multihash,
+        cid.toString(),
         dLink.name
       ]
     }, (err, result) => {

src/object/setData.js

@@ -3,13 +3,12 @@
 const promisify = require('promisify-es6')
 const once = require('once')
 const CID = require('cids')
-const cleanMultihash = require('../utils/clean-multihash')
 const SendOneFile = require('../utils/send-one-file')
 
 module.exports = (send) => {
   const sendOneFile = SendOneFile(send, 'object/patch/set-data')
 
-  return promisify((multihash, data, opts, _callback) => {
+  return promisify((cid, data, opts, _callback) => {
     if (typeof opts === 'function') {
       _callback = opts
       opts = {}
@@ -20,12 +19,12 @@ module.exports = (send) => {
     }
 
     try {
-      multihash = cleanMultihash(multihash, opts)
+      cid = new CID(cid)
     } catch (err) {
       return callback(err)
     }
 
-    sendOneFile(data, { args: [multihash] }, (err, result) => {
+    sendOneFile(data, { args: [cid.toString()] }, (err, result) => {
       if (err) {
         return callback(err)
       }

src/object/stat.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const promisify = require('promisify-es6')
-const cleanMultihash = require('../utils/clean-multihash')
+const CID = require('cids')
 
 module.exports = (send) => {
-  return promisify((multihash, opts, callback) => {
+  return promisify((cid, opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = {}
@@ -14,14 +14,14 @@ module.exports = (send) => {
     }
 
     try {
-      multihash = cleanMultihash(multihash, opts)
+      cid = new CID(cid)
     } catch (err) {
       return callback(err)
     }
 
     send({
       path: 'object/stat',
-      args: multihash
+      args: cid.toString()
     }, callback)
   })
 }