changed project structure

index.js

@@ -1,7 +1,7 @@
 var web3 = require('./lib/web3');
-web3.providers.HttpProvider = require('./lib/httpprovider');
+web3.providers.HttpProvider = require('./lib/web3/httpprovider');
-web3.providers.QtSyncProvider = require('./lib/qtsync');
+web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
-web3.eth.contract = require('./lib/contract');
+web3.eth.contract = require('./lib/web3/contract');
-web3.abi = require('./lib/abi');
+web3.abi = require('./lib/solidity/abi');
 
 module.exports = web3;

lib/local.js

@@ -1,18 +0,0 @@
-var addressName = {"0x12378912345789": "Gav", "0x57835893478594739854": "Jeff"};
-var nameAddress = {};
-
-for (var prop in addressName) {
-  if (addressName.hasOwnProperty(prop)) {
-    nameAddress[addressName[prop]]  = prop;
-  }
-}
-
-var local = {
-  addressBook:{
-    byName: addressName,
-    byAddress: nameAddress
-  }
-};
-
-if (typeof(module) !== "undefined")
-    module.exports = local;

lib/solidity/abi.js

@@ -21,9 +21,9 @@
  * @date 2014
  */
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
+var c = require('../utils/config');
 var types = require('./types');
-var c = require('./config');
 var f = require('./formatters');
 
 /**

lib/solidity/formatters.js

@@ -24,8 +24,8 @@ if (process.env.NODE_ENV !== 'build') {
     var BigNumber = require('bignumber.js'); // jshint ignore:line
 }
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
-var c = require('./config');
+var c = require('../utils/config');
 
 /**
  * Should be called to pad string to expected length

lib/web3.js

@@ -23,16 +23,16 @@
  * @date 2014
  */
 
-var net = require('./net');
+var net = require('./web3/net');
-var eth = require('./eth');
+var eth = require('./web3/eth');
-var db = require('./db');
+var db = require('./web3/db');
-var shh = require('./shh');
+var shh = require('./web3/shh');
-var watches = require('./watches');
+var watches = require('./web3/watches');
-var filter = require('./filter');
+var filter = require('./web3/filter');
-var utils = require('./utils');
+var utils = require('./utils/utils');
-var formatters = require('./formatters');
+var formatters = require('./solidity/formatters');
-var requestManager = require('./requestmanager');
+var requestManager = require('./web3/requestmanager');
-var c = require('./config');
+var c = require('./utils/config');
 
 /// @returns an array of objects describing web3 api methods
 var web3Methods = function () {

lib/web3/contract.js

@@ -20,9 +20,9 @@
  * @date 2014
  */
 
-var web3 = require('./web3'); 
+var web3 = require('../web3'); 
-var abi = require('./abi');
+var abi = require('../solidity/abi');
-var utils = require('./utils');
+var utils = require('../utils/utils');
 var eventImpl = require('./event');
 var signature = require('./signature');
 

lib/web3/eth.js

@@ -20,8 +20,8 @@
  * @date 2015
  */
 
-var formatters = require('./formatters');
+var formatters = require('../solidity/formatters');
-var utils = require('./utils');
+var utils = require('../utils/utils');
 
 
 var blockCall = function (args) {

lib/web3/event.js

@@ -20,8 +20,8 @@
  * @date 2014
  */
 
-var abi = require('./abi');
+var abi = require('../solidity/abi');
-var utils = require('./utils');
+var utils = require('../utils/utils');
 var signature = require('./signature');
 
 /// filter inputs array && returns only indexed (or not) inputs

lib/web3/filter.js

@@ -23,7 +23,7 @@
  * @date 2014
  */
 
-var utils = require('./utils');
+var utils = require('../utils/utils');
 
 /// Should be called to check if filter implementation is valid
 /// @returns true if it is, otherwise false

lib/web3/requestmanager.js

@@ -24,7 +24,7 @@
  */
 
 var jsonrpc = require('./jsonrpc');
-var c = require('./config');
+var c = require('../utils/config');
 
 /**
  * It's responsible for passing messages to providers

lib/web3/shh.js

@@ -20,7 +20,7 @@
  * @date 2015
  */
 
-var formatters = require('./formatters');
+var formatters = require('../solidity/formatters');
 
 /// @returns an array of objects describing web3.shh api methods
 var methods = function () {

lib/web3/signature.js

@@ -20,8 +20,8 @@
  * @date 2015
  */
 
-var web3 = require('./web3'); 
+var web3 = require('../web3'); 
-var c = require('./config');
+var c = require('../utils/config');
 
 /// @param function name for which we want to get signature
 /// @returns signature of function with given name

test/abi.inputParser.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 var BigNumber = require('bignumber.js');
-var abi = require('../lib/abi.js');
+var abi = require('../lib/solidity/abi.js');
 var clone = function (object) { return JSON.parse(JSON.stringify(object)); };
 
 var description =  [{

test/abi.outputParser.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 var BigNumber = require('bignumber.js');
-var abi = require('../lib/abi.js');
+var abi = require('../lib/solidity/abi.js');
 var clone = function (object) { return JSON.parse(JSON.stringify(object)); };
 
 var description =  [{

test/eth.contract.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var contract = require('../lib/contract.js');
+var contract = require('../lib/web3/contract.js');
 
 describe('contract', function() {
     it('should create simple contract with one method from abi with explicit type name', function () {

test/event.inputParser.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
-var event = require('../lib/event.js');
+var event = require('../lib/web3/event.js');
-var f = require('../lib/formatters.js');
+var f = require('../lib/solidity/formatters.js');
 
 describe('event', function () {
     describe('inputParser', function () {

test/event.outputParser.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var event = require('../lib/event.js');
+var event = require('../lib/web3/event.js');
 
 describe('event', function () {
     describe('outputParser', function () {

test/filter.methods.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var filter = require('../lib/filter');
+var filter = require('../lib/web3/filter');
 var u = require('./test.utils.js');
 
 var empty = function () {};

test/formatters.inputPostFormatter.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var formatters = require('../lib/formatters.js');
+var formatters = require('../lib/solidity/formatters.js');
 var assert = chai.assert;
 
 describe('formatters', function () {

test/formatters.inputTransactionFormatter.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var formatters = require('../lib/formatters.js');
+var formatters = require('../lib/solidity/formatters.js');
 var BigNumber = require('bignumber.js');
 
 describe('formatters', function () {
@@ -23,4 +23,4 @@ describe('formatters', function () {
             });
         });
     });
-});
+});

test/formatters.outputBlockFormatter.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var formatters = require('../lib/formatters.js');
+var formatters = require('../lib/solidity/formatters.js');
 var BigNumber = require('bignumber.js');
 
 describe('formatters', function () {
@@ -45,4 +45,4 @@ describe('formatters', function () {
             });
         });
     });
-});
+});

test/formatters.outputLogFormatter.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var formatters = require('../lib/formatters.js');
+var formatters = require('../lib/solidity/formatters.js');
 
 describe('formatters', function () {
     describe('outputLogFormatter', function () {
@@ -16,4 +16,4 @@ describe('formatters', function () {
             });
         });
     });
-});
+});

test/formatters.outputPostFormatter.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var formatters = require('../lib/formatters.js');
+var formatters = require('../lib/solidity/formatters.js');
 
 describe('formatters', function () {
     describe('outputPostFormatter', function () {
@@ -21,4 +21,4 @@ describe('formatters', function () {
             });
         });
     });
-});
+});

test/formatters.outputTransactionFormatter.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var formatters = require('../lib/formatters.js');
+var formatters = require('../lib/solidity/formatters.js');
 var BigNumber = require('bignumber.js');
 
 describe('formatters', function () {
@@ -23,4 +23,4 @@ describe('formatters', function () {
             });
         });
     });
