Faster tests

src/cli/commands/bitswap/stat.js

@@ -1,8 +1,5 @@
 'use strict'
 
-const CID = require('cids')
-const print = require('../../utils').print
-
 module.exports = {
   command: 'stat',
 
@@ -11,6 +8,9 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const CID = require('cids')
+    const print = require('../../utils').print
+
     argv.ipfs.bitswap.stat((err, stats) => {
       if (err) {
         throw err

src/cli/commands/bitswap/wantlist.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const print = require('../../utils').print
-
 module.exports = {
   command: 'wantlist',
 
@@ -16,6 +14,8 @@ module.exports = {
   },
 
   handler (argv) {
+    const print = require('../../utils').print
+
     // TODO: handle argv.peer
     argv.ipfs.bitswap.wantlist((err, res) => {
       if (err) {

src/cli/commands/block/get.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const CID = require('cids')
-
 module.exports = {
   command: 'get <key>',
 
@@ -10,6 +8,7 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const CID = require('cids')
     const cid = new CID(argv.key)
 
     argv.ipfs.block.get(cid, (err, block) => {

src/cli/commands/block/put.js

@@ -1,36 +1,5 @@
 'use strict'
 
-const CID = require('cids')
-const multihashing = require('multihashing-async')
-const bl = require('bl')
-const fs = require('fs')
-const Block = require('ipfs-block')
-const waterfall = require('async/waterfall')
-const print = require('../../utils').print
-
-function addBlock (data, opts) {
-  const ipfs = opts.ipfs
-  let cid
-
-  waterfall([
-    (cb) => multihashing(data, opts.mhtype || 'sha2-256', cb),
-    (multihash, cb) => {
-      if (opts.format !== 'dag-pb' || opts.version !== 0) {
-        cid = new CID(1, opts.format || 'dag-pb', multihash)
-      } else {
-        cid = new CID(0, 'dag-pb', multihash)
-      }
-
-      ipfs.block.put(new Block(data, cid), cb)
-    }
-  ], (err) => {
-    if (err) {
-      throw err
-    }
-    print(cid.toBaseEncodedString())
-  })
-}
-
 module.exports = {
   command: 'put [block]',
 
@@ -58,6 +27,37 @@ module.exports = {
   },
 
   handler (argv) {
+    const CID = require('cids')
+    const multihashing = require('multihashing-async')
+    const bl = require('bl')
+    const fs = require('fs')
+    const Block = require('ipfs-block')
+    const waterfall = require('async/waterfall')
+    const print = require('../../utils').print
+
+    function addBlock (data, opts) {
+      const ipfs = opts.ipfs
+      let cid
+
+      waterfall([
+        (cb) => multihashing(data, opts.mhtype || 'sha2-256', cb),
+        (multihash, cb) => {
+          if (opts.format !== 'dag-pb' || opts.version !== 0) {
+            cid = new CID(1, opts.format || 'dag-pb', multihash)
+          } else {
+            cid = new CID(0, 'dag-pb', multihash)
+          }
+
+          ipfs.block.put(new Block(data, cid), cb)
+        }
+      ], (err) => {
+        if (err) {
+          throw err
+        }
+        print(cid.toBaseEncodedString())
+      })
+    }
+
     if (argv.block) {
       const buf = fs.readFileSync(argv.block)
       return addBlock(buf, argv)

src/cli/commands/block/rm.js

@@ -1,9 +1,5 @@
 'use strict'
 
-const utils = require('../../utils')
-const mh = require('multihashes')
-const print = utils.print
-
 module.exports = {
   command: 'rm <key>',
 
@@ -12,6 +8,9 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const utils = require('../../utils')
+    const print = utils.print
+    const mh = require('multihashes')
     if (utils.isDaemonOn()) {
       // TODO implement this once `js-ipfs-api` supports it
       throw new Error('rm block with daemon running is not yet implemented')

src/cli/commands/block/stat.js

@@ -1,8 +1,5 @@
 'use strict'
 
-const CID = require('cids')
-const print = require('../../utils').print
-
 module.exports = {
   command: 'stat <key>',
 
@@ -11,6 +8,8 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const CID = require('cids')
+    const print = require('../../utils').print
     argv.ipfs.block.stat(new CID(argv.key), (err, stats) => {
       if (err) {
         throw err

src/cli/commands/bootstrap/add.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const print = require('../../utils').print
-
 module.exports = {
   command: 'add [<peer>]',
 
@@ -16,6 +14,8 @@ module.exports = {
   },
 
   handler (argv) {
+    const print = require('../../utils').print
+
     argv.ipfs.bootstrap.add(argv.peer, {
       default: argv.default
     }, (err, list) => {

src/cli/commands/bootstrap/list.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const print = require('../../utils').print
-
 module.exports = {
   command: 'list',
 
@@ -10,6 +8,8 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const print = require('../../utils').print
+
     argv.ipfs.bootstrap.list((err, list) => {
       if (err) {
         throw err

src/cli/commands/bootstrap/rm.js

@@ -1,10 +1,5 @@
 'use strict'
 
-const debug = require('debug')
-const log = debug('cli:bootstrap')
-log.error = debug('cli:bootstrap:error')
-const print = require('../../utils').print
-
 module.exports = {
   command: 'rm [<peer>]',
 
@@ -19,6 +14,11 @@ module.exports = {
   },
 
   handler (argv) {
+    const debug = require('debug')
+    const log = debug('cli:bootstrap')
+    log.error = debug('cli:bootstrap:error')
+    const print = require('../../utils').print
+
     argv.ipfs.bootstrap.rm(argv.peer, {
       all: argv.all
     }, (err, list) => {

src/cli/commands/commands.js

@@ -1,14 +1,14 @@
 'use strict'
-const print = require('../utils').print
-const path = require('path')
-const glob = require('glob').sync
 
 module.exports = {
   command: 'commands',
 
   describe: 'List all available commands',
 
   handler () {
+    const print = require('../utils').print
+    const path = require('path')
+    const glob = require('glob').sync
     const basePath = path.resolve(__dirname, '..')
 
     // modeled after https://github.com/vdemedes/ronin/blob/master/lib/program.js#L78

src/cli/commands/config.js

@@ -1,6 +1,4 @@
 'use strict'
-const print = require('../utils').print
-
 module.exports = {
   command: 'config <key> [value]',
 
@@ -24,6 +22,8 @@ module.exports = {
   },
 
   handler (argv) {
+    const print = require('../utils').print
+
     if (argv._handled) {
       return
     }

src/cli/commands/config/edit.js

@@ -1,12 +1,5 @@
 'use strict'
 
-const spawn = require('child_process').spawn
-const fs = require('fs')
-const temp = require('temp')
-const waterfall = require('async/waterfall')
-
-const utils = require('../../utils')
-
 module.exports = {
   command: 'edit',
 
@@ -15,6 +8,12 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const spawn = require('child_process').spawn
+    const fs = require('fs')
+    const temp = require('temp')
+    const waterfall = require('async/waterfall')
+
+    const utils = require('../../utils')
     if (argv._handled) return
     argv._handled = true
 

src/cli/commands/config/replace.js

@@ -1,9 +1,5 @@
 'use strict'
 
-const path = require('path')
-const fs = require('fs')
-const utils = require('../../utils')
-
 module.exports = {
   command: 'replace <file>',
 
@@ -12,6 +8,10 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const path = require('path')
+    const fs = require('fs')
+    const utils = require('../../utils')
+
     if (argv._handled) return
     argv._handled = true
 

src/cli/commands/config/show.js

@@ -1,10 +1,5 @@
 'use strict'
 
-const debug = require('debug')
-const log = debug('cli:config')
-log.error = debug('cli:config:error')
-const print = require('../../utils').print
-
 module.exports = {
   command: 'show',
 
@@ -13,6 +8,11 @@ module.exports = {
   builder: {},
 
   handler (argv) {
+    const debug = require('debug')
+    const log = debug('cli:config')
+    log.error = debug('cli:config:error')
+    const print = require('../../utils').print
+
     if (argv._handled) return
     argv._handled = true
 

src/cli/commands/daemon.js

@@ -1,11 +1,8 @@
 'use strict'
 
-const HttpAPI = require('../../http')
 const utils = require('../utils')
 const print = utils.print
 
-let httpAPI
-
 module.exports = {
   command: 'daemon',
 
@@ -29,10 +26,11 @@ module.exports = {
   },
 
   handler (argv) {
+    const HttpAPI = require('../../http')
     print('Initializing daemon...')
 
     const repoPath = utils.getRepoPath()
-    httpAPI = new HttpAPI(process.env.IPFS_PATH, null, argv)
+    const httpAPI = new HttpAPI(process.env.IPFS_PATH, null, argv)
 
     httpAPI.start((err) => {
       if (err && err.code === 'ENOENT' && err.message.match(/Uninitalized repo/i)) {

src/cli/commands/dag/get.js

@@ -1,8 +1,5 @@
 'use strict'
 
-const CID = require('cids')
-const print = require('../../utils').print
-
 module.exports = {
   command: 'get <cid path>',
 
@@ -16,6 +13,9 @@ module.exports = {
   },
 
   handler (argv) {
+    const CID = require('cids')
+    const print = require('../../utils').print
+
     const refParts = argv.cidpath.split('/')
     const cidString = refParts[0]
     const path = refParts.slice(1).join('/')

src/cli/commands/dns.js

@@ -1,6 +1,4 @@
 'use strict'
-const print = require('../utils').print
-
 module.exports = {
   command: 'dns <domain>',
 
@@ -13,6 +11,8 @@ module.exports = {
   },
 
   handler (argv) {
+    const print = require('../utils').print
+
     argv.ipfs.dns(argv['domain'], (err, path) => {
       if (err) {
         throw err