-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from cubedro/master
Fixed autoprovider bug
- Loading branch information
Showing
2 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> | ||
* Marian Oancea <[email protected]> | ||
|
@@ -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() { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters