Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjs

1 files changed, 4 insertions, 9 deletions

diff --git a/lib/web3.js b/lib/web3.js
index 25c2901a8..f071eea49 100644
--- a/lib/web3.js
+++ b/lib/web3.js
@@ -23,9 +23,6 @@
  * @date 2014
  */
 
-var Filter = require('./filter');
-var ProviderManager = require('./providermanager');
-
 /// Recursively resolves all promises in given object and replaces the resolved values with promises
 /// @param any object/array/promise/anything else..
 /// @returns (resolves) object with replaced promises with their result 
@@ -319,7 +316,7 @@ var web3 = {
     /// eth object prototype
     eth: {
         watch: function (params) {
-            return new Filter(params, ethWatch);
+            return new web3.filter(params, ethWatch);
         }
     },
 
@@ -329,7 +326,7 @@ var web3 = {
     /// shh object prototype
     shh: {
         watch: function (params) {
-            return new Filter(params, shhWatch);
+            return new web3.filter(params, shhWatch);
         }
     },
 
@@ -387,8 +384,6 @@ var shhWatch = {
 
 setupMethods(shhWatch, shhWatchMethods());
 
-web3.provider = new ProviderManager();
-
 web3.setProvider = function(provider) {
     provider.onmessage = messageHandler;
     web3.provider.set(provider);
@@ -411,5 +406,5 @@ function messageHandler(data) {
     }
 }
 
-if (typeof(module) !== "undefined")
-    module.exports = web3;
+module.exports = web3;
+