From 6bd316424adf295a7ec61e12e549c9d10e42380d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 1 Jun 2016 15:49:20 -0300
Subject: [PATCH] refactor baseUrl in angular-bwc

---
 angular-bitcore-wallet-client/index.js | 35 ++++++--------------------
 src/js/services/profileService.js      | 11 ++------
 src/js/services/storageService.js      |  8 ++++++
 test/helpers.js                        | 10 +++-----
 4 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js
index 9ad530e0e..417566863 100644
--- a/angular-bitcore-wallet-client/index.js
+++ b/angular-bitcore-wallet-client/index.js
@@ -6,31 +6,9 @@ bwcModule.constant('MODULE_VERSION', '1.0.0');
 bwcModule.provider("bwcService", function() {
   var provider = {};
 
-  var config = {
-    baseUrl: 'https://bws.bitpay.com/bws/api',
-    verbose: null,
-    transports: null
-  };
-
-  provider.setBaseUrl = function(url) {
-    config.baseUrl = url;
-  };
-
-  provider.setVerbose = function(v) {
-    config.verbose = v ? true : false;
-  };
-
   provider.$get = function() {
     var service = {};
 
-    service.setBaseUrl = function(url) {
-      config.baseUrl = url;
-    };
-
-    service.setTransports = function(transports) {
-      config.transports = transports;
-    };
-
     service.getBitcore = function() {
       return Client.Bitcore;
     };
@@ -46,20 +24,21 @@ bwcModule.provider("bwcService", function() {
     service.buildTx = Client.buildTx;
     service.parseSecret = Client.parseSecret;
     service.Client = Client;
-    service.config = config;
 
     service.getUtils = function() {
       return Client.Utils;
     };
 
-    service.getClient = function(walletData) {
+    service.getClient = function(walletData, opts) {
+
+      //note opts use `baseurl` all lowercase;
       var bwc = new Client({
-        baseUrl: config.baseUrl,
-        verbose: config.verbose,
-        transports: config.transports
+        baseUrl: opts.baseurl || 'https://bws.bitpay.com/bws/api',
+        verbose: opts.verbose,
+        transports: ['polling'],
       });
       if (walletData)
-        bwc.import(walletData);
+        bwc.import(walletData, opts);
       return bwc;
     };
     return service;
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index ecea8c747..c03891c3e 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -67,7 +67,6 @@ angular.module('copayApp.services')
       var defaults = configService.getDefaults();
 
       bwcService.setBaseUrl((config.bwsFor && config.bwsFor[walletId]) || defaults.bws.url);
-      bwcService.setTransports(['polling']);
     }
 
     root.setWalletClient = function(credentials) {
@@ -219,10 +218,7 @@ angular.module('copayApp.services')
 
     root._seedWallet = function(opts, cb) {
       opts = opts || {};
-      if (opts.bwsurl)
-        bwcService.setBaseUrl(opts.bwsurl);
-
-      var walletClient = bwcService.getClient();
+      var walletClient = bwcService.getClient(null, opts);
       var network = opts.networkName || 'livenet';
 
 
@@ -471,10 +467,8 @@ angular.module('copayApp.services')
     };
 
     root.importWallet = function(str, opts, cb) {
-      if (opts.bwsurl)
-        bwcService.setBaseUrl(opts.bwsurl);
 
-      var walletClient = bwcService.getClient();
+      var walletClient = bwcService.getClient(null, opts);
 
       $log.debug('Importing Wallet:', opts);
       try {
@@ -573,7 +567,6 @@ angular.module('copayApp.services')
 
       configService.get(function(err) {
         bwcService.setBaseUrl(defaults.bws.url);
-        bwcService.setTransports(['polling']);
         root._createNewProfile(opts, function(err, p) {
           if (err) return cb(err);
 
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 96176d3e5..877933351 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -173,6 +173,14 @@ angular.module('copayApp.services')
       storage.remove('backup-' + walletId, cb);
     };
 
+    root.setDerivationTestFlag = function(walletId, ua, cb) {
+      storage.set('DerivationTest-'+walletId+ua.replace(' ', ''), true, cb);
+    };
+
+    root.getDerivationTestFlag = function(walletId, ua, cb) {
+      storage.get('DerivationTest-'+walletId+ua.replace(' ', ''), cb);
+    };
+
     root.setCleanAndScanAddresses = function(walletId, cb) {
       storage.set('CleanAndScanAddresses', walletId, cb);
     };
diff --git a/test/helpers.js b/test/helpers.js
index 1709270a0..95f4a4eb8 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -93,13 +93,11 @@ mocks.init = function(fixtures, controllerName, opts, done) {
 
       $delegate.getClient = function(walletData) {
 
-        var bwc = new $delegate.Client({
-          baseUrl: config.baseUrl,
-          verbose: config.verbose,
-          transports: config.transports
-        });
+        var bwc = new $delegate.Client();
         if (walletData)
-          bwc.import(walletData);
+          bwc.import(walletData, {
+            baseUrl: config.baseUrl
+          });
 
         function createHash(method, url, args) {
           var headers = JSON.stringify(bwc._getHeaders(method, url, args));