Currency package update (#247)

* Initial currency overhaul before service system implementation

* Remove redundant currency string in orderbook.Base
Unexport lastupdated field in orderbook.Base as it was being instantiated multiple times
Add error handling for process orderbook

*  Remove redundant currency string in ticker.Price
 Unexport lastupdated field in ticker.Price
 Add error handling for process ticker function and fix tests

* Phase Two Update

* Update translations to use map type - thankyou to kempeng for spotting this

* Change pair method name from Display -> Format for better readability

* Fixes misspelling and tests

* Implement requested changes from GloriousCode

* Remove reduntant function and streamlined return in currency_translation.go

* Revert pair method naming conventions

* Change currency naming conventions

* Changed code type to exported Item type with underlying string to reduce complexity

* Added interim orderbook process method to orderbook.Base type

* Changed feebuilder struct field to currency.Pair

* Adds fall over system for backup fx providers

* deprecate function and children and fix linter issue with btcmarkets

* Fixed requested changes

* Fix bug and move mtx for rates

* Fixed after rebase oopsies

* Fix linter issues

* Fixes race conditions in testing functions

* Final phase coinmarketcap update

* fix linter issues

* Implement requested changes

* Adds configuration variables to increase/decrease time durations between updating currency file and fetching new currency rates

* Add a collection of tests to improve codecov

* After rebase oopsy fixes for btse

* Fix requested changes

* fix after rebase oopsies and add more efficient comparison checks within currency pair

* Fix linter issues

exchanges/btcc/btcc.go

@@ -6,6 +6,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/thrasher-/gocryptotrader/common"
 	"github.com/thrasher-/gocryptotrader/config"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 	"github.com/thrasher-/gocryptotrader/exchanges/request"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
@@ -60,9 +61,9 @@ func (b *BTCC) Setup(exch config.ExchangeConfig) {
 		b.RESTPollingDelay = exch.RESTPollingDelay
 		b.Verbose = exch.Verbose
 		b.Websocket.SetWsStatusAndConnection(exch.Websocket)
-		b.BaseCurrencies = common.SplitStrings(exch.BaseCurrencies, ",")
-		b.AvailablePairs = common.SplitStrings(exch.AvailablePairs, ",")
-		b.EnabledPairs = common.SplitStrings(exch.EnabledPairs, ",")
+		b.BaseCurrencies = exch.BaseCurrencies
+		b.AvailablePairs = exch.AvailablePairs
+		b.EnabledPairs = exch.EnabledPairs
 		err := b.SetCurrencyPairFormat()
 		if err != nil {
 			log.Fatal(err)
@@ -100,9 +101,9 @@ func (b *BTCC) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 
 	switch feeBuilder.FeeType {
 	case exchange.CryptocurrencyWithdrawalFee:
-		fee = getCryptocurrencyWithdrawalFee(feeBuilder.FirstCurrency)
+		fee = getCryptocurrencyWithdrawalFee(feeBuilder.Pair.Base)
 	case exchange.InternationalBankWithdrawalFee:
-		fee = getInternationalBankWithdrawalFee(feeBuilder.CurrencyItem, feeBuilder.Amount)
+		fee = getInternationalBankWithdrawalFee(feeBuilder.FiatCurrency, feeBuilder.Amount)
 	}
 	if fee < 0 {
 		fee = 0
@@ -110,10 +111,10 @@ func (b *BTCC) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 	return fee, nil
 }
 
-func getCryptocurrencyWithdrawalFee(currency string) float64 {
-	return WithdrawalFees[currency]
+func getCryptocurrencyWithdrawalFee(c currency.Code) float64 {
+	return WithdrawalFees[c]
 }
 
-func getInternationalBankWithdrawalFee(currency string, amount float64) float64 {
-	return WithdrawalFees[currency] * amount
+func getInternationalBankWithdrawalFee(c currency.Code, amount float64) float64 {
+	return WithdrawalFees[c] * amount
 }

exchanges/btcc/btcc_test.go

@@ -6,8 +6,7 @@ import (
 
 	"github.com/thrasher-/gocryptotrader/common"
 	"github.com/thrasher-/gocryptotrader/config"
-	"github.com/thrasher-/gocryptotrader/currency/pair"
-	"github.com/thrasher-/gocryptotrader/currency/symbol"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 )
 
@@ -78,13 +77,10 @@ func TestSetup(t *testing.T) {
 // }
 func setFeeBuilder() exchange.FeeBuilder {
 	return exchange.FeeBuilder{
-		Amount:         1,
-		Delimiter:      "",
-		FeeType:        exchange.CryptocurrencyTradeFee,
-		FirstCurrency:  symbol.BTC,
-		SecondCurrency: symbol.LTC,
-		IsMaker:        false,
-		PurchasePrice:  1,
+		Amount:        1,
+		FeeType:       exchange.CryptocurrencyTradeFee,
+		Pair:          currency.NewPair(currency.BTC, currency.LTC),
+		PurchasePrice: 1,
 	}
 }
 
@@ -144,7 +140,7 @@ func TestGetFee(t *testing.T) {
 	// InternationalBankDepositFee Basic
 	feeBuilder = setFeeBuilder()
 	feeBuilder.FeeType = exchange.InternationalBankDepositFee
-	feeBuilder.CurrencyItem = symbol.USD
+	feeBuilder.FiatCurrency = currency.USD
 	if resp, err := b.GetFee(feeBuilder); resp != float64(0) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
 		t.Error(err)
@@ -153,7 +149,7 @@ func TestGetFee(t *testing.T) {
 	// InternationalBankWithdrawalFee Basic
 	feeBuilder = setFeeBuilder()
 	feeBuilder.FeeType = exchange.InternationalBankWithdrawalFee
-	feeBuilder.CurrencyItem = symbol.USD
+	feeBuilder.FiatCurrency = currency.USD
 	if resp, err := b.GetFee(feeBuilder); resp != float64(0.005) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0.005), resp)
 		t.Error(err)
@@ -221,10 +217,10 @@ func TestSubmitOrder(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	var p = pair.CurrencyPair{
-		Delimiter:      "-",
-		FirstCurrency:  symbol.BTC,
-		SecondCurrency: symbol.LTC,
+	var p = currency.Pair{
+		Delimiter: "-",
+		Base:      currency.BTC,
+		Quote:     currency.LTC,
 	}
 	_, err := b.SubmitOrder(p, exchange.BuyOrderSide, exchange.LimitOrderType, 1, 1, "clientId")
 	if err != common.ErrNotYetImplemented {
@@ -240,7 +236,7 @@ func TestCancelExchangeOrder(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	currencyPair := pair.NewCurrencyPair(symbol.LTC, symbol.BTC)
+	currencyPair := currency.NewPair(currency.LTC, currency.BTC)
 
 	var orderCancellation = exchange.OrderCancellation{
 		OrderID:       "1",
@@ -263,7 +259,7 @@ func TestCancelAllExchangeOrders(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	currencyPair := pair.NewCurrencyPair(symbol.LTC, symbol.BTC)
+	currencyPair := currency.NewPair(currency.LTC, currency.BTC)
 
 	var orderCancellation = exchange.OrderCancellation{
 		OrderID:       "1",
@@ -284,7 +280,7 @@ func TestWithdraw(t *testing.T) {
 	TestSetup(t)
 	var withdrawCryptoRequest = exchange.WithdrawRequest{
 		Amount:      100,
-		Currency:    symbol.LTC,
+		Currency:    currency.LTC,
 		Address:     "1F5zVDgNjorJ51oGebSvNCrSAHpwGkUdDB",
 		Description: "WITHDRAW IT ALL",
 	}

exchanges/btcc/btcc_types.go

@@ -1,7 +1,10 @@
 package btcc
 
-import "encoding/json"
-import "github.com/thrasher-/gocryptotrader/currency/symbol"
+import (
+	"encoding/json"
+
+	"github.com/thrasher-/gocryptotrader/currency"
+)
 
 // WsAllTickerData defines multiple ticker data
 type WsAllTickerData []WsTicker
@@ -84,12 +87,12 @@ type WsTicker struct {
 
 // WithdrawalFees the large list of predefined withdrawal fees
 // Prone to change
-var WithdrawalFees = map[string]float64{
-	symbol.USD:  0.005,
-	symbol.USDT: 10,
-	symbol.BTC:  0.001,
-	symbol.ETH:  0.01,
-	symbol.BCH:  0.0001,
-	symbol.LTC:  0.001,
-	symbol.DASH: 0.002,
+var WithdrawalFees = map[currency.Code]float64{
+	currency.USD:  0.005,
+	currency.USDT: 10,
+	currency.BTC:  0.001,
+	currency.ETH:  0.01,
+	currency.BCH:  0.0001,
+	currency.LTC:  0.001,
+	currency.DASH: 0.002,
 }

exchanges/btcc/btcc_websocket.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/currency/pair"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 	"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
 	log "github.com/thrasher-/gocryptotrader/logger"
@@ -221,7 +221,7 @@ func (b *BTCC) WsHandleData() {
 				tick.HighPrice = ticker.High
 				tick.LowPrice = ticker.Low
 				tick.OpenPrice = ticker.Open
-				tick.Pair = pair.NewCurrencyPairFromString(ticker.Symbol)
+				tick.Pair = currency.NewPairFromString(ticker.Symbol)
 				tick.Quantity = ticker.Volume
 				timestamp := time.Unix(ticker.Timestamp, 0)
 				tick.Timestamp = timestamp
@@ -300,9 +300,10 @@ func (b *BTCC) WsUpdateCurrencyPairs() error {
 				return err
 			}
 
-			var availableTickers []string
+			var availableTickers currency.Pairs
 			for _, tickerData := range tickers {
-				availableTickers = append(availableTickers, tickerData.Symbol)
+				availableTickers = append(availableTickers,
+					currency.NewPairFromString(tickerData.Symbol))
 			}
 
 			err = b.UpdateCurrencies(availableTickers, false, true)
@@ -407,9 +408,7 @@ func (b *BTCC) WsProcessOrderbookSnapshot(ob WsOrderbookSnapshot) error {
 	newOrderbook.Asks = asks
 	newOrderbook.AssetType = "SPOT"
 	newOrderbook.Bids = bids
-	newOrderbook.CurrencyPair = ob.Symbol
-	newOrderbook.LastUpdated = time.Now()
-	newOrderbook.Pair = pair.NewCurrencyPairFromString(ob.Symbol)
+	newOrderbook.Pair = currency.NewPairFromString(ob.Symbol)
 
 	err := b.Websocket.Orderbook.LoadSnapshot(newOrderbook, b.GetName(), false)
 	if err != nil {
@@ -419,7 +418,7 @@ func (b *BTCC) WsProcessOrderbookSnapshot(ob WsOrderbookSnapshot) error {
 	b.Websocket.DataHandler <- exchange.WebsocketOrderbookUpdate{
 		Exchange: b.GetName(),
 		Asset:    "SPOT",
-		Pair:     pair.NewCurrencyPairFromString(ob.Symbol),
+		Pair:     currency.NewPairFromString(ob.Symbol),
 	}
 
 	return nil
@@ -458,7 +457,7 @@ func (b *BTCC) WsProcessOrderbookUpdate(ob WsOrderbookSnapshot) error {
 		bids = append(bids, orderbook.Item{Price: data.Price, Amount: newSize})
 	}
 
-	p := pair.NewCurrencyPairFromString(ob.Symbol)
+	p := currency.NewPairFromString(ob.Symbol)
 
 	err := b.Websocket.Orderbook.Update(bids, asks, p, time.Now(), b.GetName(), "SPOT")
 	if err != nil {
@@ -468,7 +467,7 @@ func (b *BTCC) WsProcessOrderbookUpdate(ob WsOrderbookSnapshot) error {
 	b.Websocket.DataHandler <- exchange.WebsocketOrderbookUpdate{
 		Exchange: b.GetName(),
 		Asset:    "SPOT",
-		Pair:     pair.NewCurrencyPairFromString(ob.Symbol),
+		Pair:     currency.NewPairFromString(ob.Symbol),
 	}
 
 	return nil
@@ -545,7 +544,8 @@ func (b *BTCC) WsProcessOldOrderbookSnapshot(ob WsOrderbookSnapshotOld, symbol s
 		})
 	}
 
-	p := pair.NewCurrencyPairFromString(symbol)
+	p := currency.NewPairFromString(symbol)
+
 	err := b.Websocket.Orderbook.Update(bids, asks, p, time.Now(), b.GetName(), "SPOT")
 	if err != nil {
 		return err

exchanges/btcc/btcc_wrapper.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/thrasher-/gocryptotrader/common"
 	"github.com/thrasher-/gocryptotrader/config"
-	"github.com/thrasher-/gocryptotrader/currency/pair"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 	"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
@@ -29,9 +29,12 @@ func (b *BTCC) Run() {
 		log.Debugf("%s %d currencies enabled: %s.\n", b.GetName(), len(b.EnabledPairs), b.EnabledPairs)
 	}
 
-	if common.StringDataContains(b.EnabledPairs, "CNY") || common.StringDataContains(b.AvailablePairs, "CNY") || common.StringDataContains(b.BaseCurrencies, "CNY") {
+	if common.StringDataContains(b.EnabledPairs.Strings(), "CNY") ||
+		common.StringDataContains(b.AvailablePairs.Strings(), "CNY") ||
+		common.StringDataContains(b.BaseCurrencies.Strings(), "CNY") {
 		log.Warn("BTCC only supports BTCUSD now, upgrading available, enabled and base currencies to BTCUSD/USD")
-		pairs := []string{"BTCUSD"}
+		pairs := currency.Pairs{currency.Pair{Base: currency.BTC,
+			Quote: currency.USD}}
 		cfg := config.GetConfig()
 		exchCfg, err := cfg.GetExchangeConfig(b.Name)
 		if err != nil {
@@ -39,10 +42,10 @@ func (b *BTCC) Run() {
 			return
 		}
 
-		exchCfg.BaseCurrencies = "USD"
-		exchCfg.AvailablePairs = pairs[0]
-		exchCfg.EnabledPairs = pairs[0]
-		b.BaseCurrencies = []string{"USD"}
+		exchCfg.BaseCurrencies = currency.Currencies{currency.USD}
+		exchCfg.AvailablePairs = pairs
+		exchCfg.EnabledPairs = pairs
+		b.BaseCurrencies = currency.Currencies{currency.USD}
 
 		err = b.UpdateCurrencies(pairs, false, true)
 		if err != nil {
@@ -63,22 +66,22 @@ func (b *BTCC) Run() {
 }
 
 // UpdateTicker updates and returns the ticker for a currency pair
-func (b *BTCC) UpdateTicker(p pair.CurrencyPair, assetType string) (ticker.Price, error) {
+func (b *BTCC) UpdateTicker(p currency.Pair, assetType string) (ticker.Price, error) {
 	return ticker.Price{}, common.ErrFunctionNotSupported
 }
 
 // GetTickerPrice returns the ticker for a currency pair
-func (b *BTCC) GetTickerPrice(p pair.CurrencyPair, assetType string) (ticker.Price, error) {
+func (b *BTCC) GetTickerPrice(p currency.Pair, assetType string) (ticker.Price, error) {
 	return ticker.Price{}, common.ErrFunctionNotSupported
 }
 
 // GetOrderbookEx returns the orderbook for a currency pair
-func (b *BTCC) GetOrderbookEx(p pair.CurrencyPair, assetType string) (orderbook.Base, error) {
+func (b *BTCC) GetOrderbookEx(p currency.Pair, assetType string) (orderbook.Base, error) {
 	return orderbook.Base{}, common.ErrFunctionNotSupported
 }
 
 // UpdateOrderbook updates and returns the orderbook for a currency pair
-func (b *BTCC) UpdateOrderbook(p pair.CurrencyPair, assetType string) (orderbook.Base, error) {
+func (b *BTCC) UpdateOrderbook(p currency.Pair, assetType string) (orderbook.Base, error) {
 	return orderbook.Base{}, common.ErrFunctionNotSupported
 }
 
@@ -95,12 +98,12 @@ func (b *BTCC) GetFundingHistory() ([]exchange.FundHistory, error) {
 }
 
 // GetExchangeHistory returns historic trade data since exchange opening.
-func (b *BTCC) GetExchangeHistory(p pair.CurrencyPair, assetType string) ([]exchange.TradeHistory, error) {
+func (b *BTCC) GetExchangeHistory(p currency.Pair, assetType string) ([]exchange.TradeHistory, error) {
 	return nil, common.ErrFunctionNotSupported
 }
 
 // SubmitOrder submits a new order
-func (b *BTCC) SubmitOrder(p pair.CurrencyPair, side exchange.OrderSide, orderType exchange.OrderType, amount, price float64, clientID string) (exchange.SubmitOrderResponse, error) {
+func (b *BTCC) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderType exchange.OrderType, amount, price float64, clientID string) (exchange.SubmitOrderResponse, error) {
 	return exchange.SubmitOrderResponse{}, common.ErrNotYetImplemented
 }
 
@@ -126,7 +129,7 @@ func (b *BTCC) GetOrderInfo(orderID string) (exchange.OrderDetail, error) {
 }
 
 // GetDepositAddress returns a deposit address for a specified currency
-func (b *BTCC) GetDepositAddress(cryptocurrency pair.CurrencyItem, accountID string) (string, error) {
+func (b *BTCC) GetDepositAddress(cryptocurrency currency.Code, accountID string) (string, error) {
 	return "", common.ErrFunctionNotSupported
 }