status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-23 03:28:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into events_refactor

Browse Source 
Conflicts:
	dist/web3-light.js
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
	lib/web3/filter.js
This commit is contained in:
Marek Kotewicz 2015-04-22 09:28:56 +02:00
commit 4482d5bf00
9 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/web3-light.js vendored
View File

@ -1110,6 +1110,9 @@ var fromDecimal = function (value) {
var toHex = function (val) {
/*jshint maxcomplexity:7 */
if(val === null || typeof val === 'undefined')
return val;
if (isBoolean(val))
return fromDecimal(+val);
@ -2241,9 +2244,11 @@ var getOptions = function (options) {
// make sure topics, get converted to hex
options.topics = options.topics || [];
options.topics = options.topics.map(function(topic){
options.topics = options.topics.map(function(topic) {
if (topic === null) {
return null;
} else if (utils.isArray) {
topic = topic.map(utils.toHex);
}
return utils.toHex(topic);
});

6
dist/web3-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/web3.js vendored
View File

@ -1110,6 +1110,9 @@ var fromDecimal = function (value) {
var toHex = function (val) {
/*jshint maxcomplexity:7 */
if(val === null || typeof val === 'undefined')
return val;
if (isBoolean(val))
return fromDecimal(+val);
@ -2241,9 +2244,11 @@ var getOptions = function (options) {
// make sure topics, get converted to hex
options.topics = options.topics || [];
options.topics = options.topics.map(function(topic){
options.topics = options.topics.map(function(topic) {
if (topic === null) {
return null;
} else if (utils.isArray) {
topic = topic.map(utils.toHex);
}
return utils.toHex(topic);
});

6
dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
lib/utils/utils.js
View File

@ -214,6 +214,9 @@ var fromDecimal = function (value) {
var toHex = function (val) {
/*jshint maxcomplexity:7 */
if(val === null || typeof val === 'undefined')
return val;
if (isBoolean(val))
return fromDecimal(+val);

4
lib/web3/filter.js
View File

@ -41,9 +41,11 @@ var getOptions = function (options) {
// make sure topics, get converted to hex
options.topics = options.topics || [];
options.topics = options.topics.map(function(topic){
options.topics = options.topics.map(function(topic) {
if (topic === null) {
return null;
} else if (utils.isArray(topic)) {
topic = topic.map(utils.toHex);
}
return utils.toHex(topic);
});

1
test/utils.toHex.js
View File

@ -4,6 +4,7 @@ var BigNumber = require('bignumber.js');
var assert = chai.assert;
var tests = [
{ value: null, expected: null },
{ value: 1, expected: '0x1' },
{ value: '1', expected: '0x1' },
{ value: '0x1', expected: '0x1'},