From 92a6246052e4f438a8f0a92005b71e3e798062b5 Mon Sep 17 00:00:00 2001 From: Steven Polley Date: Sat, 23 Mar 2024 14:06:38 -0600 Subject: [PATCH] Do not export when not required --- providers/bitcoin/address.go | 6 +++--- providers/bitcoin/fiat.go | 10 +++++----- providers/bitcoin/providerImpl.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/providers/bitcoin/address.go b/providers/bitcoin/address.go index 562081d..153c8b7 100644 --- a/providers/bitcoin/address.go +++ b/providers/bitcoin/address.go @@ -5,7 +5,7 @@ import ( "net/url" ) -type Address struct { +type addressData struct { Address string `json:"address"` ChainStats struct { FundedTxoCount int `json:"funded_txo_count"` @@ -25,8 +25,8 @@ type Address struct { // GetAddress returns an Address struct populated with data from blockstream.info // for a given BTC address -func (c *client) getAddress(address string) (*Address, error) { - addressResponse := &Address{} +func (c *client) getAddress(address string) (*addressData, error) { + addressResponse := &addressData{} err := c.get(fmt.Sprintf("address/%s", address), addressResponse, url.Values{}) if err != nil { diff --git a/providers/bitcoin/fiat.go b/providers/bitcoin/fiat.go index ab0ed70..184f283 100644 --- a/providers/bitcoin/fiat.go +++ b/providers/bitcoin/fiat.go @@ -7,7 +7,7 @@ import ( const fiatConvertURL = "https://api.coingecko.com/api/v3/coins/bitcoin?localization=false&tickers=false&market_data=true&community_data=false&developer_data=false&sparkline=false" -type FiatConversion struct { +type coinGeckoResponse struct { MarketData struct { CurrentPrice struct { CAD int `json:"cad"` @@ -15,8 +15,8 @@ type FiatConversion struct { } `json:"market_data"` } -func (c *client) ConvertBTCToCAD(amount int) (int, error) { - fiatConversion := &FiatConversion{} +func (c *client) convertBTCToCAD(amount int) (int, error) { + coinGeckoData := &coinGeckoResponse{} req, err := http.NewRequest("GET", fiatConvertURL, nil) if err != nil { @@ -28,10 +28,10 @@ func (c *client) ConvertBTCToCAD(amount int) (int, error) { return 0, fmt.Errorf("http GET request failed: %v", err) } - err = c.processResponse(res, fiatConversion) + err = c.processResponse(res, coinGeckoData) if err != nil { return 0, fmt.Errorf("failed to process response: %v", err) } - return (amount * int(fiatConversion.MarketData.CurrentPrice.CAD*1000)) / 100000000, nil // one BTC = one hundred million satoshi's + return (amount * int(coinGeckoData.MarketData.CurrentPrice.CAD*1000)) / 100000000, nil // one BTC = one hundred million satoshi's } diff --git a/providers/bitcoin/providerImpl.go b/providers/bitcoin/providerImpl.go index a28e524..9096dbf 100644 --- a/providers/bitcoin/providerImpl.go +++ b/providers/bitcoin/providerImpl.go @@ -59,7 +59,7 @@ func (p *Provider) GetBalances() ([]int, []string, error) { satoshiBalance += addressResponse.ChainStats.FundedTxoSum - addressResponse.ChainStats.SpentTxoSum } - fiatBalance, err := p.client.ConvertBTCToCAD(satoshiBalance) + fiatBalance, err := p.client.convertBTCToCAD(satoshiBalance) if err != nil { return balances, ynabAccountIDs, fmt.Errorf("failed to convert satoshi balance to fiat balance: %v", err) }