fix: don't break backwards compatibility on the Block API

daviddias · daviddias · commit ca59a46a66e4 · 2016-10-21T07:55:41.000+01:00
diff --git a/src/core/components/block.js b/src/core/components/block.js
@@ -19,6 +19,12 @@ module.exports = function block (self) {
         block = new Block(block)
       }
 
+      if (typeof cid === 'function') {
+        // legacy (without CID)
+        callback = cid
+        cid = new CID(block.key('sha2-256'))
+      }
+
       self._blockService.put({
         block: block,
         cid: cid
@@ -47,8 +53,10 @@ module.exports = function block (self) {
 }
 
 function cleanCid (cid) {
-  if (typeof cid === 'string') {
-    return new CID(cid)
+  if (cid.constructor.name === 'CID') {
+    return cid
   }
-  return cid
+
+  // CID constructor knows how to do the cleaning :)
+  return new CID(cid)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,12 @@ module.exports = function block (self) {`
`19`	`19`	`block = new Block(block)`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ if (typeof cid === 'function') {`
	`23`	`+ // legacy (without CID)`
	`24`	`+ callback = cid`
	`25`	`+ cid = new CID(block.key('sha2-256'))`
	`26`	`+ }`
	`27`	`+`
`22`	`28`	`self._blockService.put({`
`23`	`29`	`block: block,`
`24`	`30`	`cid: cid`
`@@ -47,8 +53,10 @@ module.exports = function block (self) {`
`47`	`53`	`}`
`48`	`54`
`49`	`55`	`function cleanCid (cid) {`
`50`		`- if (typeof cid === 'string') {`
`51`		`- return new CID(cid)`
	`56`	`+ if (cid.constructor.name === 'CID') {`
	`57`	`+ return cid`
`52`	`58`	`}`
`53`		`- return cid`
	`59`	`+`
	`60`	`+ // CID constructor knows how to do the cleaning :)`
	`61`	`+ return new CID(cid)`
`54`	`62`	`}`