clean code

libwallet/ext/rate_source.go

@@ -26,11 +26,6 @@ const (
 	kucoinExchange = values.KucoinExchange
 	none           = values.DefaultExchangeValue
 
-	// These are method names for expected bittrex specific websocket messages.
-	BittrexMsgHeartbeat  = "heartbeat"
-	BittrexMarketSummary = "marketSummary"
-	BittrexTicker        = "ticker"
-
 	// MktSep is used repo wide to separate market symbols.
 	MktSep = "-"
 )
@@ -166,7 +161,7 @@ func NewCommonRateSource(ctx context.Context, source string, disableConversionEx
 		sourceChanged:             make(chan *struct{}),
 		disableConversionExchange: disableConversionExchange,
 	}
-	s.getTicker = s.getFuncSource(source)
+	s.getTicker = s.sourceGetTickerFunc(source)
 	s.cond = sync.NewCond(&s.mtx)
 
 	return s, nil
@@ -227,7 +222,7 @@ func (cs *CommonRateSource) ToggleSource(newSource string) error {
 		refresh = false /* none is the dummy rate source for when user disables rates */
 	}
 
-	getTickerFn := cs.getFuncSource(newSource)
+	getTickerFn := cs.sourceGetTickerFunc(newSource)
 	if getTickerFn == nil {
 		return fmt.Errorf("new rate source %s is not supported", newSource)
 	}
@@ -603,7 +598,7 @@ func isValidSource(source string) bool {
 	}
 }
 
-func (cs *CommonRateSource) getFuncSource(source string) func(values.Market) (*Ticker, error) {
+func (cs *CommonRateSource) sourceGetTickerFunc(source string) func(values.Market) (*Ticker, error) {
 	switch source {
 	case binance, binanceUS:
 		return cs.binanceGetTicker
@@ -615,7 +610,13 @@ func (cs *CommonRateSource) getFuncSource(source string) func(values.Market) (*T
 		return kucoinGetTicker
 	case coinpaprika:
 		return cs.coinpaprikaGetTicker
+	case none:
+		return dummyGetTickerFunc
 	default:
 		return nil
 	}
 }
+
+func dummyGetTickerFunc(values.Market) (*Ticker, error) {
+	return &Ticker{}, nil
+}

ui/page/accounts/accounts_page.go

@@ -103,7 +103,7 @@ func (pg *Page) OnNavigatedTo() {
 func (pg *Page) OnNavigatedFrom() {}
 
 func (pg *Page) fetchExchangeRate() {
-	market, err := utils.MarketFromAsset(pg.wallet.GetAssetType())
+	market, err := utils.USDMarketFromAsset(pg.wallet.GetAssetType())
 	if err != nil {
 		log.Errorf("Unsupported asset type: %s", pg.wallet.GetAssetType())
 		return

ui/page/send/page.go

@@ -291,7 +291,7 @@ func (pg *Page) fetchExchangeRate() {
 		return
 	}
 	pg.isFetchingExchangeRate = true
-	market, err := utils.MarketFromAsset(pg.selectedWallet.GetAssetType())
+	market, err := utils.USDMarketFromAsset(pg.selectedWallet.GetAssetType())
 	if err != nil {
 		log.Errorf("Unsupported asset type: %s", pg.selectedWallet.GetAssetType())
 		pg.isFetchingExchangeRate = false

ui/page/wallet/single_wallet_main_page.go

@@ -226,7 +226,7 @@ func (swmp *SingleWalletMasterPage) fetchExchangeRate() {
 	}
 
 	swmp.isFetchingExchangeRate = true
-	market, err := utils.MarketFromAsset(swmp.selectedWallet.GetAssetType())
+	market, err := utils.USDMarketFromAsset(swmp.selectedWallet.GetAssetType())
 	if err != nil {
 		log.Errorf("Asset type %q is not supported for exchange rate fetching", swmp.selectedWallet.GetAssetType())
 		swmp.isFetchingExchangeRate = false

ui/utils/utils.go

@@ -179,7 +179,7 @@ func RadiusLayout(gtx layout.Context, radius int, w layout.Widget) layout.Dimens
 	return dims
 }
 
-func MarketFromAsset(asset utils.AssetType) (values.Market, error) {
+func USDMarketFromAsset(asset utils.AssetType) (values.Market, error) {
 	switch asset {
 	case utils.DCRWalletAsset:
 		return values.DCRUSDTMarket, nil