Merge branch '1.x' into alex/remove-underscore

web3 · May 17, 2021 · d3f8358 · d3f8358
2 parents a69b9f6 + 49b0130
commit d3f8358
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/packages/web3-eth/src/index.js b/packages/web3-eth/src/index.js
@@ -280,6 +280,8 @@ var Eth = function Eth() {
 
  this.clearSubscriptions = _this._requestManager.clearSubscriptions.bind(_this._requestManager);
 
+ this.removeSubscriptionById = _this._requestManager.removeSubscription.bind(_this._requestManager);
+
  // add net
  this.net = new Net(this);
  // add chain detection

diff --git a/test/eth.subscribe.ganache.js b/test/eth.subscribe.ganache.js
@@ -63,6 +63,33 @@ describe('subscription connect/reconnect', function () {
  assert.equal(0, web3.eth._requestManager.subscriptions.size);
  });
 
+ it('unsubscribes given an id', async function ( ) {
+ subscription = web3.eth.subscribe('newBlockHeaders');
+ await waitSeconds(1);
+
+ assert.equal(1, web3.eth._requestManager.subscriptions.size);
+ web3.eth.removeSubscriptionById(subscription.id)
+
+ assert.equal(0, web3.eth._requestManager.subscriptions.size);
+
+ })
+
+ it('unsubscribes given an id with multiple subscriptions', async function () {
+
+ subscription = web3.eth.subscribe('newBlockHeaders');
+ subscription2 = web3.eth.subscribe("logs");
+ await waitSeconds(1);
+
+ assert.equal(2, web3.eth._requestManager.subscriptions.size);
+
+ web3.eth.removeSubscriptionById(subscription.id);
+ assert.equal(1, web3.eth._requestManager.subscriptions.size);
+
+ web3.eth.removeSubscriptionById(subscription2.id);
+ assert.equal(0, web3.eth._requestManager.subscriptions.size);
+
+ })
+
  it('resubscribes to an existing subscription', function (done) {
  this.timeout(5000);