Merge branch '1.x' into fix/issue#3727

web3 · Oct 7, 2020 · 3979574 · 3979574
2 parents 8fd9632 + 4615f2d
commit 3979574
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/packages/web3-core-requestmanager/src/index.js b/packages/web3-core-requestmanager/src/index.js
@@ -91,7 +91,7 @@ RequestManager.prototype.setProvider = function (provider, net) {
 
 
     // reset the old one before changing, if still connected
-    if(this.provider && this.provider.connected)
+    if (this.provider && this.provider.connected)
         this.clearSubscriptions();
 
     this.provider = provider || null;
@@ -123,17 +123,17 @@ RequestManager.prototype.setProvider = function (provider, net) {
 
         // notify all subscriptions about bad close conditions
         this.provider.on('close', function close(event) {
-            if (!_this._isCleanCloseEvent(event) || _this._isIpcCloseError(event)){
+            if (!_this._isCleanCloseEvent(event) || _this._isIpcCloseError(event)) {
                 _this.subscriptions.forEach(function (subscription) {
                     subscription.callback(errors.ConnectionCloseError(event));
                     _this.subscriptions.delete(subscription.subscription.id);
                 });
 
-                if(_this.provider && _this.provider.emit){
+                if (_this.provider && _this.provider.emit) {
                     _this.provider.emit('error', errors.ConnectionCloseError(event));
                 }
             }
-            if(_this.provider && _this.provider.emit){
+            if (_this.provider && _this.provider.emit) {
                 _this.provider.emit('end', event);
             }
         });
@@ -151,7 +151,7 @@ RequestManager.prototype.setProvider = function (provider, net) {
  * @param {Function} callback
  */
 RequestManager.prototype.send = function (data, callback) {
-    callback = callback || function () {};
+    callback = callback || function () { };
 
     if (!this.provider) {
         return callback(errors.InvalidProvider());
@@ -163,7 +163,7 @@ RequestManager.prototype.send = function (data, callback) {
     const jsonrpcResultCallback = this._jsonrpcResultCallback(callback, jsonrpcPayload)
 
     if (this.provider.request) {
-        const callbackRequest = callbackify(this.provider.request)
+        const callbackRequest = callbackify(this.provider.request.bind(this.provider))
         const requestArgs = { method, params }
         callbackRequest(requestArgs, callback);
     } else if (this.provider.sendAsync) {
@@ -220,7 +220,7 @@ RequestManager.prototype.addSubscription = function (subscription, callback) {
             }
         );
     } else {
-        throw new Error('The provider doesn\'t support subscriptions: '+ this.provider.constructor.name);
+        throw new Error('The provider doesn\'t support subscriptions: ' + this.provider.constructor.name);
     }
 };
 
@@ -273,7 +273,7 @@ RequestManager.prototype.clearSubscriptions = function (keepIsSyncing) {
         }
 
         //  reset notification callbacks etc.
-        if(this.provider.reset)
+        if (this.provider.reset)
             this.provider.reset();
 
         return true
@@ -320,8 +320,8 @@ RequestManager.prototype._isIpcCloseError = function (event) {
  *
  */
 RequestManager.prototype._jsonrpcResultCallback = function (callback, payload) {
-    return function(err, result) { 
-        if(result && result.id && payload.id !== result.id) {
+    return function (err, result) {
+        if (result && result.id && payload.id !== result.id) {
             return callback(new Error(`Wrong response id ${result.id} (expected: ${payload.id}) in ${JSON.stringify(payload)}`));
         }