fixed filters encoding null

web3 · Apr 22, 2015 · 5f2eb33 · 5f2eb33
1 parent 4482d5b
commit 5f2eb33
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 55 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
@@ -214,9 +214,6 @@ 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);
 

diff --git a/lib/web3/event.js b/lib/web3/event.js
@@ -98,15 +98,16 @@ SolidityEvent.prototype.encode = function (indexed, options) {
         return i.indexed === true;
     }).map(function (i) {
         var value = indexed[i.name];
-        if (value !== undefined) {
-            if (utils.isArray(value)) {
-                return value.map(function (v) {
-                    return '0x' + coder.encodeParam(i.type, v);
-                });
-            }
-            return '0x' + coder.encodeParam(i.type, value);
-        } 
-        return null;
+        if (value === undefined || value === null) {
+            return null;
+        }
+
+        if (utils.isArray(value)) {
+            return value.map(function (v) {
+                return '0x' + coder.encodeParam(i.type, v);
+            });
+        }
+        return '0x' + coder.encodeParam(i.type, value);
     });
 
     options.topics = options.topics.concat(indexedTopics);

diff --git a/lib/web3/filter.js b/lib/web3/filter.js
@@ -42,7 +42,7 @@ var getOptions = function (options) {
     // make sure topics, get converted to hex
     options.topics = options.topics || [];
     options.topics = options.topics.map(function(topic) {
-        if (topic === null) {
+        if (topic === null || topic === undefined) {
             return null;
         } else if (utils.isArray(topic)) {
             topic = topic.map(utils.toHex);

diff --git a/test/event.encode.js b/test/event.encode.js
@@ -75,7 +75,56 @@ var tests = [{
             null // d
         ]
     }
-
+}, {
+    abi: {
+        name: 'event1',
+        inputs: [{
+            type: 'int',
+            name: 'a',
+            indexed: true
+        }, {
+            type: 'int',
+            name: 'b',
+            indexed: true
+        }]
+    },
+    address: '0x1234567890123456789012345678901234567890',
+    signature: 'ffff',
+    indexed: {
+        a: [16, 1],
+        b: 2
+    },
+    options: {},
+    expected: {
+        address: '0x1234567890123456789012345678901234567890',
+        topics: [
+            '0xffff',
+            ['0x0000000000000000000000000000000000000000000000000000000000000010', '0x0000000000000000000000000000000000000000000000000000000000000001'],
+            '0x0000000000000000000000000000000000000000000000000000000000000002'
+        ]
+    }
+}, {
+    abi: {
+        name: 'event1',
+        inputs: [{
+            type: 'int',
+            name: 'a',
+            indexed: true
+        }]
+    },
+    address: '0x1234567890123456789012345678901234567890',
+    signature: 'ffff',
+    indexed: {
+        a: null
+    },
+    options: {},
+    expected: {
+        address: '0x1234567890123456789012345678901234567890',
+        topics: [
+            '0xffff',
+            null
+        ]
+    }
 }];
 
 describe('lib/web3/event', function () {

diff --git a/test/utils.toHex.js b/test/utils.toHex.js
@@ -4,7 +4,6 @@ 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'},