Browse Source
ecde334 Merge pull request #241 from SilentCicero/master 3af1e82 Update eth.js 86d9b58 Added sendRawTransaction 4228b02 common fixes in requestmanager 47e292a version 0.6.0 c597034 gulp 9417bbf Merge branch 'master' into develop 15df5d6 Merge branch 'master' of https://github.com/ethereum/ethereum.js e947252 Merge pull request #234 from ethereum/ethers-patch-1 4d165de update license per name change to web3.js 03ae21b special logs will never be nulls, so there is no reason to check for null value 66f1def updated dependencies, gulp ccb436e Merge branch 'master' into develop d729884 unrelevant change in example fdf46ed fixed providor not set in request manager 811e3b2 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop f454dda Merge branch 'develop' of https://github.com/asinyagin/web3.js into develop 4384805 build files b09bf31 Merge branch 'develop' into allAsync 6ea0d67 Set requests content type to application/json fe703f5 Merge pull request #229 from ethereum/extendWeb3 a90a85a mereg develop a2e5fbd add tests for the outputformatters 556eb45 re-add map files 08d2212 small fix on outputFormatters, dont transform null to 0 1495a0c add comlexity push for poll, does only show on travis 7518ed4 changed extend to _extend 1aefebd merged develop b6c49d4 improved async polling 16252f3 imporved async callback adding, without setinterval f242489 add optional default block parameter to contract call fixes #159 1d3d727 improved comment d9ce08e improved filter interval ddafe00 asyncified filters d14c706 build and improved extend function 733e19e add extend method and tests git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: ecde3345e0e6d4bca0ce03e08ee4957395cd6194cl-refactor
Marek Kotewicz
10 years ago
28 changed files with 841 additions and 257 deletions
@ -1,14 +1,14 @@ |
|||
This file is part of ethereum.js. |
|||
This file is part of web3.js. |
|||
|
|||
ethereum.js is free software: you can redistribute it and/or modify |
|||
web3.js is free software: you can redistribute it and/or modify |
|||
it under the terms of the GNU Lesser General Public License as published by |
|||
the Free Software Foundation, either version 3 of the License, or |
|||
(at your option) any later version. |
|||
|
|||
ethereum.js is distributed in the hope that it will be useful, |
|||
web3.js is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU Lesser General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU Lesser General Public License |
|||
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. |
|||
along with web3.js. If not, see <http://www.gnu.org/licenses/>. |
|||
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,3 +1,3 @@ |
|||
{ |
|||
"version": "0.5.0" |
|||
"version": "0.6.0" |
|||
} |
|||
|
|||
@ -0,0 +1,76 @@ |
|||
var chai = require('chai'); |
|||
var assert = chai.assert; |
|||
var FakeHttpProvider = require('./helpers/FakeHttpProvider'); |
|||
var web3 = require('../lib/web3'); |
|||
|
|||
|
|||
var tests = [{ |
|||
properties: [new web3._extend.Property({ |
|||
name: 'gasPrice', |
|||
getter: 'eth_gasPrice', |
|||
outputFormatter: web3._extend.formatters.outputBigNumberFormatter |
|||
})] |
|||
},{ |
|||
methods: [new web3._extend.Method({ |
|||
name: 'getBalance', |
|||
call: 'eth_getBalance', |
|||
params: 2, |
|||
inputFormatter: [web3._extend.utils.toAddress, web3._extend.formatters.inputDefaultBlockNumberFormatter], |
|||
outputFormatter: web3._extend.formatters.outputBigNumberFormatter |
|||
})] |
|||
},{ |
|||
property: 'admin', |
|||
properties: [new web3._extend.Property({ |
|||
name: 'gasPrice', |
|||
getter: 'eth_gasPrice', |
|||
outputFormatter: web3._extend.formatters.outputBigNumberFormatter |
|||
})], |
|||
methods: [new web3._extend.Method({ |
|||
name: 'getBalance', |
|||
call: 'eth_getBalance', |
|||
params: 2, |
|||
inputFormatter: [web3._extend.utils.toAddress, web3._extend.formatters.inputDefaultBlockNumberFormatter], |
|||
outputFormatter: web3._extend.formatters.outputBigNumberFormatter |
|||
})] |
|||
}]; |
|||
|
|||
describe('web3', function () { |
|||
describe('_extend', function () { |
|||
tests.forEach(function (test, index) { |
|||
it('test no: ' + index, function () { |
|||
web3._extend(test); |
|||
|
|||
|
|||
if(test.properties) |
|||
test.properties.forEach(function(property){ |
|||
|
|||
var provider = new FakeHttpProvider(); |
|||
web3.setProvider(provider); |
|||
provider.injectResult(''); |
|||
provider.injectValidation(function (payload) { |
|||
assert.equal(payload.jsonrpc, '2.0'); |
|||
assert.equal(payload.method, property.getter); |
|||
}); |
|||
|
|||
if(test.property) { |
|||
assert.isObject(web3[test.property][property.name]); |
|||
assert.isFunction(web3[test.property]['get'+ property.name.charAt(0).toUpperCase() + property.name.slice(1)]); |
|||
} else { |
|||
assert.isObject(web3[property.name]); |
|||
assert.isFunction(web3['get'+ property.name.charAt(0).toUpperCase() + property.name.slice(1)]); |
|||
} |
|||
}); |
|||
|
|||
if(test.methods) |
|||
test.methods.forEach(function(property){ |
|||
if(test.property) |
|||
assert.isFunction(web3[test.property][property.name]); |
|||
else |
|||
assert.isFunction(web3[property.name]); |
|||
}); |
|||
|
|||
}); |
|||
}); |
|||
}); |
|||
}); |
|||
|
|||
Loading…
Reference in new issue