From 3bf32308b06b2ecaa4d80f8a326ac0a7d2a1f194 Mon Sep 17 00:00:00 2001 From: Isan-Rivkin Date: Thu, 21 Feb 2019 12:47:34 +0200 Subject: [PATCH 1/3] chore: unsubscribe with no handler --- src/pubsub.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pubsub.js b/src/pubsub.js index f539d0e3a..6b298351d 100644 --- a/src/pubsub.js +++ b/src/pubsub.js @@ -77,7 +77,11 @@ module.exports = (arg) => { return setImmediate(() => callback(err)) } - ps.removeListener(topic, handler) + if (!handler && !callback) { + ps.removeAllListeners(topic) + } else { + ps.removeListener(topic, handler) + } // Drop the request once we are actually done if (ps.listenerCount(topic) === 0) { From 1449b2ed86b577fbef1ef9a476ea54a950fc784b Mon Sep 17 00:00:00 2001 From: Isan-Rivkin Date: Tue, 26 Feb 2019 12:04:23 +0200 Subject: [PATCH 2/3] chore: update interface-ipfs-core version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a16e7896e..a14884b08 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "dirty-chai": "^2.0.1", "eslint-plugin-react": "^7.11.1", "go-ipfs-dep": "~0.4.18", - "interface-ipfs-core": "~0.96.0", + "interface-ipfs-core": "~0.98.0", "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl", "nock": "^10.0.2", "pull-stream": "^3.6.9", From e1994f8bbc6f41616bb24bb3b1f197b79c8fb646 Mon Sep 17 00:00:00 2001 From: Isan-Rivkin Date: Wed, 27 Feb 2019 00:02:28 +0200 Subject: [PATCH 3/3] test: fixed path to interface-ipfs-core --- .aegir.js | 2 +- test/get.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.aegir.js b/.aegir.js index bbe8a75e9..51aedf024 100644 --- a/.aegir.js +++ b/.aegir.js @@ -12,7 +12,7 @@ module.exports = { }, karma: { files: [{ - pattern: 'node_modules/interface-ipfs-core/js/test/fixtures/**/*', + pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*', watched: false, served: true, included: false diff --git a/test/get.spec.js b/test/get.spec.js index c789ce971..2c5adb6d9 100644 --- a/test/get.spec.js +++ b/test/get.spec.js @@ -23,7 +23,7 @@ describe('.get (specific go-ipfs features)', function () { const smallFile = { cid: 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', - data: fixture('js/test/fixtures/testfile.txt') + data: fixture('test/fixtures/testfile.txt') } let ipfsd