diff --git a/bower.json b/bower.json index 2f21e686661..6e6b6b2b4fb 100644 --- a/bower.json +++ b/bower.json @@ -29,30 +29,30 @@ "API" ], "authors": [ - { - "name": "Fabian Vogelsteller", - "email": "fabian@ethereum.org", - "homepage": "http://frozeman.de" - }, - { - "name": "Marek Kotewicz", - "email": "marek@parity.io", - "url": "https://github.com/debris" - }, - { - "name": "Marian Oancea", - "url": "https://github.com/cubedro" - }, - { - "name": "Gav Wood", - "email": "g@parity.io", - "homepage": "http://gavwood.com" - }, - { - "name": "Jeffery Wilcke", - "email": "jeffrey.wilcke@ethereum.org", - "url": "https://github.com/obscuren" - } + { + "name": "Fabian Vogelsteller", + "email": "fabian@ethereum.org", + "homepage": "http://frozeman.de" + }, + { + "name": "Marek Kotewicz", + "email": "marek@parity.io", + "url": "https://github.com/debris" + }, + { + "name": "Marian Oancea", + "url": "https://github.com/cubedro" + }, + { + "name": "Gav Wood", + "email": "g@parity.io", + "homepage": "http://gavwood.com" + }, + { + "name": "Jeffery Wilcke", + "email": "jeffrey.wilcke@ethereum.org", + "url": "https://github.com/obscuren" + } ], "ignore": [ "test", diff --git a/gulpfile.js b/gulpfile.js index c3f18751460..2315d91080d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,7 +23,7 @@ var DEST = path.join(__dirname, 'dist/'); var packages = [{ fileName: 'web3', expose: 'Web3', - src: './src/index.js', + src: './packages/web3/src/index.js', ignore: ['xmlhttprequest','websocket'] },{ fileName: 'web3-utils', @@ -185,7 +185,7 @@ packages.forEach(function(pckg, i){ gulp.task('watch', function() { - gulp.watch(['./src/*.js'], ['lint', 'build']); + gulp.watch(['./packages/web3/src/*.js'], ['lint', 'build']); }); gulp.task('all', ['version', 'lint', 'clean', packages[packages.length-1].fileName]); diff --git a/package.json b/package.json index b071949e413..f12865488d7 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,9 @@ "name": "web3", "namespace": "ethereum", "version": "1.0.0-beta.20", - "description": "Ethereum JavaScript API", + "description": "Ethereum JavaScript API wrapper repository", "license": "LGPL-3.0", - "main": "./src/index.js", "directories": { - "lib": "./src", "doc": "./doc", "test": "./test" }, @@ -14,7 +12,7 @@ "postinstall": "lerna bootstrap", "build": "gulp", "build-all": "gulp all", - "release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version; npm publish", + "release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version;", "watch": "gulp watch", "docs": "cd docs; make html;", "lint": "jshint *.js packages", @@ -61,9 +59,6 @@ "url": "https://github.com/obscuren" } ], - "dependencies": { - "lerna": "^2.0.0" - }, "devDependencies": { "babel-preset-env": "^1.6.0", "bignumber.js": "^4.0.0", @@ -86,6 +81,7 @@ "gulp-uglify": "^3.0.0", "istanbul": "^0.4.4", "jshint": ">=2.5.0", + "lerna": "^2.0.0", "mocha": ">=2.3.3", "sandboxed-module": "^2.0.2", "underscore": "^1.8.3", diff --git a/packages/web3-bzz/package.json b/packages/web3-bzz/package.json index 5ed1effba4e..45700085a23 100644 --- a/packages/web3-bzz/package.json +++ b/packages/web3-bzz/package.json @@ -1,6 +1,7 @@ { "name": "web3-bzz", - "version": "1.0.0-beta.17", + "namespace": "ethereum", + "version": "1.0.0-beta.20", "description": "Web3 module to interact with the Swarm network.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-bzz", "license": "LGPL-3.0", diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json index 35a7521932c..2176c270e22 100644 --- a/packages/web3-core-helpers/package.json +++ b/packages/web3-core-helpers/package.json @@ -1,5 +1,6 @@ { "name": "web3-core-helpers", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 core tools helper for sub packages. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-helpers", diff --git a/packages/web3-core-method/package.json b/packages/web3-core-method/package.json index 4fc57245cfc..a6f10b6deae 100644 --- a/packages/web3-core-method/package.json +++ b/packages/web3-core-method/package.json @@ -1,5 +1,6 @@ { "name": "web3-core-method", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Creates the methods on the web3 modules. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-method", diff --git a/packages/web3-core-promievent/package.json b/packages/web3-core-promievent/package.json index 64d6e56f5d0..510848d16f9 100644 --- a/packages/web3-core-promievent/package.json +++ b/packages/web3-core-promievent/package.json @@ -1,6 +1,7 @@ { "name": "web3-core-promievent", - "version": "1.0.0-beta.17", + "namespace": "ethereum", + "version": "1.0.0-beta.20", "description": "This package extends eventEmitters with promises to allow chaining as well as multiple final states of a function.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-promievent", "license": "LGPL-3.0", diff --git a/packages/web3-core-requestmanager/package.json b/packages/web3-core-requestmanager/package.json index d097bc27c86..36c01b52385 100644 --- a/packages/web3-core-requestmanager/package.json +++ b/packages/web3-core-requestmanager/package.json @@ -1,5 +1,6 @@ { "name": "web3-core-requestmanager", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module to handle requests to external providers.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-requestmanager", diff --git a/packages/web3-core-subscriptions/package.json b/packages/web3-core-subscriptions/package.json index 9cca8c35506..811c50db18c 100644 --- a/packages/web3-core-subscriptions/package.json +++ b/packages/web3-core-subscriptions/package.json @@ -1,5 +1,6 @@ { "name": "web3-core-subscriptions", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Manages web3 subscriptions. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-subscriptions", diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index 57995ac504d..cc1c28e1714 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -1,5 +1,6 @@ { "name": "web3-core", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 core tools for sub packages. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core", diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json index 91a206fb6cf..463d95aadb9 100644 --- a/packages/web3-eth-abi/package.json +++ b/packages/web3-eth-abi/package.json @@ -1,5 +1,6 @@ { "name": "web3-eth-abi", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module encode and decode EVM in/output.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-abi", diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json index 802b69bccd9..412e5c6249a 100644 --- a/packages/web3-eth-accounts/package.json +++ b/packages/web3-eth-accounts/package.json @@ -1,19 +1,20 @@ { - "name": "web3-eth-accounts", - "version": "1.0.0-beta.20", - "description": "Web3 module to generate Ethereum accounts and sign data and transactions.", - "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-accounts", - "license": "LGPL-3.0", - "main": "src/index.js", - "dependencies": { - "bluebird": "3.3.1", - "eth-lib": "^0.1.27", - "scrypt.js": "0.2.0", - "underscore": "1.8.3", - "uuid": "2.0.1", - "web3-core": "^1.0.0-beta.20", - "web3-core-helpers": "^1.0.0-beta.20", - "web3-core-method": "^1.0.0-beta.20", - "web3-utils": "^1.0.0-beta.20" - } + "name": "web3-eth-accounts", + "namespace": "ethereum", + "version": "1.0.0-beta.20", + "description": "Web3 module to generate Ethereum accounts and sign data and transactions.", + "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-accounts", + "license": "LGPL-3.0", + "main": "src/index.js", + "dependencies": { + "bluebird": "3.3.1", + "eth-lib": "^0.1.27", + "scrypt.js": "0.2.0", + "underscore": "1.8.3", + "uuid": "2.0.1", + "web3-core": "^1.0.0-beta.20", + "web3-core-helpers": "^1.0.0-beta.20", + "web3-core-method": "^1.0.0-beta.20", + "web3-utils": "^1.0.0-beta.20" + } } diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json index 550c7bc0a42..d0e7a7525f3 100644 --- a/packages/web3-eth-contract/package.json +++ b/packages/web3-eth-contract/package.json @@ -1,5 +1,6 @@ { "name": "web3-eth-contract", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module to interact with Ethereum smart contracts.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-contract", diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json index 79013a5413c..b2918fb97ab 100644 --- a/packages/web3-eth-iban/package.json +++ b/packages/web3-eth-iban/package.json @@ -1,5 +1,6 @@ { "name": "web3-eth-iban", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "This package converts Ethereum addresses to IBAN addresses a vice versa.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-iban", diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json index eb067548f2b..73dd37aa724 100644 --- a/packages/web3-eth-personal/package.json +++ b/packages/web3-eth-personal/package.json @@ -1,5 +1,6 @@ { "name": "web3-eth-personal", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-personal", diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json index 22206a00c75..b210fb05091 100644 --- a/packages/web3-eth/package.json +++ b/packages/web3-eth/package.json @@ -1,5 +1,6 @@ { "name": "web3-eth", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module to interact with the Ethereum blockchain and smart contracts.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth", diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json old mode 100755 new mode 100644 index 8134022a962..ccb66f8f2d8 --- a/packages/web3-net/package.json +++ b/packages/web3-net/package.json @@ -1,5 +1,6 @@ { "name": "web3-net", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module to interact with the Ethereum nodes networking properties.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-net", diff --git a/packages/web3-net/src/index.js b/packages/web3-net/src/index.js old mode 100755 new mode 100644 diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json index c0a23ce68e5..34f54902238 100644 --- a/packages/web3-providers-http/package.json +++ b/packages/web3-providers-http/package.json @@ -1,5 +1,6 @@ { "name": "web3-providers-http", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Module to handle web3 RPC connections over HTTP.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-providers-http", diff --git a/packages/web3-providers-ipc/package.json b/packages/web3-providers-ipc/package.json index d0d0a8f8843..73eb3e7e0cf 100644 --- a/packages/web3-providers-ipc/package.json +++ b/packages/web3-providers-ipc/package.json @@ -1,5 +1,6 @@ { "name": "web3-providers-ipc", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Module to handle web3 RPC connections over IPC sockets.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-providers-ipc", diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json index 97acf6bb25c..d4a1adf8733 100644 --- a/packages/web3-providers-ws/package.json +++ b/packages/web3-providers-ws/package.json @@ -1,5 +1,6 @@ { "name": "web3-providers-ws", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Module to handle web3 RPC connections over WebSockets.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-providers-ws", diff --git a/packages/web3-shh/package.json b/packages/web3-shh/package.json index cde6997a32e..2383c5fbb45 100644 --- a/packages/web3-shh/package.json +++ b/packages/web3-shh/package.json @@ -1,5 +1,6 @@ { "name": "web3-shh", + "namespace": "ethereum", "version": "1.0.0-beta.20", "description": "Web3 module to interact with the Whisper messaging protocol.", "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-shh", diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json index 74e80f0e989..283ae3b8d8d 100644 --- a/packages/web3-utils/package.json +++ b/packages/web3-utils/package.json @@ -1,17 +1,18 @@ { - "name": "web3-utils", - "version": "1.0.0-beta.20", - "description": "Collection of utility functions used in web3.js.", - "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-utils", - "license": "LGPL-3.0", - "main": "src/index.js", - "dependencies": { - "bn.js": "4.11.6", - "eth-lib": "^0.1.27", - "ethjs-unit": "0.1.6", - "number-to-bn": "1.7.0", - "randomhex": "0.1.5", - "underscore": "1.8.3", - "utf8": "2.1.1" - } + "name": "web3-utils", + "namespace": "ethereum", + "version": "1.0.0-beta.20", + "description": "Collection of utility functions used in web3.js.", + "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-utils", + "license": "LGPL-3.0", + "main": "src/index.js", + "dependencies": { + "bn.js": "4.11.6", + "eth-lib": "^0.1.27", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.8.3", + "utf8": "2.1.1" + } } diff --git a/packages/web3/README.md b/packages/web3/README.md new file mode 100644 index 00000000000..1a1be9c7ed1 --- /dev/null +++ b/packages/web3/README.md @@ -0,0 +1,13 @@ +# web3 + +This is a main package of [web3.js][repo] + +Please read the [documentation][docs] for more. + +## Installation + +### Node.js + +```bash +npm install web3 +``` diff --git a/packages/web3/package.json b/packages/web3/package.json new file mode 100644 index 00000000000..74afa715f77 --- /dev/null +++ b/packages/web3/package.json @@ -0,0 +1,53 @@ +{ + "name": "web3", + "namespace": "ethereum", + "version": "1.0.0-beta.20", + "description": "Ethereum JavaScript API", + "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3", + "license": "LGPL-3.0", + "main": "src/index.js", + "bugs": { + "url": "https://github.com/ethereum/web3.js/issues" + }, + "keywords": [ + "Ethereum", + "JavaScript", + "API" + ], + "author": "ethereum.org", + "authors": [ + { + "name": "Fabian Vogelsteller", + "email": "fabian@ethereum.org", + "homepage": "http://frozeman.de" + }, + { + "name": "Marek Kotewicz", + "email": "marek@parity.io", + "url": "https://github.com/debris" + }, + { + "name": "Marian Oancea", + "url": "https://github.com/cubedro" + }, + { + "name": "Gav Wood", + "email": "g@parity.io", + "homepage": "http://gavwood.com" + }, + { + "name": "Jeffery Wilcke", + "email": "jeffrey.wilcke@ethereum.org", + "url": "https://github.com/obscuren" + } + ], + "dependencies": { + "web3-core": "^1.0.0-beta.20", + "web3-eth": "^1.0.0-beta.20", + "web3-net": "^1.0.0-beta.20", + "web3-eth-personal": "^1.0.0-beta.20", + "web3-shh": "^1.0.0-beta.20", + "web3-bzz": "^1.0.0-beta.20", + "web3-utils": "^1.0.0-beta.20" + } +} diff --git a/src/index.js b/packages/web3/src/index.js similarity index 79% rename from src/index.js rename to packages/web3/src/index.js index b6415c37ddf..789c1785ac9 100644 --- a/src/index.js +++ b/packages/web3/src/index.js @@ -28,18 +28,14 @@ "use strict"; -var version = require('../lerna.json'); -var core = require('../packages/web3-core'); - -var Eth = require('../packages/web3-eth'); -var Net = require('../packages/web3-net'); -var Personal = require('../packages/web3-eth-personal'); -var Shh = require('../packages/web3-shh'); -var Bzz = require('../packages/web3-bzz'); - -var utils = require('../packages/web3-utils'); - - +var version = require('../package.json').version; +var core = require('web3-core'); +var Eth = require('web3-eth'); +var Net = require('web3-net'); +var Personal = require('web3-eth-personal'); +var Shh = require('web3-shh'); +var Bzz = require('web3-bzz'); +var utils = require('web3-utils'); var Web3 = function Web3() { var _this = this; @@ -47,32 +43,28 @@ var Web3 = function Web3() { // sets _requestmanager etc core.packageInit(this, arguments); - this.version = version.version; + this.version = version; this.utils = utils; this.eth = new Eth(this); this.shh = new Shh(this); this.bzz = new Bzz(this); - // overwrite package setProvider var setProvider = this.setProvider; this.setProvider = function (provider, net) { setProvider.apply(_this, arguments); this.eth.setProvider(provider, net); - this.shh.setProvider(provider, net); - this.bzz.setProvider(provider); return true; }; }; -Web3.version = version.version; +Web3.version = version; Web3.utils = utils; - Web3.modules = { Eth: Eth, Net: Net, @@ -83,8 +75,5 @@ Web3.modules = { core.addProviders(Web3); - - - module.exports = Web3; diff --git a/test/1_givenProvider-ethereumProvider.js b/test/1_givenProvider-ethereumProvider.js index 5a409b21991..23d026f2a12 100644 --- a/test/1_givenProvider-ethereumProvider.js +++ b/test/1_givenProvider-ethereumProvider.js @@ -9,7 +9,7 @@ describe('Web3.providers.givenProvider', function () { it('when instantiating Web3', function () { - var Web3 = require('../src/index.js'); + var Web3 = require('../packages/web3'); assert.deepEqual(Web3.givenProvider, global.ethereumProvider); diff --git a/test/2_givenProvider-currentProvider.js b/test/2_givenProvider-currentProvider.js index 4a65b87422a..e29c54c600f 100644 --- a/test/2_givenProvider-currentProvider.js +++ b/test/2_givenProvider-currentProvider.js @@ -11,7 +11,7 @@ describe('Web3.providers.givenProvider', function () { it('when instantiating Web3', function () { - var Web3 = require('../src/index.js'); + var Web3 = require('../packages/web3'); assert.deepEqual(Web3.givenProvider, global.web3.currentProvider); diff --git a/test/async.js b/test/async.js index c23e5b8b956..910ed2d5d96 100644 --- a/test/async.js +++ b/test/async.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index'); +var Web3 = require('../packages/web3'); var FakeHttpProvider = require('./helpers/FakeIpcProvider'); var web3 = new Web3(); diff --git a/test/batch.js b/test/batch.js index 0c6716f343a..313f2922cc2 100644 --- a/test/batch.js +++ b/test/batch.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index'); +var Web3 = require('../packages/web3'); var FakeIpcProvider = require('./helpers/FakeIpcProvider'); diff --git a/test/eth.abi.decodeLog.js b/test/eth.abi.decodeLog.js index fcd467edd2b..07aebde46c0 100644 --- a/test/eth.abi.decodeLog.js +++ b/test/eth.abi.decodeLog.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.decodeParameter.js b/test/eth.abi.decodeParameter.js index 6b9818eb38b..607773b0b83 100644 --- a/test/eth.abi.decodeParameter.js +++ b/test/eth.abi.decodeParameter.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.decodeParameters.js b/test/eth.abi.decodeParameters.js index 83d1314feeb..34de205e682 100644 --- a/test/eth.abi.decodeParameters.js +++ b/test/eth.abi.decodeParameters.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.encodeEventSignature.js b/test/eth.abi.encodeEventSignature.js index e5075ab5533..6848c15006f 100644 --- a/test/eth.abi.encodeEventSignature.js +++ b/test/eth.abi.encodeEventSignature.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.encodeFunctionCall.js b/test/eth.abi.encodeFunctionCall.js index e7a9870f211..3a0ce3d7f7a 100644 --- a/test/eth.abi.encodeFunctionCall.js +++ b/test/eth.abi.encodeFunctionCall.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.encodeFunctionSignature.js b/test/eth.abi.encodeFunctionSignature.js index b793d0ddc41..e7f5f377b20 100644 --- a/test/eth.abi.encodeFunctionSignature.js +++ b/test/eth.abi.encodeFunctionSignature.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.encodeParameter.js b/test/eth.abi.encodeParameter.js index 0c59c2836b8..32fbc54b3ac 100644 --- a/test/eth.abi.encodeParameter.js +++ b/test/eth.abi.encodeParameter.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.abi.encodeParameters.js b/test/eth.abi.encodeParameters.js index 3d3cdeb9af8..823ba109990 100644 --- a/test/eth.abi.encodeParameters.js +++ b/test/eth.abi.encodeParameters.js @@ -1,6 +1,6 @@ var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [{ diff --git a/test/eth.accounts.create.js b/test/eth.accounts.create.js index 4f05f5226d2..bf251c23578 100644 --- a/test/eth.accounts.create.js +++ b/test/eth.accounts.create.js @@ -1,8 +1,8 @@ -var Accounts = require("./../packages/web3-eth-accounts/src/index.js"); +var Accounts = require("./../packages/web3-eth-accounts"); var ethereumWallet = require('ethereumjs-wallet'); var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = []; diff --git a/test/eth.accounts.encrypt-decrypt.js b/test/eth.accounts.encrypt-decrypt.js index 15321b62470..7fc921b5938 100644 --- a/test/eth.accounts.encrypt-decrypt.js +++ b/test/eth.accounts.encrypt-decrypt.js @@ -2,7 +2,7 @@ var Accounts = require("./../packages/web3-eth-accounts/src/index.js"); var ethereumWallet = require('ethereumjs-wallet'); var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = []; diff --git a/test/eth.accounts.sign.js b/test/eth.accounts.sign.js index 7dcefcbe760..d1f4eb0188c 100644 --- a/test/eth.accounts.sign.js +++ b/test/eth.accounts.sign.js @@ -1,7 +1,7 @@ -var Accounts = require("./../packages/web3-eth-accounts/src/index.js"); +var Accounts = require("./../packages/web3-eth-accounts"); var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [ diff --git a/test/eth.accounts.signTransaction.js b/test/eth.accounts.signTransaction.js index 2a0bbb402c6..c4c15708178 100644 --- a/test/eth.accounts.signTransaction.js +++ b/test/eth.accounts.signTransaction.js @@ -1,6 +1,6 @@ var FakeHttpProvider = require('./helpers/FakeIpcProvider'); -var Web3 = require('../src/index.js'); -var Accounts = require("./../packages/web3-eth-accounts/src/index.js"); +var Web3 = require('../packages/web3'); +var Accounts = require("./../packages/web3-eth-accounts"); var ethjsSigner = require("ethjs-signer"); var chai = require('chai'); var assert = chai.assert; diff --git a/test/eth.accounts.wallet.js b/test/eth.accounts.wallet.js index 50b5c8947ad..a7b3ee03e57 100644 --- a/test/eth.accounts.wallet.js +++ b/test/eth.accounts.wallet.js @@ -1,7 +1,7 @@ -var Accounts = require("./../packages/web3-eth-accounts/src/index.js"); +var Accounts = require("./../packages/web3-eth-accounts"); var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); var tests = [ diff --git a/test/eth.defaultAccount.js b/test/eth.defaultAccount.js index 1ae9d9c0ddf..1e61dcea693 100644 --- a/test/eth.defaultAccount.js +++ b/test/eth.defaultAccount.js @@ -1,7 +1,7 @@ var chai = require('chai'); var assert = chai.assert; var Eth = require('../packages/web3-eth'); -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var eth = new Eth(); diff --git a/test/eth.net.getNetworkType.js b/test/eth.net.getNetworkType.js index 8a7c7e9bf08..80ef08c6146 100644 --- a/test/eth.net.getNetworkType.js +++ b/test/eth.net.getNetworkType.js @@ -1,7 +1,7 @@ var chai = require('chai'); var assert = chai.assert; var FakeHttpProvider = require('./helpers/FakeIpcProvider'); -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var tests = [{ hash: '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3', diff --git a/test/eth.sendTransaction.js b/test/eth.sendTransaction.js index 99e8f1437df..61a1af128dd 100644 --- a/test/eth.sendTransaction.js +++ b/test/eth.sendTransaction.js @@ -2,7 +2,7 @@ var testMethod = require('./helpers/test.method.js'); var chai = require('chai'); var assert = chai.assert; var FakeHttpProvider = require('./helpers/FakeHttpProvider'); -var Web3 = require('../src/index'); +var Web3 = require('../packages/web3'); var clone = function (object) { return object ? JSON.parse(JSON.stringify(object)) : []; }; diff --git a/test/extend.js b/test/extend.js index 19b5c1b9dde..af992c1e11b 100644 --- a/test/extend.js +++ b/test/extend.js @@ -1,7 +1,7 @@ var chai = require('chai'); var assert = chai.assert; var FakeHttpProvider = require('./helpers/FakeIpcProvider'); -var Web3 = require('../src/index'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); diff --git a/test/helpers/test.method.js b/test/helpers/test.method.js index 81beba0ff6f..e2454740228 100644 --- a/test/helpers/test.method.js +++ b/test/helpers/test.method.js @@ -2,7 +2,7 @@ var _ = require('underscore'); var chai = require('chai'); var assert = chai.assert; var FakeIpcProvider = require('./FakeIpcProvider'); -var Web3 = require('../../src/index'); +var Web3 = require('../../packages/web3'); var clone = function (object) { return object ? JSON.parse(JSON.stringify(object)) : []; }; diff --git a/test/helpers/test.subscription.js b/test/helpers/test.subscription.js index 18d9e74a048..651a92586dc 100644 --- a/test/helpers/test.subscription.js +++ b/test/helpers/test.subscription.js @@ -1,7 +1,7 @@ var chai = require('chai'); var assert = chai.assert; var FakeHttpProvider = require('./FakeIpcProvider'); -var Web3 = require('../../src/index'); +var Web3 = require('../../packages/web3'); var runTests = function (protocol, tests) { diff --git a/test/provider.js b/test/provider.js index 0a28e108fd7..6f46e38dd56 100644 --- a/test/provider.js +++ b/test/provider.js @@ -5,7 +5,7 @@ var net = require('net'); var Eth = require('../packages/web3-eth'); var Shh = require('../packages/web3-shh'); var Net = require('../packages/web3-net'); -var Web3 = require('../src/index'); +var Web3 = require('../packages/web3'); var tests = [{ diff --git a/test/setProvider.js b/test/setProvider.js index cc2a3a4e600..d0f4caf07b9 100644 --- a/test/setProvider.js +++ b/test/setProvider.js @@ -17,7 +17,7 @@ var FakeHttpProvider = require('./helpers/FakeHttpProvider'); var chai = require('chai'); var assert = chai.assert; -var Web3 = require('../src/index'); +var Web3 = require('../packages/web3'); var Eth = require('../packages/web3-eth'); var Shh = require('../packages/web3-shh'); var Personal = require('../packages/web3-eth-personal'); diff --git a/test/web3_methods.js b/test/web3_methods.js index 93ae68150be..b06cf282eae 100644 --- a/test/web3_methods.js +++ b/test/web3_methods.js @@ -1,5 +1,5 @@ var u = require('./helpers/test.utils.js'); -var Web3 = require('../src/index.js'); +var Web3 = require('../packages/web3'); var web3 = new Web3(); describe('web3', function() {