fixes for autoprovider

This commit is contained in:
Marek Kotewicz 2015-01-19 11:36:41 +01:00
parent 823fb2995b
commit 86b417e83f
5 changed files with 9 additions and 13 deletions

8
dist/ethereum.js vendored
View File

@ -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) {
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', {
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;
* @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
/** /**

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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) {
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;

View File

@ -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
/** /**