Skip to content
This repository has been archived by the owner on Mar 10, 2020. It is now read-only.

PUBSUB: unsubscribe without handler reference #940

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion src/pubsub.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/get.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down