From 052e2522be188d7b6c15753c79bdc823fa921eb6 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Wed, 6 Aug 2014 09:58:16 -0700
Subject: [PATCH] paypro: stop using global $http.

---
 js/models/core/Wallet.js       | 12 ++++--------
 test/mocks/FakePayProServer.js | 19 +++++++------------
 test/test.PayPro.js            |  3 ++-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 86ada9890..5712347b5 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -25,10 +25,6 @@ var TxProposals = require('./TxProposals');
 var PrivateKey = require('./PrivateKey');
 var copayConfig = require('../../../config');
 
-var G = typeof window !== 'undefined'
-  ? window
-  : global;
-
 function Wallet(opts) {
   var self = this;
 
@@ -804,7 +800,7 @@ Wallet.prototype.createPaymentTx = function(options, cb) {
     return;
   }
 
-  return $http({
+  return Wallet.request({
     method: options.method || 'POST',
     url: options.uri,
     headers: {
@@ -1041,7 +1037,7 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
     view[i] = pay[i];
   }
 
-  return $http({
+  return Wallet.request({
     method: 'POST',
     url: txp.merchant.pr.pd.payment_url,
     headers: {
@@ -1719,10 +1715,10 @@ Wallet.prototype.verifySignedJson = function(senderId, payload, signature) {
 // deviates from BIP-70.
 
 // if (typeof angular !== 'undefined') {
-//   G.$http = G.$http || angular.bootstrap().get('$http');
+//   var $http = angular.bootstrap().get('$http');
 // }
 
-G.$http = G.$http || function $http(options, callback) {
+Wallet.request = function(options, callback) {
   if (typeof options === 'string') {
     options = { uri: options };
   }
diff --git a/test/mocks/FakePayProServer.js b/test/mocks/FakePayProServer.js
index 6ce42da22..24d3a4ca6 100644
--- a/test/mocks/FakePayProServer.js
+++ b/test/mocks/FakePayProServer.js
@@ -4,9 +4,7 @@ var is_browser = typeof process == 'undefined'
   || typeof process.versions === 'undefined';
 var bitcore = bitcore || require('bitcore');
 var PayPro = bitcore.PayPro;
-
-var G = is_browser ? window : global;
-G.SSL_UNTRUSTED = true;
+var Wallet = require('../../js/models/core/Wallet');
 
 var x509 = {
   priv: ''
@@ -93,17 +91,14 @@ x509.der = new Buffer(x509.der, 'base64');
 x509.pem = new Buffer(x509.pem, 'base64');
 
 function startServer(cb) {
-  if (G.$http && G.$http.__server) {
+  if (Wallet.request._server) {
     setTimeout(function() {
-      return cb(null, G.$http.__server);
+      return cb(null, Wallet.request._server);
     }, 1);
     return;
   }
 
-  var old;
-  if (G.$http) {
-    old = G.$http;
-  }
+  var old = Wallet.request;
 
   var server = {
     POST: {
@@ -283,12 +278,12 @@ function startServer(cb) {
       if (cb) return cb();
     },
     close: function(cb) {
-      if (old) G.$http = old;
+      Wallet.request = old;
       return cb();
     }
   };
 
-  G.$http = function(options) {
+  Wallet.request = function(options) {
     var ret = {
       success: function(cb) {
         this._success = cb;
@@ -332,7 +327,7 @@ function startServer(cb) {
     return ret;
   };
 
-  G.$http.__server = server;
+  Wallet.request._server = server;
 
   setTimeout(function() {
     return cb(null, server);
diff --git a/test/test.PayPro.js b/test/test.PayPro.js
index d78ed883c..8b0d30bba 100644
--- a/test/test.PayPro.js
+++ b/test/test.PayPro.js
@@ -3,7 +3,8 @@
 var chai = chai || require('chai');
 var should = chai.should();
 var sinon = require('sinon');
-var is_browser = (typeof process == 'undefined' || typeof process.versions === 'undefined');
+var is_browser = typeof process == 'undefined'
+  || typeof process.versions === 'undefined';
 if (is_browser) {
   var copay = require('copay'); //browser
 } else {