remove web3instance, passed it web3 instance as part of the tests

index.js

@@ -3,11 +3,10 @@ let remixLib = require('remix-lib');
 
 let Compiler = require('./src/compiler.js');
 let Deployer = require('./src/deployer.js');
-let web3Instance = require('./src/web3Instance.js');
 let TestRunner = require('./src/testRunner.js');
 
-var runTest = function(filename) {
-  let result, web3, accounts, contracts;
+var runTest = function(filename, web3) {
+  let result, accounts, contracts;
 
   async.waterfall([
     function compile(next) {
@@ -16,10 +15,6 @@ var runTest = function(filename) {
         next();
       });
     },
-    function initWeb3(next) {
-      web3 = web3Instance();
-      next();
-    },
     function getAccountList(next) {
       web3.eth.getAccounts((err, _accounts) => {
         accounts = _accounts;

run.js

 const commander = require('commander');
+const Web3 = require('web3');
 const RemixTests = require('./index.js');
 
 commander.action(function (filename) {
-  RemixTests.runTest(filename);
+  let web3 = new Web3();
+  web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));
+  RemixTests.runTest(filename, web3);
 });
 
 if (!process.argv.slice(2).length) {

src/web3Instance.js

-let Web3 = require('web3');
-var EthJSVM = require('ethereumjs-vm')
-
-// TODO: this whole file is temporary and should disapear one the code is
-// refactored
-
-function web3Instance() {
-  let web3 = new Web3();
-  web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));
-  //var vm = new EthJSVM({
-  //  enableHomestead: true,
-  //  activatePrecompiles: true
-  //});
-  //
-  //var Web3VMProvider = remixLib.vm.Web3VMProvider;
-  //
-  //let web3 = new Web3VMProvider();
-  //web3.setVM(vm);
-  return web3;
-}
-
-module.exports = web3Instance;