Fix cursor and cost param in trade parsing and ccxtExchange_test (#332)

* 1 - fix Cursor check in TestGetTrades_Ccxt

* 2 - fix Cost assignment in trades along with validateTrades()

Author: nikhilsaraf

plugins/ccxtExchange.go

@@ -3,6 +3,7 @@ package plugins
 import (
 	"fmt"
 	"log"
+	"math"
 	"sort"
 	"strconv"
 	"time"
@@ -300,6 +301,7 @@ func (c ccxtExchange) readTrade(pair *model.TradingPair, pairString string, rawT
 			Timestamp: model.MakeTimestamp(rawTrade.Timestamp),
 		},
 		TransactionID: model.MakeTransactionID(rawTrade.ID),
+		Cost:          model.NumberFromFloat(rawTrade.Cost, int8(math.Max(float64(pricePrecision), float64(volumePrecision)))),
 		Fee:           model.NumberFromFloat(rawTrade.Fee.Cost, feecCostPrecision),
 	}
 

plugins/ccxtExchange_test.go

@@ -102,7 +102,8 @@ func TestGetTrades_Ccxt(t *testing.T) {
 			if !assert.NoError(t, e) {
 				return
 			}
-			assert.Equal(t, nil, tradeResult.Cursor)
+			wantCursorInt64 := tradeResult.Trades[len(tradeResult.Trades)-1].Timestamp.AsInt64() + 1
+			assert.Equal(t, strconv.FormatInt(wantCursorInt64, 10), tradeResult.Cursor)
 
 			validateTrades(t, pair, tradeResult.Trades)
 		})
@@ -158,14 +159,17 @@ func validateTrades(t *testing.T, pair model.TradingPair, trades []model.Trade)
 		if !assert.NotNil(t, trade.TransactionID) {
 			return
 		}
+		if !assert.NotNil(t, trade.Cost) {
+			return
+		}
 		if !assert.NotNil(t, trade.Fee) {
 			return
 		}
 		if trade.OrderAction != model.OrderActionBuy && trade.OrderAction != model.OrderActionSell {
 			assert.Fail(t, "trade.OrderAction should be either OrderActionBuy or OrderActionSell: %v", trade.OrderAction)
 			return
 		}
-		if trade.Cost != nil && !assert.True(t, trade.Cost.AsFloat() > 0, fmt.Sprintf("%s x %s = %s", trade.Price.AsString(), trade.Volume.AsString(), trade.Cost.AsString())) {
+		if !assert.True(t, trade.Cost.AsFloat() > 0, fmt.Sprintf("(price) %s x (volume) %s = (cost) %s", trade.Price.AsString(), trade.Volume.AsString(), trade.Cost.AsString())) {
 			return
 		}
 	}