From 0f5571598785481736de485997170cd31cd39fc0 Mon Sep 17 00:00:00 2001 From: Adrian Gallagher Date: Wed, 9 Aug 2017 23:18:23 -0700 Subject: [PATCH] Run gofmt and fix poloniex orderbook issue Fixes https://github.com/thrasher-/gocryptotrader/issues/40 --- currency/currency.go | 4 ++-- exchanges/alphapoint/alphapoint_wrapper.go | 4 ++-- exchanges/bitfinex/bitfinex_wrapper.go | 4 ++-- exchanges/bitstamp/bitstamp_wrapper.go | 4 ++-- exchanges/btce/btce_wrapper.go | 4 ++-- exchanges/btcmarkets/btcmarkets.go | 2 +- exchanges/btcmarkets/btcmarkets_wrapper.go | 4 ++-- exchanges/gemini/gemini_wrapper.go | 4 ++-- exchanges/huobi/huobi_wrapper.go | 4 ++-- exchanges/lakebtc/lakebtc_wrapper.go | 4 ++-- exchanges/liqui/liqui_wrapper.go | 4 ++-- exchanges/okcoin/okcoin_wrapper.go | 4 ++-- exchanges/poloniex/poloniex.go | 6 +++--- exchanges/poloniex/poloniex_wrapper.go | 4 ++-- exchanges/stats/stats.go | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/currency/currency.go b/currency/currency.go index dbd057f1..a89c46ba 100644 --- a/currency/currency.go +++ b/currency/currency.go @@ -268,7 +268,7 @@ func QueryYahooCurrencyValues(currencies string) error { pairs = currencyPairs[index : index+maxCurrencyPairsPerRequest] index += maxCurrencyPairsPerRequest } else { - pairs = currencyPairs[index:len(currencyPairs)] + pairs = currencyPairs[index:] index += (len(currencyPairs) - index) } err = FetchYahooCurrencyData(pairs) @@ -277,7 +277,7 @@ func QueryYahooCurrencyValues(currencies string) error { } } } else { - pairs = currencyPairs[index:len(currencyPairs)] + pairs = currencyPairs[index:] err = FetchYahooCurrencyData(pairs) if err != nil { return err diff --git a/exchanges/alphapoint/alphapoint_wrapper.go b/exchanges/alphapoint/alphapoint_wrapper.go index 973ad751..0df237c9 100644 --- a/exchanges/alphapoint/alphapoint_wrapper.go +++ b/exchanges/alphapoint/alphapoint_wrapper.go @@ -54,12 +54,12 @@ func (a *Alphapoint) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBas return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data.Quantity, Price: data.Price}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data.Quantity, Price: data.Price}) } diff --git a/exchanges/bitfinex/bitfinex_wrapper.go b/exchanges/bitfinex/bitfinex_wrapper.go index e205d57e..935124a3 100644 --- a/exchanges/bitfinex/bitfinex_wrapper.go +++ b/exchanges/bitfinex/bitfinex_wrapper.go @@ -88,13 +88,13 @@ func (b *Bitfinex) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, return orderBook, err } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { price, _ := strconv.ParseFloat(orderbookNew.Asks[x].Price, 64) amount, _ := strconv.ParseFloat(orderbookNew.Asks[x].Amount, 64) orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Price: price, Amount: amount}) } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { price, _ := strconv.ParseFloat(orderbookNew.Bids[x].Price, 64) amount, _ := strconv.ParseFloat(orderbookNew.Bids[x].Amount, 64) orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Price: price, Amount: amount}) diff --git a/exchanges/bitstamp/bitstamp_wrapper.go b/exchanges/bitstamp/bitstamp_wrapper.go index 65ccd114..a6692071 100644 --- a/exchanges/bitstamp/bitstamp_wrapper.go +++ b/exchanges/bitstamp/bitstamp_wrapper.go @@ -79,12 +79,12 @@ func (b *Bitstamp) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data.Amount, Price: data.Price}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data.Amount, Price: data.Price}) } diff --git a/exchanges/btce/btce_wrapper.go b/exchanges/btce/btce_wrapper.go index 04cdffa8..c3d6bed9 100644 --- a/exchanges/btce/btce_wrapper.go +++ b/exchanges/btce/btce_wrapper.go @@ -78,12 +78,12 @@ func (b *BTCE) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, err return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(ob.Bids, orderbook.OrderbookItem{Price: data[0], Amount: data[1]}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(ob.Asks, orderbook.OrderbookItem{Price: data[0], Amount: data[1]}) } diff --git a/exchanges/btcmarkets/btcmarkets.go b/exchanges/btcmarkets/btcmarkets.go index 97903d82..1f04de50 100644 --- a/exchanges/btcmarkets/btcmarkets.go +++ b/exchanges/btcmarkets/btcmarkets.go @@ -317,7 +317,7 @@ func (b *BTCMarkets) SendAuthenticatedRequest(reqType, path string, data interfa } if b.Verbose { - log.Printf("Recieved raw: %s\n", resp) + log.Printf("Received raw: %s\n", resp) } err = common.JSONDecode([]byte(resp), &result) diff --git a/exchanges/btcmarkets/btcmarkets_wrapper.go b/exchanges/btcmarkets/btcmarkets_wrapper.go index 52c279a9..ee19d7be 100644 --- a/exchanges/btcmarkets/btcmarkets_wrapper.go +++ b/exchanges/btcmarkets/btcmarkets_wrapper.go @@ -73,12 +73,12 @@ func (b *BTCMarkets) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBas return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } diff --git a/exchanges/gemini/gemini_wrapper.go b/exchanges/gemini/gemini_wrapper.go index c723a2ab..a392cebf 100644 --- a/exchanges/gemini/gemini_wrapper.go +++ b/exchanges/gemini/gemini_wrapper.go @@ -100,11 +100,11 @@ func (g *Gemini) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, e return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: orderbookNew.Bids[x].Amount, Price: orderbookNew.Bids[x].Price}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: orderbookNew.Asks[x].Amount, Price: orderbookNew.Asks[x].Price}) } diff --git a/exchanges/huobi/huobi_wrapper.go b/exchanges/huobi/huobi_wrapper.go index f4a57b1e..038d10fa 100644 --- a/exchanges/huobi/huobi_wrapper.go +++ b/exchanges/huobi/huobi_wrapper.go @@ -83,12 +83,12 @@ func (h *HUOBI) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, er return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } diff --git a/exchanges/lakebtc/lakebtc_wrapper.go b/exchanges/lakebtc/lakebtc_wrapper.go index 36b65e5d..0d7ec64a 100644 --- a/exchanges/lakebtc/lakebtc_wrapper.go +++ b/exchanges/lakebtc/lakebtc_wrapper.go @@ -77,11 +77,11 @@ func (l *LakeBTC) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: orderbookNew.Bids[x].Amount, Price: orderbookNew.Bids[x].Price}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: orderbookNew.Asks[x].Amount, Price: orderbookNew.Asks[x].Price}) } diff --git a/exchanges/liqui/liqui_wrapper.go b/exchanges/liqui/liqui_wrapper.go index 8eb59312..67a293e8 100644 --- a/exchanges/liqui/liqui_wrapper.go +++ b/exchanges/liqui/liqui_wrapper.go @@ -90,12 +90,12 @@ func (l *Liqui) GetOrderbookEx(p pair.CurrencyPair) (orderbook.OrderbookBase, er return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } diff --git a/exchanges/okcoin/okcoin_wrapper.go b/exchanges/okcoin/okcoin_wrapper.go index 58094685..a538f9da 100644 --- a/exchanges/okcoin/okcoin_wrapper.go +++ b/exchanges/okcoin/okcoin_wrapper.go @@ -108,12 +108,12 @@ func (o *OKCoin) GetOrderbookEx(currency pair.CurrencyPair) (orderbook.Orderbook return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data[1], Price: data[0]}) } diff --git a/exchanges/poloniex/poloniex.go b/exchanges/poloniex/poloniex.go index af016140..a895d787 100644 --- a/exchanges/poloniex/poloniex.go +++ b/exchanges/poloniex/poloniex.go @@ -122,15 +122,15 @@ func (p *Poloniex) GetOrderbook(currencyPair string, depth int) (PoloniexOrderbo } ob := PoloniexOrderbook{} - for x, _ := range resp.Asks { + for x := range resp.Asks { data := resp.Asks[x] price, _ := strconv.ParseFloat(data[0].(string), 64) amount := data[1].(float64) ob.Asks = append(ob.Asks, PoloniexOrderbookItem{Price: price, Amount: amount}) } - for x, _ := range resp.Bids { - data := resp.Asks[x] + for x := range resp.Bids { + data := resp.Bids[x] price, _ := strconv.ParseFloat(data[0].(string), 64) amount := data[1].(float64) ob.Bids = append(ob.Bids, PoloniexOrderbookItem{Price: price, Amount: amount}) diff --git a/exchanges/poloniex/poloniex_wrapper.go b/exchanges/poloniex/poloniex_wrapper.go index 69c6ea74..ce04d372 100644 --- a/exchanges/poloniex/poloniex_wrapper.go +++ b/exchanges/poloniex/poloniex_wrapper.go @@ -81,12 +81,12 @@ func (p *Poloniex) GetOrderbookEx(currencyPair pair.CurrencyPair) (orderbook.Ord return orderBook, err } - for x, _ := range orderbookNew.Bids { + for x := range orderbookNew.Bids { data := orderbookNew.Bids[x] orderBook.Bids = append(orderBook.Bids, orderbook.OrderbookItem{Amount: data.Amount, Price: data.Price}) } - for x, _ := range orderbookNew.Asks { + for x := range orderbookNew.Asks { data := orderbookNew.Asks[x] orderBook.Asks = append(orderBook.Asks, orderbook.OrderbookItem{Amount: data.Amount, Price: data.Price}) } diff --git a/exchanges/stats/stats.go b/exchanges/stats/stats.go index 3578211e..5d477e62 100644 --- a/exchanges/stats/stats.go +++ b/exchanges/stats/stats.go @@ -71,7 +71,7 @@ func AppendExchangeInfo(exchange, crypto, fiat string, price, volume float64) { } func ExchangeInfoAlreadyExists(exchange, crypto, fiat string, price, volume float64) bool { - for i, _ := range ExchInfo { + for i := range ExchInfo { if ExchInfo[i].Exchange == exchange && ExchInfo[i].FirstCurrency == crypto && ExchInfo[i].FiatCurrency == fiat { ExchInfo[i].Price, ExchInfo[i].Volume = price, volume return true