chore: address review comments

Author: dirkmc

package.json

@@ -148,6 +148,7 @@
     "multicodec": "~0.5.1",
     "multihashes": "~0.4.14",
     "multihashing-async": "~0.6.0",
+    "nanoid": "^2.0.3",
     "node-fetch": "^2.3.0",
     "p-event": "^4.1.0",
     "peer-book": "~0.9.0",

src/core/components/pin/gc-lock.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert')
 const mortice = require('mortice')
+const nanoid = require('nanoid')
 const pull = require('pull-stream/pull')
 const pullThrough = require('pull-stream/throughs/through')
 const pullAsyncMap = require('pull-stream/throughs/async-map')
@@ -15,7 +16,7 @@ class GCLock extends EventEmitter {
     // Ensure that we get a different mutex for each instance of GCLock
     // (There should only be one GCLock instance per IPFS instance, but
     // there may be multiple IPFS instances, eg in unit tests)
-    const randId = (~~(Math.random() * 1e9)).toString(36) + Date.now()
+    const randId = nanoid()
     this.mutex = mortice(randId, {
       singleProcess: repoOwner
     })

src/core/components/pin/gc.js

@@ -22,7 +22,7 @@ module.exports = function gc (self) {
 
     self._gcLock.writeLock((lockCb) => {
       parallel([
-        // Get all blocks from the blockstore
+        // Get all blocks keys from the blockstore
         (cb) => self._repo.blocks.query({ keysOnly: true }, cb),
         // Mark all blocks that are being used
         (cb) => createMarkedSet(self, cb)

test/core/gc.spec.js

@@ -7,10 +7,10 @@ const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
 
-const isNode = require('detect-node')
+const IPFSFactory = require('ipfsd-ctl')
 const pEvent = require('p-event')
+const env = require('ipfs-utils/src/env')
 const IPFS = require('../../src/core')
-const createTempRepo = require('../utils/create-repo-nodejs')
 
 describe('gc', function () {
   const fixtures = [{
@@ -27,28 +27,34 @@ describe('gc', function () {
     content: Buffer.from('path4')
   }]
 
+  let ipfsd
   let ipfs
-  let repo
 
   before(function (done) {
-    this.timeout(20 * 1000)
-    repo = createTempRepo()
+    this.timeout(40 * 1000)
+
+    const factory = IPFSFactory.create({ type: 'proc', exec: IPFS })
+
     let config = { Bootstrap: [] }
-    if (isNode) {
+    if (env.isNode) {
       config.Addresses = {
         Swarm: ['/ip4/127.0.0.1/tcp/0']
       }
     }
-    ipfs = new IPFS({ repo, config })
-    ipfs.on('ready', done)
-  })
 
-  after(function (done) {
-    this.timeout(60 * 1000)
-    ipfs.stop(done)
+    factory.spawn({ config }, (err, node) => {
+      expect(err).to.not.exist()
+
+      ipfsd = node
+      ipfs = ipfsd.api
+
+      done()
+    })
   })
 
-  after((done) => repo.teardown(done))
+  after((done) => {
+    ipfsd.stop(done)
+  })
 
   const blockAddTests = [{
     name: 'add',