Merge 1496b5a into b9e87ca

karma.conf.js

@@ -13,7 +13,7 @@ module.exports = function (config) {
     logLevel: config.LOG_WARN,
 
     client: {
-      captureConsole: true
+      captureConsole: false
     },
 
     autoWatch: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoin-unocoin-client",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Buy and sell Bitcoin using Unocoin API.",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "babel-polyfill": "6.16.*",
     "babel-preset-es2015": "6.16.*",
     "babelify": "7.3.*",
-    "bitcoin-exchange-client": "~0.4.1"
+    "bitcoin-exchange-client": "^0.5.0"
   },
   "devDependencies": {
     "browserify": "13.*",

src/trade.js

@@ -21,6 +21,7 @@ class Trade extends Exchange.Trade {
     if (obj) {
       this._id = obj.id;
       this._state = obj.state;
+      this._txHash = obj.tx_hash;
 
       this._delegate.deserializeExtraFields(obj, this);
       this._confirmed = obj.confirmed;
@@ -92,17 +93,17 @@ class Trade extends Exchange.Trade {
     this._sendAmount = this._inAmount;
 
     this._outAmount = null;
-    this._outAmountExpected = null;
+    this._receiveAmount = null;
 
     if (obj.btc && obj.btc !== '' && obj.btc !== '0') {
       if (this.state !== 'completed') {
-        this._outAmountExpected = parseFloat(obj.btc) * 100000000.0;
+        this._receiveAmount = parseFloat(obj.btc);
       } else {
-        this._outAmount = parseFloat(obj.btc) * 100000000.0;
-        this._outAmountExpected = this._outAmount;
+        this._outAmount = parseFloat(obj.btc);
+        this._receiveAmount = this._outAmount;
       }
     } else if (this._delegate.ticker) {
-      this._outAmountExpected = Math.round(this._inAmount / this._delegate.ticker.buy.price * 100000000);
+      this._receiveAmount = parseFloat((this._inAmount / this._delegate.ticker.buy.price).toFixed(8));
     }
   }
 

tests/trade_spec.js

@@ -327,25 +327,19 @@ describe('Trade', function () {
         expect(window.console.warn).toHaveBeenCalled();
       });
 
-      it('should use btc value as outAmountExpected before completed', () => {
+      it('should use btc value as receiveAmount before completed', () => {
         tradeJsonAPI.btc = '1.0';
         t.setFromAPI(tradeJsonAPI);
-        expect(t.outAmountExpected).toEqual(100000000);
+        console.log(t._receiveAmount);
+        expect(t._receiveAmount).toEqual(1);
         expect(t.outAmount).toEqual(null);
       });
 
-      it('should use btc value as outAmount once completed', () => {
-        tradeJsonAPI.btc = '1.0';
-        tradeJsonAPI.status = 'Completed';
-        t.setFromAPI(tradeJsonAPI);
-        expect(t.outAmount).toEqual(100000000);
-      });
-
       it('should use ticker if btc field is missing or 0', () => {
         tradeJsonAPI.btc = undefined;
         t._delegate.ticker = {buy: {price: 75000}};
         t.setFromAPI(tradeJsonAPI);
-        expect(t.outAmountExpected).toEqual(200000000);
+        expect(t._receiveAmount).toEqual(2);
       });
     });