-});
+});

test/jsonrpc.isValidResponse.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var jsonrpc = require('../lib/jsonrpc');
+var jsonrpc = require('../lib/web3/jsonrpc');
 
 describe('jsonrpc', function () {
     describe('isValidResponse', function () {

test/jsonrpc.toBatchPayload.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var jsonrpc = require('../lib/jsonrpc');
+var jsonrpc = require('../lib/web3/jsonrpc');
 
 describe('jsonrpc', function () {
     describe('toBatchPayload', function () {

test/jsonrpc.toPayload.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var jsonrpc = require('../lib/jsonrpc');
+var jsonrpc = require('../lib/web3/jsonrpc');
 
 describe('jsonrpc', function () {
     describe('toPayload', function () {

test/utils.extractDisplayName.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function () {
     describe('extractDisplayName', function () {

test/utils.extractTypeName.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function () {
     describe('extractTypeName', function () {

test/utils.filters.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function() {
     it('should filter functions and events from input array properly', function () {

test/utils.fromDecimal.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 var assert = chai.assert;
 
 var tests = [

test/utils.fromWei.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function () {
     describe('fromWei', function () {

test/utils.isAddress.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils');
+var utils = require('../lib/utils/utils.js');
 var assert = chai.assert;
 
 var tests = [

test/utils.isBigNumber.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils');
+var utils = require('../lib/utils/utils.js');
 var BigNumber = require('bignumber.js');
 var assert = chai.assert;
 

test/utils.isFunction.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils');
+var utils = require('../lib/utils/utils.js');
 var assert = chai.assert;
 
 var tests = [

test/utils.isString.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils');
+var utils = require('../lib/utils/utils.js');
 var assert = chai.assert;
 
 var tests = [

test/utils.toBigNumber.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils');
+var utils = require('../lib/utils/utils.js');
 var BigNumber = require('bignumber.js');
 var assert = chai.assert;
 

test/utils.toDecimal.js

@@ -1,5 +1,5 @@
 var assert = require('assert');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils.js');
 
 describe('utils', function () {
     describe('toDecimal', function () {
@@ -11,4 +11,4 @@ describe('utils', function () {
             assert.equal(utils.toDecimal('100000'), '100000');
         });
     });
-});
+});

test/utils.toHex.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils');
 var assert = chai.assert;
 
 var tests = [

test/utils.toWei.js

@@ -1,5 +1,5 @@
 var chai = require('chai');
-var utils = require('../lib/utils.js');
+var utils = require('../lib/utils/utils');
 var assert = chai.assert;
 
 describe('utils', function () {