Improve portfolio, coverage and tool

currency/currency.go

@@ -197,19 +197,20 @@ func MakecurrencyPairs(supportedCurrencies string) string {
 // or vice versa.
 func ConvertCurrency(amount float64, from, to string) (float64, error) {
 	currency := common.StringToUpper(from + to)
-	if CurrencyStore[currency].Name != currency {
+
+	_, ok := CurrencyStore[currency]
+	if !ok {
 		err := SeedCurrencyData(currency[:len(from)] + "," + currency[len(to):])
 		if err != nil {
 			return 0, err
 		}
 	}
 
-	for x, y := range CurrencyStore {
-		if x == currency {
-			return amount * y.Rate, nil
-		}
+	result, ok := CurrencyStore[currency]
+	if !ok {
+		return 0, ErrCurrencyNotFound
 	}
-	return 0, ErrCurrencyNotFound
+	return amount * result.Rate, nil
 }
 
 // FetchYahooCurrencyData seeds the variable CurrencyStore; this is a

exchanges/bitfinex/bitfinex_wrapper.go

@@ -106,24 +106,47 @@ func (b *Bitfinex) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase,
 }
 
 //GetExchangeAccountInfo : Retrieves balances for all enabled currencies for the Bitfinex exchange
-func (e *Bitfinex) GetExchangeAccountInfo() (exchange.AccountInfo, error) {
+func (b *Bitfinex) GetExchangeAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.ExchangeName = e.GetName()
-	accountBalance, err := e.GetAccountBalance()
+	response.ExchangeName = b.GetName()
+	accountBalance, err := b.GetAccountBalance()
 	if err != nil {
 		return response, err
 	}
-	if !e.Enabled {
+	if !b.Enabled {
 		return response, nil
 	}
 
-	for i := 0; i < len(accountBalance); i++ {
-		var exchangeCurrency exchange.AccountCurrencyInfo
-		exchangeCurrency.CurrencyName = common.StringToUpper(accountBalance[i].Currency)
-		exchangeCurrency.TotalValue = accountBalance[i].Amount
-		exchangeCurrency.Hold = accountBalance[i].Available
+	type bfxCoins struct {
+		OnHold    float64
+		Available float64
+	}
+
+	accounts := make(map[string]bfxCoins)
 
+	for i := range accountBalance {
+		onHold := accountBalance[i].Amount - accountBalance[i].Available
+		coins := bfxCoins{
+			OnHold:    onHold,
+			Available: accountBalance[i].Available,
+		}
+		result, ok := accounts[accountBalance[i].Currency]
+		if !ok {
+			accounts[accountBalance[i].Currency] = coins
+		} else {
+			result.Available += accountBalance[i].Available
+			result.OnHold += onHold
+			accounts[accountBalance[i].Currency] = result
+		}
+	}
+
+	for x, y := range accounts {
+		var exchangeCurrency exchange.AccountCurrencyInfo
+		exchangeCurrency.CurrencyName = common.StringToUpper(x)
+		exchangeCurrency.TotalValue = y.Available + y.OnHold
+		exchangeCurrency.Hold = y.OnHold
 		response.Currencies = append(response.Currencies, exchangeCurrency)
 	}
+
 	return response, nil
 }

exchanges/btcmarkets/btcmarkets.go

@@ -272,11 +272,10 @@ func (b *BTCMarkets) GetAccountBalance() ([]BTCMarketsAccountBalance, error) {
 		return nil, err
 	}
 
+	// All values are returned in Satoshis, even for fiat currencies.
 	for i := range balance {
-		if balance[i].Currency == "LTC" || balance[i].Currency == "BTC" {
-			balance[i].Balance = balance[i].Balance / common.SatoshisPerBTC
-			balance[i].PendingFunds = balance[i].PendingFunds / common.SatoshisPerBTC
-		}
+		balance[i].Balance = balance[i].Balance / common.SatoshisPerBTC
+		balance[i].PendingFunds = balance[i].PendingFunds / common.SatoshisPerBTC
 	}
 	return balance, nil
 }

main.go

@@ -273,18 +273,27 @@ func SeedExchangeAccountInfo(data []exchange.AccountInfo) {
 			avail := data[i].Currencies[j].TotalValue
 			total := onHold + avail
 
-			if total <= 0 {
-				continue
-			}
-
 			if !port.ExchangeAddressExists(exchangeName, currencyName) {
+				if total <= 0 {
+					continue
+				}
+				log.Printf("Portfolio: Adding new exchange address: %s, %s, %f, %s\n",
+					exchangeName, currencyName, total, portfolio.PortfolioAddressExchange)
 				port.Addresses = append(
 					port.Addresses,
 					portfolio.Address{Address: exchangeName, CoinType: currencyName,
 						Balance: total, Description: portfolio.PortfolioAddressExchange},
 				)
 			} else {
-				port.UpdateExchangeAddressBalance(exchangeName, currencyName, total)
+				if total <= 0 {
+					log.Printf("Portfolio: Removing %s %s entry.\n", exchangeName,
+						currencyName)
+					port.RemoveExchangeAddress(exchangeName, currencyName)
+				} else {
+					log.Printf("Portfolio: Updating %s %s entry with balance %f.\n",
+						exchangeName, currencyName, total)
+					port.UpdateExchangeAddressBalance(exchangeName, currencyName, total)
+				}
 			}
 		}
 	}