From 6152227668ef715da15efd991a3d6f7d60fd681f Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Wed, 10 Sep 2014 13:09:57 -0700
Subject: [PATCH] settings: change Async.js opts

---
 js/models/blockchain/Insight.js |  1 -
 js/models/network/Async.js      | 22 +++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/js/models/blockchain/Insight.js b/js/models/blockchain/Insight.js
index aa53fb560..e7da834fc 100644
--- a/js/models/blockchain/Insight.js
+++ b/js/models/blockchain/Insight.js
@@ -36,7 +36,6 @@ var Insight = function(opts) {
   this.listeningBlocks = false;
 
   this.url = opts.url;
-  alert(this.url);
   this.opts = {
     'reconnection': opts.reconnection || true,
     'reconnectionDelay': opts.reconnectionDelay || 1000,
diff --git a/js/models/network/Async.js b/js/models/network/Async.js
index c6d001b7d..695e8ae78 100644
--- a/js/models/network/Async.js
+++ b/js/models/network/Async.js
@@ -14,9 +14,7 @@ function Network(opts) {
   var self = this;
   opts = opts || {};
   this.maxPeers = opts.maxPeers || 12;
-  this.host = opts.host || 'localhost';
-  this.port = opts.port || 3001;
-  this.schema = opts.schema || 'https';
+  this.url = opts.url || 'http//localhost:30001';
   this.secretNumber = opts.secretNumber;
   this.cleanUp();
 }
@@ -74,12 +72,12 @@ Network.prototype.connectedCopayers = function() {
   return ret;
 };
 
-Network.prototype._sendHello = function(copayerId,secretNumber) {
+Network.prototype._sendHello = function(copayerId, secretNumber) {
 
   this.send(copayerId, {
     type: 'hello',
     copayerId: this.copayerId,
-    secretNumber : secretNumber
+    secretNumber: secretNumber
   });
 };
 
@@ -197,11 +195,10 @@ Network.prototype._onMessage = function(enc) {
   var self = this;
   switch (payload.type) {
     case 'hello':
-      if (typeof payload.secretNumber === 'undefined' || payload.secretNumber !== this.secretNumber) 
-      {
+      if (typeof payload.secretNumber === 'undefined' || payload.secretNumber !== this.secretNumber) {
         this._sendRejectConnection(sender);
         this._deletePeer(enc.pubkey, 'incorrect secret number');
-        return; 
+        return;
       }
       // if we locked allowed copayers, check if it belongs
       if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
@@ -274,8 +271,8 @@ Network.prototype._onError = function(err) {
   this.criticalError = err.message;
 };
 
-Network.prototype.greet = function(copayerId,secretNumber) {
-  this._sendHello(copayerId,secretNumber);
+Network.prototype.greet = function(copayerId, secretNumber) {
+  this._sendHello(copayerId, secretNumber);
   var peerId = this.peerFromCopayer(copayerId);
   this._addCopayerMap(peerId, copayerId);
 };
@@ -326,11 +323,10 @@ Network.prototype.start = function(opts, openCallback) {
 };
 
 Network.prototype.createSocket = function() {
-  var hostPort = this.schema + '://' + this.host + ':' + this.port;
-  return io.connect(hostPort, {
+  return io.connect(this.url, {
     reconnection: true,
     'force new connection': true,
-    'secure': this.schema === 'https',
+    'secure': this.url.indexOf('https') > -1,
   });
 };