From f0187c37122776be74eb4caf064dec899cdc1326 Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Fri, 14 Feb 2020 09:26:43 -0800 Subject: [PATCH] Fix names --- cointop/chart.go | 8 ++++---- cointop/common/api/impl/coingecko/coingecko.go | 4 ++-- cointop/common/api/impl/coinmarketcap/coinmarketcap.go | 4 ++-- cointop/common/api/interface.go | 2 +- cointop/common/api/types/types.go | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cointop/chart.go b/cointop/chart.go index e548731..f2ce2ba 100644 --- a/cointop/chart.go +++ b/cointop/chart.go @@ -168,8 +168,8 @@ func (ct *Cointop) ChartPoints(symbol string, name string) error { // NOTE: edit `termui.LineChart.shortenFloatVal(float64)` to not // use exponential notation. - for i := range graphData.PriceCoin { - price := graphData.PriceCoin[i][1] + for i := range graphData.Price { + price := graphData.Price[i][1] data = append(data, price) } } @@ -271,8 +271,8 @@ func (ct *Cointop) PortfolioChart() error { if err != nil { return err } - for i := range apiGraphData.PriceCoin { - price := apiGraphData.PriceCoin[i][1] + for i := range apiGraphData.Price { + price := apiGraphData.Price[i][1] graphData = append(graphData, price) } } diff --git a/cointop/common/api/impl/coingecko/coingecko.go b/cointop/common/api/impl/coingecko/coingecko.go index 8f31037..69486b2 100644 --- a/cointop/common/api/impl/coingecko/coingecko.go +++ b/cointop/common/api/impl/coingecko/coingecko.go @@ -158,8 +158,8 @@ func (s *Service) GetCoinGraphData(convert, symbol, name string, start, end int6 ret.MarketCapByAvailableSupply = marketCap ret.PriceBTC = priceBTC - ret.PriceCoin = priceCoin - ret.VolumeCoin = volumeCoin + ret.Price = priceCoin + ret.Volume = volumeCoin return ret, nil } diff --git a/cointop/common/api/impl/coinmarketcap/coinmarketcap.go b/cointop/common/api/impl/coinmarketcap/coinmarketcap.go index efcd73f..93e35a8 100644 --- a/cointop/common/api/impl/coinmarketcap/coinmarketcap.go +++ b/cointop/common/api/impl/coinmarketcap/coinmarketcap.go @@ -123,8 +123,8 @@ func (s *Service) GetCoinGraphData(convert, symbol string, name string, start in ret.MarketCapByAvailableSupply = graphData.MarketCapByAvailableSupply ret.PriceBTC = graphData.PriceBTC - ret.PriceCoin = graphData.PriceUSD - ret.VolumeCoin = graphData.VolumeUSD + ret.Price = graphData.PriceUSD + ret.Volume = graphData.VolumeUSD return ret, nil } diff --git a/cointop/common/api/interface.go b/cointop/common/api/interface.go index 2e824aa..536cb34 100644 --- a/cointop/common/api/interface.go +++ b/cointop/common/api/interface.go @@ -8,7 +8,7 @@ import ( type Interface interface { Ping() error GetAllCoinData(convert string, ch chan []types.Coin) error - GetCoinGraphData(covnert string, symbol string, name string, start int64, end int64) (types.CoinGraph, error) + GetCoinGraphData(convert string, symbol string, name string, start int64, end int64) (types.CoinGraph, error) GetGlobalMarketGraphData(convert string, start int64, end int64) (types.MarketGraph, error) GetGlobalMarketData(convert string) (types.GlobalMarketData, error) //GetCoinData(coin string) (types.Coin, error) diff --git a/cointop/common/api/types/types.go b/cointop/common/api/types/types.go index 340273d..3100fdf 100644 --- a/cointop/common/api/types/types.go +++ b/cointop/common/api/types/types.go @@ -31,8 +31,8 @@ type GlobalMarketData struct { type CoinGraph struct { MarketCapByAvailableSupply [][]float64 PriceBTC [][]float64 - PriceCoin [][]float64 - VolumeCoin [][]float64 + Price [][]float64 + Volume [][]float64 } // Market struct