Commit 86b417e8 authored by Marek Kotewicz's avatar Marek Kotewicz

fixes for autoprovider

parent 823fb299
...@@ -387,10 +387,9 @@ module.exports = { ...@@ -387,10 +387,9 @@ module.exports = {
* if it fails, it uses HttpRpcProvider * if it fails, it uses HttpRpcProvider
*/ */
// TODO: is these line is supposed to be here? var web3 = require('./web3'); // jshint ignore:line
if ("build" !== 'build') {/* if ("build" !== 'build') {/*
var WebSocket = require('ws'); // jshint ignore:line var WebSocket = require('ws'); // jshint ignore:line
var web3 = require('./web3'); // jshint ignore:line
*/} */}
/** /**
...@@ -433,7 +432,7 @@ var AutoProvider = function (userOptions) { ...@@ -433,7 +432,7 @@ var AutoProvider = function (userOptions) {
self.poll = self.provider.poll.bind(self.provider); self.poll = self.provider.poll.bind(self.provider);
} }
self.sendQueue.forEach(function (payload) { self.sendQueue.forEach(function (payload) {
self.provider(payload); self.provider.send(payload);
}); });
self.onmessageQueue.forEach(function (handler) { self.onmessageQueue.forEach(function (handler) {
self.provider.onmessage = handler; self.provider.onmessage = handler;
...@@ -474,7 +473,7 @@ Object.defineProperty(AutoProvider.prototype, 'onmessage', { ...@@ -474,7 +473,7 @@ Object.defineProperty(AutoProvider.prototype, 'onmessage', {
module.exports = AutoProvider; module.exports = AutoProvider;
},{}],3:[function(require,module,exports){ },{"./web3":8}],3:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -807,7 +806,6 @@ module.exports = HttpRpcProvider; ...@@ -807,7 +806,6 @@ module.exports = HttpRpcProvider;
* @date 2014 * @date 2014
*/ */
// TODO: is these line is supposed to be here?
var web3 = require('./web3'); // jshint ignore:line var web3 = require('./web3'); // jshint ignore:line
/** /**
......
This diff is collapsed.
This diff is collapsed.
...@@ -27,10 +27,9 @@ ...@@ -27,10 +27,9 @@
* if it fails, it uses HttpRpcProvider * if it fails, it uses HttpRpcProvider
*/ */
// TODO: is these line is supposed to be here? var web3 = require('./web3'); // jshint ignore:line
if (process.env.NODE_ENV !== 'build') { if (process.env.NODE_ENV !== 'build') {
var WebSocket = require('ws'); // jshint ignore:line var WebSocket = require('ws'); // jshint ignore:line
var web3 = require('./web3'); // jshint ignore:line
} }
/** /**
...@@ -73,7 +72,7 @@ var AutoProvider = function (userOptions) { ...@@ -73,7 +72,7 @@ var AutoProvider = function (userOptions) {
self.poll = self.provider.poll.bind(self.provider); self.poll = self.provider.poll.bind(self.provider);
} }
self.sendQueue.forEach(function (payload) { self.sendQueue.forEach(function (payload) {
self.provider(payload); self.provider.send(payload);
}); });
self.onmessageQueue.forEach(function (handler) { self.onmessageQueue.forEach(function (handler) {
self.provider.onmessage = handler; self.provider.onmessage = handler;
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
* @date 2014 * @date 2014
*/ */
// TODO: is these line is supposed to be here?
var web3 = require('./web3'); // jshint ignore:line var web3 = require('./web3'); // jshint ignore:line
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment