kiss sync filter

web3 · Jul 10, 2015 · 7183775 · 7183775
1 parent b13ed4e
commit 7183775
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/lib/web3/filter.js b/lib/web3/filter.js
@@ -139,28 +139,29 @@ var Filter = function (options, methods, formatter, callback) {
     this.callbacks = [];
     this.pollFilters = [];
     this.formatter = formatter;
-    this.implementation.newFilter(this.options, function(error, id){
-        if(error) {
-            self.callbacks.forEach(function(cb){
-                cb(error);
-            });
-        } else {
+
+    if (callback) {
+        this.implementation.newFilter(this.options, function(error, id) {
+            if (error) {
+                return self.callbacks.forEach(function(cb){
+                    cb(error);
+                });
+            } 
             self.filterId = id;
 
             // get filter logs for the already existing watch calls
             self.callbacks.forEach(function(cb){
                 getLogsAtStart(self, cb);
             });
+
             if(self.callbacks.length > 0)
                 pollFilter(self);
 
-            // start to watch immediately
-            if(callback) {
-                return self.watch(callback);
-            }
-        }
-    });
-
+            return self.watch(callback);
+        });
+    } else {
+        this.filterId = this.implementation.newFilter(this.options);
+    }
 };
 
 Filter.prototype.watch = function (callback) {