From 415df3312fc19f9afa1fc59a1ac928296a222c68 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 6 Jul 2018 14:43:01 -0400
Subject: [PATCH] fix webserver errors

---
 lib/contracts/provider.js              | 38 ++++++++++++++------------
 lib/tests/test.js                      |  3 ++
 test_apps/test_app/config/contracts.js |  4 +--
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/lib/contracts/provider.js b/lib/contracts/provider.js
index 1bd1733f1..cacb660a4 100644
--- a/lib/contracts/provider.js
+++ b/lib/contracts/provider.js
@@ -28,6 +28,7 @@ class Provider {
 
     self.accounts = AccountParser.parseAccountsConfig(self.accountsConfig, self.web3, self.logger);
     self.addresses = [];
+
     if (!self.accounts.length) {
       return callback();
     }
@@ -35,32 +36,35 @@ class Provider {
       self.addresses.push(account.address);
       self.web3.eth.accounts.wallet.add(account);
     });
-
     self.web3.eth.defaultAccount = self.addresses[0];
-    const realAccountFunction = self.web3.eth.getAccounts;
-    self.web3.eth.getAccounts = function (cb) {
-      cb = cb || function () {};
-      return new Promise((resolve, reject) => {
-        realAccountFunction((err, accounts) => {
+    const realSend = self.provider.send.bind(self.provider);
+    self.provider.send = function (payload, cb) {
+      if (payload.method === 'eth_accounts') {
+        return realSend(payload, function (err, result) {
           if (err) {
-            cb(err);
-            return reject(err);
+            return cb(err);
           }
-          // console.log('ACOUNTS', accounts);
-          // console.log('My addresses', self.addresses);
-          // accounts = self.addresses;
-          accounts = [accounts[0]].concat(self.addresses);
-          // accounts = accounts.concat(self.addresses);
-          // accounts = self.addresses.concat(accounts);
-          cb(null, accounts);
-          resolve(accounts);
+          result.result = result.result.concat(self.addresses);
+          cb(null, result);
         });
-      });
+      }
+      realSend(payload, cb);
     };
 
     callback();
   }
 
+  stop() {
+    if (this.provider && this.provider.removeAllListeners) {
+      this.provider.removeAllListeners('connect');
+      this.provider.removeAllListeners('error');
+      this.provider.removeAllListeners('end');
+      this.provider.removeAllListeners('data');
+      this.provider.responseCallbacks = {};
+      this.provider = null;
+    }
+  }
+
   fundAccounts(callback) {
     const self = this;
     if (!self.accounts.length) {
diff --git a/lib/tests/test.js b/lib/tests/test.js
index 731db874c..af7f81699 100644
--- a/lib/tests/test.js
+++ b/lib/tests/test.js
@@ -77,6 +77,9 @@ class Test {
 
     if (this.simOptions.accounts) {
       this.simOptions.accounts = this.simOptions.accounts.map((account) => {
+        if (!account.hexBalance) {
+          account.hexBalance = '0x8AC7230489E80000'; // 10 ether
+        }
         return {balance: account.hexBalance, secretKey: account.privateKey};
       });
     }
diff --git a/test_apps/test_app/config/contracts.js b/test_apps/test_app/config/contracts.js
index d6e9be776..be823793c 100644
--- a/test_apps/test_app/config/contracts.js
+++ b/test_apps/test_app/config/contracts.js
@@ -2,8 +2,8 @@ module.exports = {
   default: {
     deployment: {
       host: "localhost",
-      port: 8545,
-      type: "rpc"
+      port: 8546,
+      type: "ws"
     },
     dappConnection: [
       "$WEB3",