fix: choose import strategy in ipfs.add (#2541)

* fix: choose import strategy in ipfs.add

The interface spec says you should pass a `trickle` boolean to
`ipfs.add` to get a trickle DAG, this PR makes us actually do that
instead of passing `strategy: 'whatever'`.

* fix: remove trickle arg before passing to importer

Author: achingbrain

src/cli/commands/add.js

@@ -113,7 +113,7 @@ module.exports = {
     argv.resolve((async () => {
       const ipfs = await argv.getIpfs()
       const options = {
-        strategy: argv.trickle ? 'trickle' : 'balanced',
+        trickle: argv.trickle,
         shardSplitThreshold: argv.enableShardingExperiment
           ? argv.shardSplitThreshold
           : Infinity,

src/core/components/files-regular/add-async-iterator.js

@@ -21,6 +21,7 @@ module.exports = function (self) {
         ? 1000
         : Infinity
     }, options, {
+      strategy: 'balanced',
       chunker: chunkerOptions.chunker,
       chunkerOptions: chunkerOptions.chunkerOptions
     })
@@ -30,6 +31,12 @@ module.exports = function (self) {
       opts.cidVersion = 1
     }
 
+    if (opts.trickle) {
+      opts.strategy = 'trickle'
+    }
+
+    delete opts.trickle
+
     let total = 0
 
     const prog = opts.progress || noop

src/http/api/resources/files-regular.js

@@ -219,7 +219,7 @@ exports.add = {
           wrapWithDirectory: request.query['wrap-with-directory'],
           pin: request.query.pin,
           chunker: request.query.chunker,
-          strategy: request.query.trickle ? 'trickle' : 'balanced',
+          trickle: request.query.trickle,
           preload: request.query.preload
         })
       },