Merge pull request #308 from bethnull/develop

fix asynchronous version of Filter.get().

lib/web3/filter.js

@@ -139,6 +139,7 @@ var Filter = function (options, methods, formatter, callback) {
     this.implementation = implementation;
     this.filterId = null;
     this.callbacks = [];
+    this.getLogsCallbacks = [];
     this.pollFilters = [];
     this.formatter = formatter;
     this.implementation.newFilter(this.options, function(error, id){
@@ -149,6 +150,13 @@ var Filter = function (options, methods, formatter, callback) {
         } else {
             self.filterId = id;
 
+            // check if there are get pending callbacks as a consequence
+            // of calling get() with filterId unassigned.
+            self.getLogsCallbacks.forEach(function (cb){
+                self.get(cb);
+            });
+            self.getLogsCallbacks = [];
+
             // get filter logs for the already existing watch calls
             self.callbacks.forEach(function(cb){
                 getLogsAtStart(self, cb);
@@ -187,6 +195,11 @@ Filter.prototype.stopWatching = function () {
 Filter.prototype.get = function (callback) {
     var self = this;
     if (utils.isFunction(callback)) {
+        if (this.filterId === null) {
+            // If filterId is not set yet, call it back
+            // when newFilter() assigns it.
+            this.getLogsCallbacks.push(callback);
+        } else {
             this.implementation.getLogs(this.filterId, function(err, res){
                 if (err) {
                     callback(err);
@@ -196,7 +209,11 @@ Filter.prototype.get = function (callback) {
                     }));
                 }
             });
+        }
     } else {
+        if (this.filterId === null) {
+            throw new Error('Filter ID Error: filter().get() can\'t be chained synchronous, please provide a callback for the get() method.');
+        }
         var logs = this.implementation.getLogs(this.filterId);
         return logs.map(function (log) {
             return self.formatter ? self.formatter(log) : log;

test/web3.eth.filter.js

@@ -66,11 +66,34 @@ describe('web3.eth', function () {
                });
 
                // call
-                web3.eth[method].apply(null, test.args);
+               var filter = web3.eth[method].apply(null, test.args);
 
-            });
-        });
-    });
+               // test filter.get
+               if(typeof test.args === 'object') {
+
+                   var logs = [{data: '0xb'}, {data: '0x11'}];
+
+                   provider.injectResult(logs);
+                   provider.injectValidation(function (payload) {
+                       assert.equal(payload.jsonrpc, '2.0');
+                       assert.equal(payload.method, 'eth_getFilterLogs');
+                       assert.deepEqual(payload.params, [test.formattedResult]);
                    });
 
+                   // sync should throw an error
+                   try {
+                       assert.throws(filter.get());
+                   } catch(e){
+                       assert.instanceOf(e, Error);
+                   }
 
+                   // async should get the fake logs
+                   filter.get(function(e, res){
+                       assert.equal(logs, res);
+                       done();
+                   });
+               }
+            });
+        });
+    });
+});