From 777030cdb958f5f914663e04f43beb2e8a392839 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 6 Aug 2015 18:25:41 +0200 Subject: [PATCH] moved files to /methods/ subdirectory --- lib/web3.js | 10 +++++----- lib/web3/allevents.js | 2 +- lib/web3/event.js | 2 +- lib/web3/{ => methods}/db.js | 2 +- lib/web3/{ => methods}/eth.js | 8 ++++---- lib/web3/{ => methods}/net.js | 4 ++-- lib/web3/{ => methods}/shh.js | 4 ++-- lib/web3/{ => methods}/watches.js | 2 +- test/ipcprovider.js | 13 ++++++------- 9 files changed, 23 insertions(+), 24 deletions(-) rename lib/web3/{ => methods}/db.js (97%) rename lib/web3/{ => methods}/eth.js (97%) rename lib/web3/{ => methods}/net.js (93%) rename lib/web3/{ => methods}/shh.js (95%) rename lib/web3/{ => methods}/watches.js (98%) diff --git a/lib/web3.js b/lib/web3.js index 6f5a48e..51050d5 100644 --- a/lib/web3.js +++ b/lib/web3.js @@ -25,11 +25,11 @@ */ var version = require('./version.json'); -var net = require('./web3/net'); -var eth = require('./web3/eth'); -var db = require('./web3/db'); -var shh = require('./web3/shh'); -var watches = require('./web3/watches'); +var net = require('./web3/methods/net'); +var eth = require('./web3/methods/eth'); +var db = require('./web3/methods/db'); +var shh = require('./web3/methods/shh'); +var watches = require('./web3/methods/watches'); var Filter = require('./web3/filter'); var utils = require('./utils/utils'); var formatters = require('./web3/formatters'); diff --git a/lib/web3/allevents.js b/lib/web3/allevents.js index 1d09281..74602f9 100644 --- a/lib/web3/allevents.js +++ b/lib/web3/allevents.js @@ -25,7 +25,7 @@ var SolidityEvent = require('./event'); var formatters = require('./formatters'); var utils = require('../utils/utils'); var Filter = require('./filter'); -var watches = require('./watches'); +var watches = require('./methods/watches'); var AllSolidityEvents = function (json, address) { this._json = json; diff --git a/lib/web3/event.js b/lib/web3/event.js index 101fa09..0a715a7 100644 --- a/lib/web3/event.js +++ b/lib/web3/event.js @@ -25,7 +25,7 @@ var coder = require('../solidity/coder'); var formatters = require('./formatters'); var sha3 = require('../utils/sha3'); var Filter = require('./filter'); -var watches = require('./watches'); +var watches = require('./methods/watches'); /** * This prototype should be used to create event filters diff --git a/lib/web3/db.js b/lib/web3/methods/db.js similarity index 97% rename from lib/web3/db.js rename to lib/web3/methods/db.js index afcb655..b174b71 100644 --- a/lib/web3/db.js +++ b/lib/web3/methods/db.js @@ -20,7 +20,7 @@ * @date 2015 */ -var Method = require('./method'); +var Method = require('../method'); var putString = new Method({ name: 'putString', diff --git a/lib/web3/eth.js b/lib/web3/methods/eth.js similarity index 97% rename from lib/web3/eth.js rename to lib/web3/methods/eth.js index 3e119e8..8617ba7 100644 --- a/lib/web3/eth.js +++ b/lib/web3/methods/eth.js @@ -49,10 +49,10 @@ "use strict"; -var formatters = require('./formatters'); -var utils = require('../utils/utils'); -var Method = require('./method'); -var Property = require('./property'); +var formatters = require('../formatters'); +var utils = require('../../utils/utils'); +var Method = require('../method'); +var Property = require('../property'); var blockCall = function (args) { return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? "eth_getBlockByHash" : "eth_getBlockByNumber"; diff --git a/lib/web3/net.js b/lib/web3/methods/net.js similarity index 93% rename from lib/web3/net.js rename to lib/web3/methods/net.js index 87c89d0..8e7f183 100644 --- a/lib/web3/net.js +++ b/lib/web3/methods/net.js @@ -20,8 +20,8 @@ * @date 2015 */ -var utils = require('../utils/utils'); -var Property = require('./property'); +var utils = require('../../utils/utils'); +var Property = require('../property'); /// @returns an array of objects describing web3.eth api methods var methods = [ diff --git a/lib/web3/shh.js b/lib/web3/methods/shh.js similarity index 95% rename from lib/web3/shh.js rename to lib/web3/methods/shh.js index 0ee4cf4..926ce07 100644 --- a/lib/web3/shh.js +++ b/lib/web3/methods/shh.js @@ -20,8 +20,8 @@ * @date 2015 */ -var Method = require('./method'); -var formatters = require('./formatters'); +var Method = require('../method'); +var formatters = require('../formatters'); var post = new Method({ name: 'post', diff --git a/lib/web3/watches.js b/lib/web3/methods/watches.js similarity index 98% rename from lib/web3/watches.js rename to lib/web3/methods/watches.js index 6b09fe3..33957e6 100644 --- a/lib/web3/watches.js +++ b/lib/web3/methods/watches.js @@ -20,7 +20,7 @@ * @date 2015 */ -var Method = require('./method'); +var Method = require('../method'); /// @returns an array of objects describing web3.eth.filter api methods var eth = function () { diff --git a/test/ipcprovider.js b/test/ipcprovider.js index 5d729a6..52fd163 100644 --- a/test/ipcprovider.js +++ b/test/ipcprovider.js @@ -1,19 +1,19 @@ var chai = require('chai'); var assert = chai.assert; var SandboxedModule = require('sandboxed-module'); +var net = require('./helpers/FakeIpcRequest') SandboxedModule.registerBuiltInSourceTransformer('istanbul'); var IpcProvider = SandboxedModule.require('../lib/web3/ipcprovider', { requires: { 'bignumber.js': require('bignumber.js'), - 'net': require('./helpers/FakeIpcRequest') } }); describe('lib/web3/ipcprovider', function () { describe('send', function () { it('should send basic request', function () { - var provider = new IpcProvider(); + var provider = new IpcProvider('', net); var result = provider.send({id: 1, method: 'eth_test'}); assert.isObject(result); @@ -22,8 +22,7 @@ describe('lib/web3/ipcprovider', function () { describe('sendAsync', function () { it('should send basic async request', function (done) { - var provider = new IpcProvider(); - + var provider = new IpcProvider('', net); provider.sendAsync({id: 1, method: 'eth_test'}, function (err, result) { assert.isObject(result); done(); @@ -33,13 +32,13 @@ describe('lib/web3/ipcprovider', function () { describe('isConnected', function () { it('should return a boolean', function () { - var provider = new IpcProvider(); + var provider = new IpcProvider('', net); assert.isBoolean(provider.isConnected()); }); it('should return false', function () { - var provider = new IpcProvider(); + var provider = new IpcProvider('', net); provider.connection.writable = false; @@ -47,7 +46,7 @@ describe('lib/web3/ipcprovider', function () { }); it('should return true, when a net handle is set', function () { - var provider = new IpcProvider(); + var provider = new IpcProvider('', net); provider.connection.writable = true;