rename currency base code utils

Author: woodser

core/src/main/java/haveno/core/api/CorePriceService.java

@@ -72,7 +72,7 @@ public CorePriceService(PriceFeedService priceFeedService, OfferBookService offe
      * @return Price per 1 XMR in the given currency (traditional or crypto)
      */
     public double getMarketPrice(String currencyCode) throws ExecutionException, InterruptedException, TimeoutException, IllegalArgumentException {
-        var marketPrice = priceFeedService.requestAllPrices().get(CurrencyUtil.getCurrencyCodeBase(currencyCode));
+        var marketPrice = priceFeedService.requestAllPrices().get(CurrencyUtil.getCurrencyBaseCode(currencyCode));
         if (marketPrice == null) {
             throw new IllegalArgumentException("Currency not found: " + currencyCode); // message sent to client
         }

core/src/main/java/haveno/core/locale/CurrencyUtil.java

@@ -299,7 +299,7 @@ public static boolean isCryptoCurrency(String currencyCode) {
         if (currencyCode != null && isCryptoCurrencyMap.containsKey(currencyCode.toUpperCase())) {
             return isCryptoCurrencyMap.get(currencyCode.toUpperCase());
         }
-        if (isCryptoCurrencyBase(currencyCode)) {
+        if (isCryptoCurrencyBaseCode(currencyCode)) {
             return true;
         }
 
@@ -328,13 +328,13 @@ public static boolean isCryptoCurrency(String currencyCode) {
         return isCryptoCurrency;
     }
 
-    private static boolean isCryptoCurrencyBase(String currencyCode) {
+    private static boolean isCryptoCurrencyBaseCode(String currencyCode) {
         if (currencyCode == null) return false;
         currencyCode = currencyCode.toUpperCase();
         return currencyCode.equals("USDT") || currencyCode.equals("USDC") || currencyCode.equals("DAI");
     }
 
-    public static String getCurrencyCodeBase(String currencyCode) {
+    public static String getCurrencyBaseCode(String currencyCode) {
         if (currencyCode == null) return null;
         currencyCode = currencyCode.toUpperCase();
         if (currencyCode.contains("USDT")) return "USDT";

core/src/main/java/haveno/core/provider/price/PriceFeedService.java

@@ -292,13 +292,13 @@ private boolean setNewPriceProvider() {
     @Nullable
     public MarketPrice getMarketPrice(String currencyCode) {
         synchronized (cache) {
-            return cache.getOrDefault(CurrencyUtil.getCurrencyCodeBase(currencyCode), null);
+            return cache.getOrDefault(CurrencyUtil.getCurrencyBaseCode(currencyCode), null);
         }
     }
 
     private void setHavenoMarketPrice(String currencyCode, Price price) {
         UserThread.execute(() -> {
-            String currencyCodeBase = CurrencyUtil.getCurrencyCodeBase(currencyCode);
+            String currencyCodeBase = CurrencyUtil.getCurrencyBaseCode(currencyCode);
             synchronized (cache) {
                 if (!cache.containsKey(currencyCodeBase) || !cache.get(currencyCodeBase).isExternallyProvidedPrice()) {
                     cache.put(currencyCodeBase, new MarketPrice(currencyCodeBase,

core/src/main/java/haveno/core/provider/price/PriceProvider.java

@@ -64,7 +64,7 @@ public synchronized Map<String, MarketPrice> getAll() throws IOException {
                 String baseCurrencyCode = (String) treeMap.get("baseCurrencyCode");
                 String counterCurrencyCode = (String) treeMap.get("counterCurrencyCode");
                 String currencyCode = baseCurrencyCode.equals("XMR") ? counterCurrencyCode : baseCurrencyCode;
-                currencyCode = CurrencyUtil.getCurrencyCodeBase(currencyCode);
+                currencyCode = CurrencyUtil.getCurrencyBaseCode(currencyCode);
                 double price = (Double) treeMap.get("price");
                 // json uses double for our timestampSec long value...
                 long timestampSec = MathUtils.doubleToLong((Double) treeMap.get("timestampSec"));

desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java

@@ -271,7 +271,7 @@ private void addBindings() {
                     dataModel.getTradeCurrencyCode()));
         }
         volumePromptLabel.bind(createStringBinding(
-                () -> Res.get("createOffer.volume.prompt", CurrencyUtil.getCurrencyCodeBase(dataModel.getTradeCurrencyCode().get())),
+                () -> Res.get("createOffer.volume.prompt", CurrencyUtil.getCurrencyBaseCode(dataModel.getTradeCurrencyCode().get())),
                 dataModel.getTradeCurrencyCode()));
 
         totalToPay.bind(createStringBinding(() -> HavenoUtils.formatXmr(dataModel.totalToPayAsProperty().get(), true),

desktop/src/main/java/haveno/desktop/main/presentation/MarketPricePresentation.java

@@ -115,7 +115,7 @@ private void fillPriceFeedComboBoxItems() {
         List<String> uniqueCurrencyCodeBases = preferences.getTradeCurrenciesAsObservable()
                 .stream()
                 .map(TradeCurrency::getCode)
-                .map(CurrencyUtil::getCurrencyCodeBase)
+                .map(CurrencyUtil::getCurrencyBaseCode)
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -181,7 +181,7 @@ private void setupMarketPriceFeed() {
 
     private Optional<PriceFeedComboBoxItem> findPriceFeedComboBoxItem(String currencyCode) {
         return priceFeedComboBoxItems.stream()
-                .filter(item -> CurrencyUtil.getCurrencyCodeBase(item.currencyCode).equals(CurrencyUtil.getCurrencyCodeBase(currencyCode)))
+                .filter(item -> CurrencyUtil.getCurrencyBaseCode(item.currencyCode).equals(CurrencyUtil.getCurrencyBaseCode(currencyCode)))
                 .findAny();
     }