Fix ganache errors for Unit Tests

web3 · Nov 9, 2020 · 252097c · 252097c
1 parent c0f5edf
commit 252097c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/packages/web3-core-requestmanager/src/index.js b/packages/web3-core-requestmanager/src/index.js
@@ -122,7 +122,7 @@ RequestManager.prototype.setProvider = function (provider, net) {
         });
 
         // notify all subscriptions about bad close conditions
-        this.provider.on('disconnect', function close(event) {
+        const disconnect = function disconnect(event) {
             if (!_this._isCleanCloseEvent(event) || _this._isIpcCloseError(event)) {
                 _this.subscriptions.forEach(function (subscription) {
                     subscription.callback(errors.ConnectionCloseError(event));
@@ -136,7 +136,9 @@ RequestManager.prototype.setProvider = function (provider, net) {
             if (_this.provider && _this.provider.emit) {
                 _this.provider.emit('end', event);
             }
-        });
+        };
+        this.provider.on('close', disconnect);
+        this.provider.on('disconnect', disconnect);
 
         // TODO add end, timeout??
     }

diff --git a/test/websocket.ganache.js b/test/websocket.ganache.js
@@ -43,9 +43,9 @@ describe('WebsocketProvider (ganache)', function () {
         await web3.eth.getBlockNumber();
 
         await new Promise(async function(resolve){
-            web3.currentProvider.once('error', function(err){
-                assert(err.message.includes('Connection dropped by remote peer.'))
-                assert(err.message.includes('1006'));
+            web3.currentProvider.on('close', function (err) {
+                assert(err.reason.includes('Connection dropped by remote peer.'));
+                assert(err.code === 1006);
                 resolve();
             });
 
@@ -64,9 +64,9 @@ describe('WebsocketProvider (ganache)', function () {
         await web3.eth.getBlockNumber();
 
         await new Promise(async function(resolve){
-            web3.currentProvider.once('error', function(err){
-                assert(err.message.includes('1012'));
-                assert(err.message.includes('restart'));
+            web3.currentProvider.on('close', function (err) {
+                assert(err.reason.includes('restart'));
+                assert(err.code === 1012);
                 resolve();
             });
 
@@ -106,9 +106,9 @@ describe('WebsocketProvider (ganache)', function () {
         await web3.eth.getBlockNumber();
 
         await new Promise(async function(resolve){
-            web3.currentProvider.once('end', function(event){
-                assert.equal(event.type, 'close');
-                assert.equal(event.wasClean, false);
+            web3.currentProvider.on('close', function (err) {
+                assert.equal(err.type, 'close');
+                assert.equal(err.wasClean, false);
                 resolve();
             });
 
@@ -127,9 +127,9 @@ describe('WebsocketProvider (ganache)', function () {
         await web3.eth.getBlockNumber();
 
         await new Promise(async function(resolve){
-            web3.currentProvider.once('end', function(event){
-                assert.equal(event.type, 'close');
-                assert.equal(event.wasClean, true);
+            web3.currentProvider.on('close', function (err) {
+                assert.equal(err.type, 'close');
+                assert.equal(err.wasClean, true);
                 resolve();
             });