Migrate to our new standard for services

src/js/services/shapeshift.service.js

@@ -1,62 +1,83 @@
 'use strict';
 
-angular.module('bitcoincom.services').factory('shapeshiftService', function (shapeshiftApiService) {
+(function(){
-  var root = {};
-  root.ShiftState = 'Shift';
-  root.coinIn = '';
-  root.coinOut = '';
-  root.withdrawalAddress = '';
-  root.returnAddress = '';
-  root.amount = '';
-  root.marketData = {};
 
-  root.getMarketData = function (coinIn, coinOut, cb) {
+angular
-    root.coinIn = coinIn;
+  .module('bitcoincom.services')
-    root.coinOut = coinOut;
+  .factory('shapeshiftService', shapeshiftService);
+  
+  function shapeshiftService(shapeshiftApiService) {
+
+    var service = {
+      // Variables
+      coinIn: '',
+      coinOut: '',
+      withdrawalAddress: '',
+      returnAddress: '',
+      amount: '',
+      marketData: {},
+      coins: {
+        'BTC': {name: 'Bitcoin', symbol: 'BTC'},
+        'BCH': {name: 'Bitcoin Cash', symbol: 'BCH'}
+      },
+
+      // Functions
+      getMarketData: getMarketData,
+      shiftIt: shiftIt
+    };
+
+    return service;
+
+    function getMarketData(coinIn, coinOut, cb) {
+      service.coinIn = coinIn;
+      service.coinOut = coinOut;
       shapeshiftApiService
-      .marketInfo(root.coinIn, root.coinOut)
+        .marketInfo(service.coinIn, service.coinOut)
         .then(function (marketData) {
-        root.marketData = marketData;
+          service.marketData = marketData;
-        root.rateString = root.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
+          service.rateString = service.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
           if (cb) {
             cb(marketData);
           }
         });
-  };
+    }
 
-  root.coins = {
+    function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) {
-    'BTC': {name: 'Bitcoin', symbol: 'BTC'},
+      // Test if the amount is correct depending on the min and max
-    'BCH': {name: 'Bitcoin Cash', symbol: 'BCH'}
+      if (typeof amount !== 'number' || amount < service.marketData.minimum || amount > service.marketData.maxLimit) {
-  };
-
-  root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) {
-    if (typeof amount !== 'number' || amount < root.marketData.minimum || amount > root.marketData.maxLimit) {
         var err = new Error('Invalid amount');
         cb(err);
       } else {
-      root.withdrawalAddress = withdrawalAddress;
+        // Init service data
-      root.returnAddress = returnAddress;
+        service.withdrawalAddress = withdrawalAddress;
-      root.coinIn = coinIn;
+        service.returnAddress = returnAddress;
-      root.coinOut = coinOut;
+        service.coinIn = coinIn;
-      root.amount = amount;
+        service.coinOut = coinOut;
+        service.amount = amount;
+
+        // Check the address
         shapeshiftApiService.ValidateAddress(withdrawalAddress, coinOut).then(function onSuccess(data) {
           if (data && data.isvalid) {
-          shapeshiftApiService.NormalTx(root).then(function onResponse(data) {
+
+            // Prepare the transaction shapeshift side
+            shapeshiftApiService.NormalTx(service).then(function onResponse(data) {
               var txData = data;
+
+              // If the content is not that it was expected, get back an error
               if (!txData || !txData.orderId || !txData.deposit) {
                 cb(new Error('Invalid response'));
               } else {
-              root.depositInfo = txData;
+                // Get back the data
+                service.depositInfo = txData;
                 var shapeshiftData = {
                   coinIn: coinIn,
                   coinOut: coinOut,
-                toWalletId: root.toWalletId,
+                  toWalletId: service.toWalletId,
-                minAmount: root.marketData.minimum,
+                  minAmount: service.marketData.minimum,
-                maxAmount: root.marketData.maxLimit,
+                  maxAmount: service.marketData.maxLimit,
                   orderId: txData.orderId,
                   toAddress: txData.deposit
                 };
-
                 cb(null, shapeshiftData);
               }
             });
@@ -66,6 +87,6 @@ angular.module('bitcoincom.services').factory('shapeshiftService', function (sha
           }
         });
       }
-  };
+    }
-  return root;
+  }
-});
+})();