Fix unsubscribe and add a test (#4058)

Co-authored-by: Alex <alex@chainsafe.io> Co-authored-by: Wyatt Barnes <wyatt@writerof.software>
web3 · Sep 8, 2021 · 37d3f7a · 37d3f7a
1 parent 1547b18
commit 37d3f7a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/web3-core-subscriptions/src/subscription.js b/packages/web3-core-subscriptions/src/subscription.js
@@ -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) {
@@ -310,6 +309,7 @@ Subscription.prototype.subscribe = function() {
                     _this.emit('error', error);
                 }
             });
+            _this.emit('connected', result);
         } else {
             setTimeout(function(){
                 _this.callback(err, false, _this);

diff --git a/test/eth.subscribe.ganache.js b/test/eth.subscribe.ganache.js
@@ -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