diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-12-16 18:10:28 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-12-16 18:10:28 +0800 |
| commit | e9db2d1b1877bdf49cb76de46849a1426ded288c (patch) | |
| tree | fcad7bcf7df6fdb72e69d8282d07fa570d9b399b /lib/autoprovider.js | |
| parent | f6ee8e52dd50ba4e7c2ff2de0ca3bdf2aba9ce3a (diff) | |
| parent | b402484e41c9579f33d70f8f8b191ab0074dad62 (diff) | |
| download | dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.tar dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.tar.gz dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.tar.bz2 dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.tar.lz dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.tar.xz dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.tar.zst dexon-e9db2d1b1877bdf49cb76de46849a1426ded288c.zip | |
Merge pull request #15 from debris/master
changes from cpp-ethereum
Diffstat (limited to 'lib/autoprovider.js')
| -rw-r--r-- | lib/autoprovider.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/autoprovider.js b/lib/autoprovider.js index 470861686..735f56349 100644 --- a/lib/autoprovider.js +++ b/lib/autoprovider.js @@ -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() { |