refactor(SFOX): moved to blockchain/bitcoin-sfox-client

blockchain · Dec 13, 2016 · 3901437 · 3901437
1 parent aee5e2f
commit 3901437
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 1,673 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -58,7 +58,6 @@ module.exports = (grunt) ->
               presets: ["es2015"]
               global: true
               ignore: [
-                /\/node_modules\/(?!bitcoin-exchange-client\/)/
                 "/src/blockchain-socket.js"
                 "/src/ws-browser.js"
               ]

diff --git a/karma.conf.js b/karma.conf.js
@@ -45,7 +45,7 @@ module.exports = function (config) {
             presets: ['es2015'],
             ignore: [
               'src/ws-browser.js', // undefined is not an object (evaluating 'global.WebSocket')
-              /\/node_modules\/(?!bitcoin-(coinify|exchange)-client\/)/
+              /\/node_modules\/(?!bitcoin-(coinify|exchange|sfox)-client\/)/
             ],
             global: true,
             sourceMap: 'inline'
@@ -85,7 +85,6 @@ module.exports = function (config) {
       'tests/bip38_spec.js.coffee',
       'tests/address_spec.js.coffee',
       'tests/external_spec.js.coffee',
-      'tests/sfox/*_spec.js.coffee',
       'tests/keychain_spec.js.coffee',
       'tests/keyring_spec.js.coffee',
       'tests/hdaccount_spec.js.coffee',

diff --git a/package.json b/package.json
@@ -49,8 +49,8 @@
     "unorm": "^1.4.1",
     "ws": "1.1.*",
     "pbkdf2": "3.0.4",
-    "bitcoin-exchange-client": "blockchain/bitcoin-exchange-client#master",
-    "bitcoin-coinify-client": "blockchain/bitcoin-coinify-client#master"
+    "bitcoin-coinify-client": "blockchain/bitcoin-coinify-client#master",
+    "bitcoin-sfox-client": "blockchain/bitcoin-sfox-client#master"
   },
   "devDependencies": {
     "babel-polyfill": "6.16.*",

diff --git a/src/blockchain-wallet.js b/src/blockchain-wallet.js
@@ -855,7 +855,6 @@ Wallet.prototype.metadata = function (typeId) {
 };
 
 Wallet.prototype.incStats = function () {
-  console.log('incing stats');
   API.incrementSecPassStats(this.isDoubleEncrypted);
   return true;
 };
diff --git a/src/external.js b/src/external.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var Coinify = require('bitcoin-coinify-client');
-var SFOX = require('./sfox/sfox');
+var SFOX = require('bitcoin-sfox-client');
 var Metadata = require('./metadata');
 var ExchangeDelegate = require('./exchange-delegate');
 

diff --git a/src/sfox/api.js b/src/sfox/api.js
diff --git a/src/sfox/payment-account.js b/src/sfox/payment-account.js
diff --git a/src/sfox/payment-medium.js b/src/sfox/payment-medium.js