WebsocketProvider, AbstractSocketProvider, and AbstractSubscription e…

…vent handling updated
web3 · May 31, 2019 · 39f0be2 · boomfly · May 31, 2019 · boomfly
1 parent 1dd6536
commit 39f0be2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/packages/web3-core-subscriptions/lib/subscriptions/AbstractSubscription.js b/packages/web3-core-subscriptions/lib/subscriptions/AbstractSubscription.js
@@ -54,8 +54,7 @@ export default class AbstractSubscription extends EventEmitter {
      *
      * @param {AbstractWeb3Module} moduleInstance
      */
-    beforeSubscription(moduleInstance) {
-    }
+    beforeSubscription(moduleInstance) { }
 
     /**
      * This method will be executed on each new subscription item.
@@ -164,7 +163,7 @@ export default class AbstractSubscription extends EventEmitter {
             .then((response) => {
                 if (!response) {
                     const error = new Error('Error on unsubscribe!');
-                    if (isFunction(callback)) {
+                    if (callback) {
                         callback(error, null);
                     }
 
@@ -177,7 +176,7 @@ export default class AbstractSubscription extends EventEmitter {
                 this.id = null;
                 this.removeAllListeners();
 
-                if (isFunction(callback)) {
+                if (callback) {
                     callback(false, true);
                 }
 

diff --git a/packages/web3-providers/lib/providers/AbstractSocketProvider.js b/packages/web3-providers/lib/providers/AbstractSocketProvider.js
@@ -165,8 +165,6 @@ export default class AbstractSocketProvider extends EventEmitter {
     onError(error) {
         this.emit(this.ERROR, error);
         this.emit(this.SOCKET_ERROR, error);
-        this.removeAllSocketListeners();
-        this.removeAllListeners();
     }
 
     /**

diff --git a/packages/web3-providers/src/providers/WebsocketProvider.js b/packages/web3-providers/src/providers/WebsocketProvider.js
@@ -241,14 +241,6 @@ export default class WebsocketProvider extends AbstractSocketProvider {
                     .then(resolve)
                     .catch(reject);
             });
-        }).then((response) => {
-            this.removeListener('error', reject);
-
-            return response;
-        }).catch((error) => {
-            this.removeListener('error', reject);
-
-            throw error;
         });
     }
 }