Merge branch 'develop'

2 files changed, 110 insertions, 8 deletions

diff --git a/test/event.js b/test/event.js
index 781f42e5e..9edd93ae7 100644
--- a/test/event.js
+++ b/test/event.js
@@ -1,22 +1,124 @@
 var assert = require('assert');
 var event = require('../lib/event.js');
+var f = require('../lib/formatters.js');
 
 describe('event', function () {
-    it('should create filter input object from given', function () {
+    it('should create basic filter input object', function () {
         
         // given
         var address = '0x012345'; 
         var signature = '0x987654';
+        var e = {
+            name: 'Event',
+            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+        };
 
         // when
-        var impl = event(address, signature);
+        var impl = event(address, signature, e);
         var result = impl();
 
         // then
         assert.equal(result.address, address); 
-        assert.equal(result.topics.length, 1);
-        assert.equal(result.topics[0], signature);
+        assert.equal(result.topic.length, 1);
+        assert.equal(result.topic[0], signature);
 
     });
+
+    it('should create filter input object with options', function () {
+        
+        // given
+        var address = '0x012345';
+        var signature = '0x987654';
+        var options = {
+            earliest: 1,
+            latest: 2,
+            offset: 3,
+            max: 4
+        };
+        var e = {
+            name: 'Event',
+            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+        };
+
+        // when
+        var impl = event(address, signature, e); 
+        var result = impl({}, options);
+
+        // then
+        assert.equal(result.address, address);
+        assert.equal(result.topic.length, 1);
+        assert.equal(result.topic[0], signature);
+        assert.equal(result.earliest, options.earliest);
+        assert.equal(result.latest, options.latest);
+        assert.equal(result.offset, options.offset);
+        assert.equal(result.max, options.max);
+    
+    });
+
+    it('should create filter input object with indexed params', function () {
+    
+        // given
+        var address = '0x012345';
+        var signature = '0x987654';
+        var options = {
+            earliest: 1,
+            latest: 2,
+            offset: 3,
+            max: 4
+        };
+        var e = {
+            name: 'Event',
+            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+        };
+
+        // when
+        var impl = event(address, signature, e); 
+        var result = impl({a: 4}, options);
+
+        // then
+        assert.equal(result.address, address);
+        assert.equal(result.topic.length, 2);
+        assert.equal(result.topic[0], signature);
+        assert.equal(result.topic[1], f.formatInputInt(4));
+        assert.equal(result.earliest, options.earliest);
+        assert.equal(result.latest, options.latest);
+        assert.equal(result.offset, options.offset);
+        assert.equal(result.max, options.max);
+
+    });
+
+    it('should create filter input object with an array of indexed params', function () {
+    
+        // given
+        var address = '0x012345';
+        var signature = '0x987654';
+        var options = {
+            earliest: 1,
+            latest: 2,
+            offset: 3,
+            max: 4
+        };
+        var e = {
+            name: 'Event',
+            inputs: [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}]
+        };
+
+        // when
+        var impl = event(address, signature, e); 
+        var result = impl({a: [4, 69]}, options);
+
+        // then
+        assert.equal(result.address, address);
+        assert.equal(result.topic.length, 2);
+        assert.equal(result.topic[0], signature);
+        assert.equal(result.topic[1][0], f.formatInputInt(4));
+        assert.equal(result.topic[1][1], f.formatInputInt(69));
+        assert.equal(result.earliest, options.earliest);
+        assert.equal(result.latest, options.latest);
+        assert.equal(result.offset, options.offset);
+        assert.equal(result.max, options.max);
+
+    });
+
 });
 
diff --git a/test/abi.filters.js b/test/utils.filters.js
index 42385fd2a..f2d2788b0 100644
--- a/test/abi.filters.js
+++ b/test/utils.filters.js
@@ -1,7 +1,7 @@
 var assert = require('assert');
-var abi = require('../lib/abi.js');
+var utils = require('../lib/utils.js');
 
-describe('abi', function() {
+describe('utils', function() {
     it('should filter functions and events from input array properly', function () {
 
         // given
@@ -36,8 +36,8 @@ describe('abi', function() {
         }];
         
         // when
-        var events = abi.filterEvents(description);
-        var functions = abi.filterFunctions(description);
+        var events = utils.filterEvents(description);
+        var functions = utils.filterFunctions(description);
 
         // then
         assert.equal(events.length, 1);