moved files to /methods/ subdirectory
This commit is contained in:
parent
90c42d7baa
commit
777030cdb9
10
lib/web3.js
10
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');
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* @date 2015
|
||||
*/
|
||||
|
||||
var Method = require('./method');
|
||||
var Method = require('../method');
|
||||
|
||||
var putString = new Method({
|
||||
name: 'putString',
|
|
@ -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";
|
|
@ -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 = [
|
|
@ -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',
|
|
@ -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 () {
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue