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

add possible 2d topic arrays fixes #175

Browse Source
This commit is contained in:
Fabian Vogelsteller 2015-04-21 20:46:14 +02:00
parent a5c1bcc6e4
commit c8f42262cc
9 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/web3-light.js vendored
View File

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

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

File diff suppressed because one or more lines are too long

2
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

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

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

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

4
lib/web3/filter.js
View File

@ -42,7 +42,9 @@ var getOptions = function (options) {
// make sure topics, get converted to hex // make sure topics, get converted to hex
options.topics = options.topics || []; options.topics = options.topics || [];
options.topics = options.topics.map(function(topic){ options.topics = options.topics.map(function(topic){
return utils.toHex(topic); return (utils.isArray(topic))
? topic.map(utils.toHex)
: utils.toHex(topic);
}); });
// lazy load // lazy load

1
test/utils.toHex.js
View File

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