Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Handle astroport asset response returning inconsistent data type #332

Merged
merged 8 commits into from
Jan 17, 2024
Merged

fix: Handle astroport asset response returning inconsistent data type #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f4d83a
fix: Handle astroport asset response returning inconsistent data type…
rbajollari Jan 16, 2024
2dabaa3
increase sleep time
rbajollari Jan 17, 2024
0e1a07f
increase sleep time again
rbajollari Jan 17, 2024
218ed2a
lint
rbajollari Jan 17, 2024
f203e41
lint
rbajollari Jan 17, 2024
17b4e33
type switch with assignment
rbajollari Jan 17, 2024
0630f13
fix checkprovidermin test
rbajollari Jan 17, 2024
ab08354
Merge branch 'main' into ryan/fix-astroport-provider
adamewozniak Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/currency_provider_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (t *CurrencyProviderTracker) setCoinIDSymbolMap() error {
}
defer resp.Body.Close()

var listResponse []coinList
listResponse := []coinList{}
if err := json.NewDecoder(resp.Body).Decode(&listResponse); err != nil {
return err
}
Expand Down
32 changes: 21 additions & 11 deletions oracle/provider/astroport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ type (

// AstroportAssetResponse is the response from the Astroport assets endpoint.
AstroportAssetResponse struct {
BaseID string `json:"base_id"`
BaseName string `json:"base_name"`
BaseSymbol string `json:"base_symbol"`
QuoteID string `json:"quote_id"`
QuoteName string `json:"quote_name"`
QuoteSymbol string `json:"quote_symbol"`
LastPrice float64 `json:"last_price"`
BaseVolume float64 `json:"base_volume"`
QuoteVolume float64 `json:"quote_volume"`
USDVolume float64 `json:"USD_volume"`
BaseID string `json:"base_id"`
BaseName string `json:"base_name"`
BaseSymbol string `json:"base_symbol"`
QuoteID string `json:"quote_id"`
QuoteName string `json:"quote_name"`
QuoteSymbol interface{} `json:"quote_symbol"`
LastPrice float64 `json:"last_price"`
BaseVolume float64 `json:"base_volume"`
QuoteVolume float64 `json:"quote_volume"`
USDVolume float64 `json:"USD_volume"`
}
// AstroportTickersResponse is the response from the Astroport tickers endpoint.
AstroportTickersResponse struct {
Expand Down Expand Up @@ -215,9 +215,19 @@ func (p *AstroportProvider) getAvailableAssets() (map[string]types.CurrencyPair,
availablePairs := map[string]types.CurrencyPair{}
for _, assetMap := range astroportAssets {
for tickerID, asset := range assetMap {
// Some responses can return a 0 number value for Quote Symbol which
// needs to be handled here.
var quoteSymbol string
switch v := asset.QuoteSymbol.(type) {
case string:
quoteSymbol = strings.ToUpper(v)
default:
quoteSymbol = ""
}

availablePairs[tickerID] = types.CurrencyPair{
Base: strings.ToUpper(asset.BaseSymbol),
Quote: strings.ToUpper(asset.QuoteSymbol),
Quote: quoteSymbol,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion oracle/provider/astroport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestAstroportProvider_GetTickers(t *testing.T) {
require.NotEmpty(t, availPairs)

p.StartConnections()
time.Sleep(2 * time.Second)
time.Sleep(10 * time.Second)

res, err := p.GetTickerPrices(pairs...)
require.NoError(t, err)
Expand Down
Loading