Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unsubscribe and add a test #4058

Merged
merged 3 commits into from
Sep 8, 2021
Merged

Fix unsubscribe and add a test #4058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f655de
Fix unsubscribe and add a test
samlior May 11, 2021
ad4fd1d
Merge branch '1.x' into 1.x
May 27, 2021
f273752
Merge branch '1.x' into 1.x
spacesailor24 Sep 7, 2021
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 packages/web3-core-subscriptions/src/subscription.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ Subscription.prototype.subscribe = function() {
if(!err && result) {
_this.id = result;
_this.method = payload.params[0];
_this.emit('connected', result);

// call callback on notifications
_this.options.requestManager.addSubscription(_this, function(error, result) {
Expand Down Expand Up @@ -310,6 +309,7 @@ Subscription.prototype.subscribe = function() {
_this.emit('error', error);
}
});
_this.emit('connected', result);
} else {
setTimeout(function(){
_this.callback(err, false, _this);
Expand Down
12 changes: 12 additions & 0 deletions test/eth.subscribe.ganache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ describe('subscription connect/reconnect', function () {
});
});

it('unsubscribe should remove the subscription object from the subscriptions and send eth_unsubscribe to the node', function (done) {
subscription = web3.eth
.subscribe('newBlockHeaders')
.on('connected', function () {
const id = subscription.id;
assert(subscription.options.requestManager.subscriptions.has(id));
subscription.unsubscribe(); // Send eth_unsubscribe to the node
assert(!subscription.options.requestManager.subscriptions.has(id));
done();
});
});

it('clearSubscriptions', async function() {
web3.eth.subscribe('newBlockHeaders');
await waitSeconds(1); // Sub need a little time to set up
Expand Down