diff --git a/package.json b/package.json index 66b201e99..3a487cb68 100644 --- a/package.json +++ b/package.json @@ -165,18 +165,18 @@ "viz.js": "1.8.2", "web3": "1.0.0-beta.34", "web3-bzz": "1.0.0-beta.34", + "web3-core": "1.0.0-beta.34", "web3-core-helpers": "1.0.0-beta.34", "web3-core-method": "1.0.0-beta.34", "web3-core-promievent": "1.0.0-beta.34", "web3-core-requestmanager": "1.0.0-beta.34", "web3-core-subscriptions": "1.0.0-beta.34", - "web3-core": "1.0.0-beta.34", + "web3-eth": "1.0.0-beta.34", "web3-eth-abi": "1.0.0-beta.34", "web3-eth-accounts": "1.0.0-beta.34", "web3-eth-contract": "1.0.0-beta.34", "web3-eth-iban": "1.0.0-beta.34", "web3-eth-personal": "1.0.0-beta.34", - "web3-eth": "1.0.0-beta.34", "web3-net": "1.0.0-beta.34", "web3-providers-http": "1.0.0-beta.34", "web3-providers-ipc": "1.0.0-beta.34", diff --git a/src/lib/modules/blockchain_connector/embarkjs.js b/src/lib/modules/blockchain_connector/embarkjs.js index 8d79df1ff..f05844ddd 100644 --- a/src/lib/modules/blockchain_connector/embarkjs.js +++ b/src/lib/modules/blockchain_connector/embarkjs.js @@ -4,6 +4,7 @@ const __embarkWeb3 = {}; __embarkWeb3.init = function (_config) { this.web3 = new Web3(); + global.web3 = this.web3; }; __embarkWeb3.getAccounts = function () { diff --git a/src/lib/modules/tests/test.js b/src/lib/modules/tests/test.js index 5751db1a3..8f0f8bdc9 100644 --- a/src/lib/modules/tests/test.js +++ b/src/lib/modules/tests/test.js @@ -181,12 +181,6 @@ class Test { function checkDeploymentOpts(next) { self.checkDeploymentOptions(options, next); }, - function changeGlobalWeb3(next) { - self.events.request('blockchain:get', (web3) => { - global.web3 = web3; - next(); - }); - }, function compileContracts(next) { if (!self.firstDeployment) { return next(); @@ -212,6 +206,12 @@ class Test { self.events.emit('tests:ready'); next(null, accounts); }); + }, + function changeGlobalWeb3(accounts, next) { + self.events.request('blockchain:get', (web3) => { + global.web3 = web3; + next(null, accounts); + }); } ], (err, accounts) => { if (err) {