Merge pull request #1 from cubedro/master

Fixed autoprovider bug
This commit is contained in:
Marek Kotewicz 2014-11-18 09:08:15 +01:00
commit 04845d42c0
2 changed files with 6 additions and 6 deletions

View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file websocket.js
/** @file autoprovider.js
* @authors:
* Marek Kotewicz <marek@ethdev.com>
* Marian Oancea <marian@ethdev.com>
@ -28,7 +28,7 @@
*/
if (process.env.NODE_ENV !== 'build') {
var WebSocket = require('ws'); // jshint ignore:line
var web3 = require('./web3'); // jshint ignore:line
var web3 = require('./main.js'); // jshint ignore:line
}
var AutoProvider = function (userOptions) {
@ -44,13 +44,13 @@ var AutoProvider = function (userOptions) {
this.provider = new web3.providers.QtProvider();
return;
}
userOptions = userOptions || {};
var options = {
httprpc: userOptions.httprpc || 'http://localhost:8080',
websockets: userOptions.websockets || 'ws://localhost:40404/eth'
};
var self = this;
var closeWithSuccess = function (success) {
ws.close();
@ -71,7 +71,7 @@ var AutoProvider = function (userOptions) {
var ws = new WebSocket(options.websockets);
ws.onopen = function() {
closeWithSuccess(true);
closeWithSuccess(true);
};
ws.onerror = function() {

View File

@ -1,7 +1,7 @@
{
"name": "ethereum.js",
"namespace": "ethereum",
"version": "0.0.3",
"version": "0.0.5",
"description": "Ethereum Compatible JavaScript API",
"main": "./index.js",
"directories": {