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/hitbtc/hitbtc.go

@@ -12,7 +12,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/thrasher-/gocryptotrader/common"
 	"github.com/thrasher-/gocryptotrader/config"
-	"github.com/thrasher-/gocryptotrader/currency/symbol"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 	"github.com/thrasher-/gocryptotrader/exchanges/request"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
@@ -96,9 +96,9 @@ func (h *HitBTC) Setup(exch config.ExchangeConfig) {
 		h.RESTPollingDelay = exch.RESTPollingDelay // Max 60000ms
 		h.Verbose = exch.Verbose
 		h.Websocket.SetWsStatusAndConnection(exch.Websocket)
-		h.BaseCurrencies = common.SplitStrings(exch.BaseCurrencies, ",")
-		h.AvailablePairs = common.SplitStrings(exch.AvailablePairs, ",")
-		h.EnabledPairs = common.SplitStrings(exch.EnabledPairs, ",")
+		h.BaseCurrencies = exch.BaseCurrencies
+		h.AvailablePairs = exch.AvailablePairs
+		h.EnabledPairs = exch.EnabledPairs
 		err := h.SetCurrencyPairFormat()
 		if err != nil {
 			log.Fatal(err)
@@ -322,7 +322,7 @@ func (h *HitBTC) GetOrderbook(currencyPair string, limit int) (Orderbook, error)
 	return ob, nil
 }
 
-// GetCandles returns candles which is used for OHLC a specific symbol.
+// GetCandles returns candles which is used for OHLC a specific currency.
 // Note: Result contain candles only with non zero volume.
 func (h *HitBTC) GetCandles(currencyPair, limit, period string) ([]ChartData, error) {
 	// limit   Limit of candles, default 100.
@@ -573,7 +573,10 @@ func (h *HitBTC) TransferBalance(currency, from, to string, amount float64) (boo
 	values.Set("fromAccount", from)
 	values.Set("toAccount", to)
 
-	err := h.SendAuthenticatedHTTPRequest(http.MethodPost, transferBalance, values, &result)
+	err := h.SendAuthenticatedHTTPRequest(http.MethodPost,
+		transferBalance,
+		values,
+		&result)
 
 	if err != nil {
 		return false, err
@@ -594,14 +597,21 @@ func (h *HitBTC) SendHTTPRequest(path string, result interface{}) error {
 // SendAuthenticatedHTTPRequest sends an authenticated http request
 func (h *HitBTC) SendAuthenticatedHTTPRequest(method, endpoint string, values url.Values, result interface{}) error {
 	if !h.AuthenticatedAPISupport {
-		return fmt.Errorf(exchange.WarningAuthenticatedRequestWithoutCredentialsSet, h.Name)
+		return fmt.Errorf(exchange.WarningAuthenticatedRequestWithoutCredentialsSet,
+			h.Name)
 	}
 	headers := make(map[string]string)
 	headers["Authorization"] = "Basic " + common.Base64Encode([]byte(h.APIKey+":"+h.APISecret))
 
 	path := fmt.Sprintf("%s/%s", h.APIUrl, endpoint)
 
-	return h.SendPayload(method, path, headers, bytes.NewBufferString(values.Encode()), result, true, h.Verbose)
+	return h.SendPayload(method,
+		path,
+		headers,
+		bytes.NewBufferString(values.Encode()),
+		result,
+		true,
+		h.Verbose)
 }
 
 // GetFee returns an estimate of fee based on type of transaction
@@ -609,13 +619,18 @@ func (h *HitBTC) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 	var fee float64
 	switch feeBuilder.FeeType {
 	case exchange.CryptocurrencyTradeFee:
-		feeInfo, err := h.GetFeeInfo(feeBuilder.FirstCurrency + feeBuilder.Delimiter + feeBuilder.SecondCurrency)
+		feeInfo, err := h.GetFeeInfo(feeBuilder.Pair.Base.String() +
+			feeBuilder.Pair.Delimiter +
+			feeBuilder.Pair.Quote.String())
+
 		if err != nil {
 			return 0, err
 		}
-		fee = calculateTradingFee(feeInfo, feeBuilder.PurchasePrice, feeBuilder.Amount, feeBuilder.IsMaker)
+		fee = calculateTradingFee(feeInfo, feeBuilder.PurchasePrice,
+			feeBuilder.Amount,
+			feeBuilder.IsMaker)
 	case exchange.CryptocurrencyWithdrawalFee:
-		currencyInfo, err := h.GetCurrency(feeBuilder.FirstCurrency)
+		currencyInfo, err := h.GetCurrency(feeBuilder.Pair.Base.String())
 		if err != nil {
 			return 0, err
 		}
@@ -624,15 +639,16 @@ func (h *HitBTC) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 			return 0, err
 		}
 	case exchange.CyptocurrencyDepositFee:
-		fee = calculateCryptocurrencyDepositFee(feeBuilder.FirstCurrency, feeBuilder.Amount)
+		fee = calculateCryptocurrencyDepositFee(feeBuilder.Pair.Base,
+			feeBuilder.Amount)
 	}
 
 	return fee, nil
 }
 
-func calculateCryptocurrencyDepositFee(currency string, amount float64) float64 {
+func calculateCryptocurrencyDepositFee(c currency.Code, amount float64) float64 {
 	var fee float64
-	if currency == symbol.BTC {
+	if c == currency.BTC {
 		fee = 0.0006
 	}
 	return fee * amount

exchanges/hitbtc/hitbtc_test.go

@@ -5,8 +5,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"
 )
 
@@ -68,13 +67,10 @@ func TestGetCurrencies(t *testing.T) {
 func setFeeBuilder() exchange.FeeBuilder {
 	return exchange.FeeBuilder{
 		Amount:              1,
-		Delimiter:           "",
 		FeeType:             exchange.CryptocurrencyTradeFee,
-		FirstCurrency:       symbol.ETH,
-		SecondCurrency:      symbol.BTC,
-		IsMaker:             false,
+		Pair:                currency.NewPair(currency.ETH, currency.BTC),
 		PurchasePrice:       1,
-		CurrencyItem:        symbol.USD,
+		FiatCurrency:        currency.USD,
 		BankTransactionType: exchange.WireTransfer,
 	}
 }
@@ -126,7 +122,7 @@ func TestGetFee(t *testing.T) {
 
 		// CryptocurrencyWithdrawalFee Invalid currency
 		feeBuilder = setFeeBuilder()
-		feeBuilder.FirstCurrency = "hello"
+		feeBuilder.Pair.Base = currency.NewCode("hello")
 		feeBuilder.FeeType = exchange.CryptocurrencyWithdrawalFee
 		if resp, err := h.GetFee(feeBuilder); resp != float64(0) || err == nil {
 			t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
@@ -137,8 +133,8 @@ func TestGetFee(t *testing.T) {
 	// CyptocurrencyDepositFee Basic
 	feeBuilder = setFeeBuilder()
 	feeBuilder.FeeType = exchange.CyptocurrencyDepositFee
-	feeBuilder.FirstCurrency = symbol.BTC
-	feeBuilder.SecondCurrency = symbol.LTC
+	feeBuilder.Pair.Base = currency.BTC
+	feeBuilder.Pair.Quote = currency.LTC
 	if resp, err := h.GetFee(feeBuilder); resp != float64(0.0006) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0.0006), resp)
 		t.Error(err)
@@ -155,7 +151,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 := h.GetFee(feeBuilder); resp != float64(0) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
 		t.Error(err)
@@ -179,7 +175,7 @@ func TestGetActiveOrders(t *testing.T) {
 
 	var getOrdersRequest = exchange.GetOrdersRequest{
 		OrderType:  exchange.AnyOrderType,
-		Currencies: []pair.CurrencyPair{pair.NewCurrencyPair(symbol.ETH, symbol.BTC)},
+		Currencies: []currency.Pair{currency.NewPair(currency.ETH, currency.BTC)},
 	}
 
 	_, err := h.GetActiveOrders(getOrdersRequest)
@@ -196,7 +192,7 @@ func TestGetOrderHistory(t *testing.T) {
 
 	var getOrdersRequest = exchange.GetOrdersRequest{
 		OrderType:  exchange.AnyOrderType,
-		Currencies: []pair.CurrencyPair{pair.NewCurrencyPair(symbol.ETH, symbol.BTC)},
+		Currencies: []currency.Pair{currency.NewPair(currency.ETH, currency.BTC)},
 	}
 
 	_, err := h.GetOrderHistory(getOrdersRequest)
@@ -225,10 +221,10 @@ func TestSubmitOrder(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	var p = pair.CurrencyPair{
-		Delimiter:      "",
-		FirstCurrency:  symbol.DGD,
-		SecondCurrency: symbol.BTC,
+	var p = currency.Pair{
+		Delimiter: "",
+		Base:      currency.DGD,
+		Quote:     currency.BTC,
 	}
 	response, err := h.SubmitOrder(p, exchange.BuyOrderSide, exchange.MarketOrderType, 1, 10, "1234234")
 	if areTestAPIKeysSet() && (err != nil || !response.IsOrderPlaced) {
@@ -246,7 +242,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",
@@ -272,7 +268,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",
@@ -307,7 +303,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",
 	}
@@ -359,12 +355,12 @@ func TestWithdrawInternationalBank(t *testing.T) {
 
 func TestGetDepositAddress(t *testing.T) {
 	if areTestAPIKeysSet() {
-		_, err := h.GetDepositAddress(symbol.BTC, "")
+		_, err := h.GetDepositAddress(currency.BTC, "")
 		if err != nil {
 			t.Error("Test Failed - GetDepositAddress() error", err)
 		}
 	} else {
-		_, err := h.GetDepositAddress(symbol.BTC, "")
+		_, err := h.GetDepositAddress(currency.BTC, "")
 		if err == nil {
 			t.Error("Test Failed - GetDepositAddress() error cannot be nil")
 		}

exchanges/hitbtc/hitbtc_websocket.go

@@ -9,7 +9,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"
 )
@@ -170,7 +170,7 @@ func (h *HitBTC) WsHandleData() {
 				h.Websocket.DataHandler <- exchange.TickerData{
 					Exchange:  h.GetName(),
 					AssetType: "SPOT",
-					Pair:      pair.NewCurrencyPairFromString(ticker.Params.Symbol),
+					Pair:      currency.NewPairFromString(ticker.Params.Symbol),
 					Quantity:  ticker.Params.Volume,
 					Timestamp: ts,
 					OpenPrice: ticker.Params.Open,
@@ -238,14 +238,12 @@ func (h *HitBTC) WsProcessOrderbookSnapshot(ob WsOrderbook) error {
 		asks = append(asks, orderbook.Item{Amount: ask.Size, Price: ask.Price})
 	}
 
-	p := pair.NewCurrencyPairFromString(ob.Params.Symbol)
+	p := currency.NewPairFromString(ob.Params.Symbol)
 
 	var newOrderbook orderbook.Base
 	newOrderbook.Asks = asks
 	newOrderbook.Bids = bids
 	newOrderbook.AssetType = "SPOT"
-	newOrderbook.CurrencyPair = ob.Params.Symbol
-	newOrderbook.LastUpdated = time.Now()
 	newOrderbook.Pair = p
 
 	err := h.Websocket.Orderbook.LoadSnapshot(newOrderbook, h.GetName(), false)
@@ -277,7 +275,7 @@ func (h *HitBTC) WsProcessOrderbookUpdate(ob WsOrderbook) error {
 		asks = append(asks, orderbook.Item{Price: ask.Price, Amount: ask.Size})
 	}
 
-	p := pair.NewCurrencyPairFromString(ob.Params.Symbol)
+	p := currency.NewPairFromString(ob.Params.Symbol)
 
 	err := h.Websocket.Orderbook.Update(bids, asks, p, time.Now(), h.GetName(), "SPOT")
 	if err != nil {

exchanges/hitbtc/hitbtc_wrapper.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"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"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
@@ -39,7 +39,8 @@ func (h *HitBTC) Run() {
 		log.Errorf("%s Failed to get available symbols.\n", h.GetName())
 	} else {
 		forceUpgrade := false
-		if !common.StringDataContains(h.EnabledPairs, "-") || !common.StringDataContains(h.AvailablePairs, "-") {
+		if !common.StringDataContains(h.EnabledPairs.Strings(), "-") ||
+			!common.StringDataContains(h.AvailablePairs.Strings(), "-") {
 			forceUpgrade = true
 		}
 		var currencies []string
@@ -48,7 +49,9 @@ func (h *HitBTC) Run() {
 		}
 
 		if forceUpgrade {
-			enabledPairs := []string{"BTC-USD"}
+			enabledPairs := currency.Pairs{currency.Pair{Base: currency.BTC,
+				Quote: currency.USD, Delimiter: "-"}}
+
 			log.Warn("Available pairs for HitBTC reset due to config upgrade, please enable the ones you would like again.")
 
 			err = h.UpdateCurrencies(enabledPairs, true, true)
@@ -56,7 +59,14 @@ func (h *HitBTC) Run() {
 				log.Errorf("%s Failed to update enabled currencies.\n", h.GetName())
 			}
 		}
-		err = h.UpdateCurrencies(currencies, false, forceUpgrade)
+
+		var newCurrencies currency.Pairs
+		for _, p := range currencies {
+			newCurrencies = append(newCurrencies,
+				currency.NewPairFromString(p))
+		}
+
+		err = h.UpdateCurrencies(newCurrencies, false, forceUpgrade)
 		if err != nil {
 			log.Errorf("%s Failed to update available currencies.\n", h.GetName())
 		}
@@ -64,7 +74,7 @@ func (h *HitBTC) Run() {
 }
 
 // UpdateTicker updates and returns the ticker for a currency pair
-func (h *HitBTC) UpdateTicker(currencyPair pair.CurrencyPair, assetType string) (ticker.Price, error) {
+func (h *HitBTC) UpdateTicker(currencyPair currency.Pair, assetType string) (ticker.Price, error) {
 	tick, err := h.GetTicker("")
 	if err != nil {
 		return ticker.Price{}, err
@@ -80,13 +90,17 @@ func (h *HitBTC) UpdateTicker(currencyPair pair.CurrencyPair, assetType string)
 		tp.Last = tick[curr].Last
 		tp.Low = tick[curr].Low
 		tp.Volume = tick[curr].Volume
-		ticker.ProcessTicker(h.GetName(), x, tp, assetType)
+
+		err = ticker.ProcessTicker(h.GetName(), tp, assetType)
+		if err != nil {
+			return ticker.Price{}, err
+		}
 	}
 	return ticker.GetTicker(h.Name, currencyPair, assetType)
 }
 
 // GetTickerPrice returns the ticker for a currency pair
-func (h *HitBTC) GetTickerPrice(currencyPair pair.CurrencyPair, assetType string) (ticker.Price, error) {
+func (h *HitBTC) GetTickerPrice(currencyPair currency.Pair, assetType string) (ticker.Price, error) {
 	tickerNew, err := ticker.GetTicker(h.GetName(), currencyPair, assetType)
 	if err != nil {
 		return h.UpdateTicker(currencyPair, assetType)
@@ -95,8 +109,8 @@ func (h *HitBTC) GetTickerPrice(currencyPair pair.CurrencyPair, assetType string
 }
 
 // GetOrderbookEx returns orderbook base on the currency pair
-func (h *HitBTC) GetOrderbookEx(currencyPair pair.CurrencyPair, assetType string) (orderbook.Base, error) {
-	ob, err := orderbook.GetOrderbook(h.GetName(), currencyPair, assetType)
+func (h *HitBTC) GetOrderbookEx(currencyPair currency.Pair, assetType string) (orderbook.Base, error) {
+	ob, err := orderbook.Get(h.GetName(), currencyPair, assetType)
 	if err != nil {
 		return h.UpdateOrderbook(currencyPair, assetType)
 	}
@@ -104,7 +118,7 @@ func (h *HitBTC) GetOrderbookEx(currencyPair pair.CurrencyPair, assetType string
 }
 
 // UpdateOrderbook updates and returns the orderbook for a currency pair
-func (h *HitBTC) UpdateOrderbook(currencyPair pair.CurrencyPair, assetType string) (orderbook.Base, error) {
+func (h *HitBTC) UpdateOrderbook(currencyPair currency.Pair, assetType string) (orderbook.Base, error) {
 	var orderBook orderbook.Base
 	orderbookNew, err := h.GetOrderbook(exchange.FormatExchangeCurrency(h.GetName(), currencyPair).String(), 1000)
 	if err != nil {
@@ -121,8 +135,16 @@ func (h *HitBTC) UpdateOrderbook(currencyPair pair.CurrencyPair, assetType strin
 		orderBook.Asks = append(orderBook.Asks, orderbook.Item{Amount: data.Amount, Price: data.Price})
 	}
 
-	orderbook.ProcessOrderbook(h.GetName(), currencyPair, orderBook, assetType)
-	return orderbook.GetOrderbook(h.Name, currencyPair, assetType)
+	orderBook.Pair = currencyPair
+	orderBook.ExchangeName = h.GetName()
+	orderBook.AssetType = assetType
+
+	err = orderBook.Process()
+	if err != nil {
+		return orderBook, err
+	}
+
+	return orderbook.Get(h.Name, currencyPair, assetType)
 }
 
 // GetAccountInfo retrieves balances for all enabled currencies for the
@@ -138,7 +160,7 @@ func (h *HitBTC) GetAccountInfo() (exchange.AccountInfo, error) {
 	var currencies []exchange.AccountCurrencyInfo
 	for _, item := range accountBalance {
 		var exchangeCurrency exchange.AccountCurrencyInfo
-		exchangeCurrency.CurrencyName = item.Currency
+		exchangeCurrency.CurrencyName = currency.NewCode(item.Currency)
 		exchangeCurrency.TotalValue = item.Available
 		exchangeCurrency.Hold = item.Reserved
 		currencies = append(currencies, exchangeCurrency)
@@ -159,16 +181,20 @@ func (h *HitBTC) GetFundingHistory() ([]exchange.FundHistory, error) {
 }
 
 // GetExchangeHistory returns historic trade data since exchange opening.
-func (h *HitBTC) GetExchangeHistory(p pair.CurrencyPair, assetType string) ([]exchange.TradeHistory, error) {
+func (h *HitBTC) GetExchangeHistory(p currency.Pair, assetType string) ([]exchange.TradeHistory, error) {
 	var resp []exchange.TradeHistory
 
 	return resp, common.ErrNotYetImplemented
 }
 
 // SubmitOrder submits a new order
-func (h *HitBTC) SubmitOrder(p pair.CurrencyPair, side exchange.OrderSide, orderType exchange.OrderType, amount, price float64, _ string) (exchange.SubmitOrderResponse, error) {
+func (h *HitBTC) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderType exchange.OrderType, amount, price float64, _ string) (exchange.SubmitOrderResponse, error) {
 	var submitOrderResponse exchange.SubmitOrderResponse
-	response, err := h.PlaceOrder(p.Pair().String(), price, amount, common.StringToLower(orderType.ToString()), common.StringToLower(side.ToString()))
+	response, err := h.PlaceOrder(p.String(),
+		price,
+		amount,
+		common.StringToLower(orderType.ToString()),
+		common.StringToLower(side.ToString()))
 
 	if response.OrderNumber > 0 {
 		submitOrderResponse.OrderID = fmt.Sprintf("%v", response.OrderNumber)
@@ -224,7 +250,7 @@ func (h *HitBTC) GetOrderInfo(orderID string) (exchange.OrderDetail, error) {
 }
 
 // GetDepositAddress returns a deposit address for a specified currency
-func (h *HitBTC) GetDepositAddress(currency pair.CurrencyItem, _ string) (string, error) {
+func (h *HitBTC) GetDepositAddress(currency currency.Code, _ string) (string, error) {
 	resp, err := h.GetDepositAddresses(currency.String())
 	if err != nil {
 		return "", err
@@ -271,7 +297,7 @@ func (h *HitBTC) GetActiveOrders(getOrdersRequest exchange.GetOrdersRequest) ([]
 
 	var allOrders []OrderHistoryResponse
 	for _, currency := range getOrdersRequest.Currencies {
-		resp, err := h.GetOpenOrders(currency.Pair().String())
+		resp, err := h.GetOpenOrders(currency.String())
 		if err != nil {
 			return nil, err
 		}
@@ -280,7 +306,8 @@ func (h *HitBTC) GetActiveOrders(getOrdersRequest exchange.GetOrdersRequest) ([]
 
 	var orders []exchange.OrderDetail
 	for _, order := range allOrders {
-		symbol := pair.NewCurrencyPairDelimiter(order.Symbol, h.ConfigCurrencyPairFormat.Delimiter)
+		symbol := currency.NewPairDelimiter(order.Symbol,
+			h.ConfigCurrencyPairFormat.Delimiter)
 		side := exchange.OrderSide(strings.ToUpper(order.Side))
 		orderDate, err := time.Parse(time.RFC3339, order.CreatedAt)
 		if err != nil {
@@ -299,7 +326,8 @@ func (h *HitBTC) GetActiveOrders(getOrdersRequest exchange.GetOrdersRequest) ([]
 		})
 	}
 
-	exchange.FilterOrdersByTickRange(&orders, getOrdersRequest.StartTicks, getOrdersRequest.EndTicks)
+	exchange.FilterOrdersByTickRange(&orders, getOrdersRequest.StartTicks,
+		getOrdersRequest.EndTicks)
 	exchange.FilterOrdersBySide(&orders, getOrdersRequest.OrderSide)
 
 	return orders, nil
@@ -314,7 +342,7 @@ func (h *HitBTC) GetOrderHistory(getOrdersRequest exchange.GetOrdersRequest) ([]
 
 	var allOrders []OrderHistoryResponse
 	for _, currency := range getOrdersRequest.Currencies {
-		resp, err := h.GetOrders(currency.Pair().String())
+		resp, err := h.GetOrders(currency.String())
 		if err != nil {
 			return nil, err
 		}
@@ -323,7 +351,8 @@ func (h *HitBTC) GetOrderHistory(getOrdersRequest exchange.GetOrdersRequest) ([]
 
 	var orders []exchange.OrderDetail
 	for _, order := range allOrders {
-		symbol := pair.NewCurrencyPairDelimiter(order.Symbol, h.ConfigCurrencyPairFormat.Delimiter)
+		symbol := currency.NewPairDelimiter(order.Symbol,
+			h.ConfigCurrencyPairFormat.Delimiter)
 		side := exchange.OrderSide(strings.ToUpper(order.Side))
 		orderDate, err := time.Parse(time.RFC3339, order.CreatedAt)
 		if err != nil {