From e56e96484bab0abb7e39607f5bba530826f08c67 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Thu, 15 Nov 2012 11:55:34 -0800 Subject: [PATCH] JS: Remote.from_config now takes an obj or a name. --- src/js/remote.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/js/remote.js b/src/js/remote.js index 9e3ee74979..908ea6a68f 100644 --- a/src/js/remote.js +++ b/src/js/remote.js @@ -176,12 +176,12 @@ Request.prototype.accounts = function (accounts) { // // --> trusted: truthy, if remote is trusted -var Remote = function (trusted, websocket_ip, websocket_port, trace) { - this.trusted = trusted; - this.websocket_ip = websocket_ip; - this.websocket_port = websocket_port; +var Remote = function (opts, trace) { + this.trusted = opts.trusted; + this.websocket_ip = opts.websocket_ip; + this.websocket_port = opts.websocket_port; this.id = 0; - this.trace = trace; + this.trace = opts.trace || trace; this._ledger_current_index = undefined; this._ledger_hash = undefined; this._ledger_time = undefined; @@ -219,10 +219,10 @@ var Remote = function (trusted, websocket_ip, websocket_port, trace) { Remote.prototype = new EventEmitter; -Remote.from_config = function (name, trace) { - var serverConfig = exports.config.servers[name]; +Remote.from_config = function (obj, trace) { + var serverConfig = 'string' === typeof obj ? exports.config.servers[obj] : obj; - var remote = new Remote(serverConfig.trusted, serverConfig.websocket_ip, serverConfig.websocket_port, trace); + var remote = new Remote(serverConfig, trace); for (var account in exports.config.accounts) { var accountInfo = exports.config.accounts[account];