fix: remove format and/or codec options (#69)

IPFS is all `dag-pb` yet we allow passing `dag-cbor` as the format of IPLD node to use.  This is likely to break anything that uses it as tools expect IPFS stuff to be `dag-pb`, possibly with `raw` leaves.

Closes #67

BREAKING CHANGE:

`--format` and/or `--codec` option has been removed from the CLI, the HTTP API and the core API.

Author: achingbrain

package.json

@@ -73,7 +73,7 @@
     "ipfs-multipart": "^0.3.0",
     "ipfs-unixfs": "^0.3.0",
     "ipfs-unixfs-exporter": "^0.40.0",
-    "ipfs-unixfs-importer": "^0.43.0",
+    "ipfs-unixfs-importer": "^0.43.1",
     "ipfs-utils": "^0.4.2",
     "ipld-dag-pb": "^0.18.0",
     "it-last": "^1.0.1",

src/cli/chmod.js

@@ -27,12 +27,6 @@ module.exports = {
       coerce: asBoolean,
       describe: 'Whether to change modes recursively'
     },
-    codec: {
-      alias: 'c',
-      type: 'string',
-      default: 'dag-pb',
-      describe: 'If intermediate directories are created, use this codec to create them (experimental)'
-    },
     'hash-alg': {
       alias: 'h',
       type: 'string',
@@ -59,7 +53,6 @@ module.exports = {
       mode,
       getIpfs,
       recursive,
-      codec,
       hashAlg,
       flush,
       shardSplitThreshold
@@ -70,7 +63,6 @@ module.exports = {
 
       return ipfs.files.chmod(path, mode, {
         recursive,
-        format: codec,
         hashAlg,
         flush,
         shardSplitThreshold

src/cli/cp.js

@@ -17,12 +17,6 @@ module.exports = {
       coerce: asBoolean,
       describe: 'Create any non-existent intermediate directories'
     },
-    codec: {
-      alias: 'c',
-      type: 'string',
-      default: 'dag-pb',
-      describe: 'If intermediate directories are created, use this codec to create them (experimental)'
-    },
     'hash-alg': {
       alias: 'h',
       type: 'string',
@@ -49,7 +43,6 @@ module.exports = {
       dest,
       getIpfs,
       parents,
-      codec,
       flush,
       hashAlg,
       shardSplitThreshold
@@ -59,7 +52,6 @@ module.exports = {
       const ipfs = await getIpfs()
       return ipfs.files.cp(source, dest, {
         parents,
-        format: codec,
         flush,
         hashAlg,
         shardSplitThreshold

src/cli/mkdir.js

@@ -25,12 +25,6 @@ module.exports = {
       default: 0,
       describe: 'Cid version to use. (experimental).'
     },
-    codec: {
-      alias: 'c',
-      type: 'string',
-      default: 'dag-pb',
-      describe: 'If intermediate directories are created, use this codec to create them (experimental)'
-    },
     'hash-alg': {
       alias: 'h',
       type: 'string',
@@ -67,7 +61,6 @@ module.exports = {
       getIpfs,
       parents,
       cidVersion,
-      codec,
       hashAlg,
       flush,
       shardSplitThreshold,
@@ -81,7 +74,6 @@ module.exports = {
       return ipfs.files.mkdir(path, {
         parents,
         cidVersion,
-        format: codec,
         hashAlg,
         flush,
         shardSplitThreshold,

src/cli/mv.js

@@ -30,12 +30,6 @@ module.exports = {
       default: 0,
       describe: 'Cid version to use. (experimental).'
     },
-    codec: {
-      alias: 'c',
-      type: 'string',
-      default: 'dag-pb',
-      describe: 'If intermediate directories are created, use this codec to create them (experimental)'
-    },
     'hash-alg': {
       alias: 'h',
       type: 'string',
@@ -64,7 +58,6 @@ module.exports = {
       parents,
       recursive,
       cidVersion,
-      codec,
       hashAlg,
       flush,
       shardSplitThreshold
@@ -77,7 +70,6 @@ module.exports = {
         parents,
         recursive,
         cidVersion,
-        format: codec,
         hashAlg,
         flush,
         shardSplitThreshold

src/cli/touch.js

@@ -31,12 +31,6 @@ module.exports = {
       default: 0,
       describe: 'Cid version to use. (experimental).'
     },
-    codec: {
-      alias: 'c',
-      type: 'string',
-      default: 'dag-pb',
-      describe: 'If intermediate directories are created, use this codec to create them (experimental)'
-    },
     'hash-alg': {
       alias: 'h',
       type: 'string',
@@ -56,7 +50,6 @@ module.exports = {
       getIpfs,
       flush,
       cidVersion,
-      codec,
       hashAlg,
       shardSplitThreshold,
       mtime
@@ -69,7 +62,6 @@ module.exports = {
         mtime,
         flush,
         cidVersion,
-        format: codec,
         hashAlg,
         shardSplitThreshold
       })

src/cli/write.js

@@ -78,11 +78,6 @@ module.exports = {
       type: 'string',
       default: 'sha2-256'
     },
-    codec: {
-      alias: ['c'],
-      type: 'string',
-      default: 'dag-pb'
-    },
     'shard-split-threshold': {
       type: 'number',
       default: 1000,
@@ -114,7 +109,6 @@ module.exports = {
       reduceSingleLeafToSelf,
       cidVersion,
       hashAlg,
-      codec,
       parents,
       progress,
       strategy,
@@ -136,7 +130,6 @@ module.exports = {
         reduceSingleLeafToSelf,
         cidVersion,
         hashAlg,
-        format: codec,
         parents,
         progress,
         strategy,

src/core/chmod.js

@@ -16,7 +16,6 @@ const mh = require('multihashes')
 const defaultOptions = {
   flush: true,
   shardSplitThreshold: 1000,
-  format: 'dag-pb',
   hashAlg: 'sha2-256',
   cidVersion: 0,
   recursive: false
@@ -174,7 +173,7 @@ module.exports = (context) => {
 
     const updatedCid = await context.ipld.put(node, mc.DAG_PB, {
       cidVersion: cid.version,
-      hashAlg: mh.names['sha2-256'],
+      hashAlg: mh.names[options.hashAlg],
       onlyHash: !options.flush
     })
 
@@ -188,8 +187,7 @@ module.exports = (context) => {
       cid: updatedCid,
       size: node.serialize().length,
       flush: options.flush,
-      format: 'dag-pb',
-      hashAlg: 'sha2-256',
+      hashAlg: options.hashAlg,
       cidVersion: cid.version
     })
 

src/core/cp.js

@@ -15,7 +15,6 @@ const toTrail = require('./utils/to-trail')
 const defaultOptions = {
   parents: false,
   flush: true,
-  format: 'dag-pb',
   hashAlg: 'sha2-256',
   cidVersion: 0,
   shardSplitThreshold: 1000
@@ -150,7 +149,6 @@ const addSourceToParent = async (context, source, childName, parent, options) =>
     size: sourceBlock.data.length,
     cid: source.cid,
     name: childName,
-    format: options.format,
     hashAlg: options.hashAlg,
     cidVersion: options.cidVersion,
     flush: options.flush

src/core/mkdir.js

@@ -19,7 +19,6 @@ const defaultOptions = {
   hashAlg: 'sha2-256',
   cidVersion: 0,
   shardSplitThreshold: 1000,
-  format: 'dag-pb',
   flush: true,
   mode: null,
   mtime: null
@@ -116,7 +115,6 @@ const addEmptyDir = async (context, childName, emptyDir, parent, trail, options)
     size: emptyDir.node.size,
     cid: emptyDir.cid,
     name: childName,
-    format: options.format,
     hashAlg: options.hashAlg,
     cidVersion: options.cidVersion,
     mode: options.mode,