Merge pull request #46 from vegaprotocol/patch-panic

feat: fix panic for coinmarketcap
vegaprotocol · Nov 30, 2022 · 1ae3273 · 1ae3273
2 parents 64e27be + fe5863d
commit 1ae3273
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pricing/coinmarketcap.go b/pricing/coinmarketcap.go
@@ -63,6 +63,7 @@ func coinmarketcapStartFetching(
 				"URL":               sourcecfg.URL.String(),
 				"rateLimitDuration": oneRequestEvery,
 			}).Errorln("failed to get trading data.")
+			continue
 		}
 
 		for _, price := range board.PriceList(sourcecfg.Name) {

diff --git a/service/service.go b/service/service.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"code.vegaprotocol.io/priceproxy/config"
@@ -163,8 +164,8 @@ func (s *Service) PricesGet(w http.ResponseWriter, r *http.Request, ps httproute
 
 	for k, v := range s.pe.GetPrices() {
 		if (source == "" || source == k.Source) &&
-			(base == "" || base == k.Base) &&
-			(quote == "" || quote == k.Quote) &&
+			(base == "" || strings.EqualFold(base, k.Base) || strings.EqualFold(base, k.BaseOverride)) &&
+			(quote == "" || strings.EqualFold(quote, k.Quote) || strings.EqualFold(quote, k.QuoteOverride)) &&
 			(wanderPtr == nil || *wanderPtr == k.Wander) {
 			returnedQuote := k.Quote
 			if k.QuoteOverride != "" {