Replace noop by safetyCatch where relevant (#466)

Author: HDegroote

index.js

@@ -9,6 +9,7 @@ const NoiseSecretStream = require('@hyperswarm/secret-stream')
 const Protomux = require('protomux')
 const z32 = require('z32')
 const id = require('hypercore-id-encoding')
+const safetyCatch = require('safety-catch')
 const { createTracer } = require('hypertrace')
 
 const Replicator = require('./lib/replicator')
@@ -92,7 +93,7 @@ module.exports = class Hypercore extends EventEmitter {
     this._active = opts.active !== false
 
     this.opening = this._openSession(key, storage, opts)
-    this.opening.catch(noop)
+    this.opening.catch(safetyCatch)
   }
 
   [inspect] (depth, opts) {
@@ -972,7 +973,7 @@ module.exports = class Hypercore extends EventEmitter {
     const req = this._download(range)
 
     // do not crash in the background...
-    req.catch(noop)
+    req.catch(safetyCatch)
 
     return new Download(req)
   }
@@ -1127,8 +1128,6 @@ module.exports = class Hypercore extends EventEmitter {
   }
 }
 
-function noop () {}
-
 function isStream (s) {
   return typeof s === 'object' && s && typeof s.pipe === 'function'
 }

lib/batch.js

@@ -2,6 +2,7 @@ const { BLOCK_NOT_AVAILABLE, SESSION_CLOSED } = require('hypercore-errors')
 const EventEmitter = require('events')
 const c = require('compact-encoding')
 const b4a = require('b4a')
+const safetyCatch = require('safety-catch')
 
 module.exports = class HypercoreBatch extends EventEmitter {
   constructor (session, checkoutLength, autoClose, restore, clear) {
@@ -28,7 +29,7 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this._clear = clear
 
     this.opening = this._open()
-    this.opening.catch(noop)
+    this.opening.catch(safetyCatch)
   }
 
   get id () {
@@ -404,5 +405,3 @@ module.exports = class HypercoreBatch extends EventEmitter {
     this.fork = 0
   }
 }
-
-function noop () {}

lib/replicator.js

@@ -2012,7 +2012,7 @@ module.exports = class Replicator {
   }
 
   _closeSession (session) {
-    session.close().catch(noop)
+    session.close().catch(safetyCatch)
   }
 
   attached (protomux) {

test/basic.js

@@ -101,7 +101,7 @@ test(
   function (t) {
     const key = b4a.alloc(33).fill('a')
 
-    const core = new Hypercore(RAM, key, { crypto: {} })
+    const core = new Hypercore(RAM, key, { crypto: { discoveryKey: () => key } })
 
     t.is(core.key, key)
     t.pass('creating a core with more than 32 byteLength key did not throw')
@@ -335,9 +335,6 @@ test('key is set sync', async function (t) {
 
   t.alike((new Hypercore(RAM, { key })).key, key)
   t.is((new Hypercore(RAM, { })).key, null)
-
-  t.alike((new Hypercore({ key })).key, key)
-  t.is((new Hypercore({ })).key, null)
 })
 
 test('disable writable option', async function (t) {