From 01f183b7a7634181564f7368d59756d03a70447b Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 4 May 2021 22:09:23 -0400 Subject: [PATCH] fix fiat trades by changing base currency to xmr #7 --- .../bisq/apitest/config/ApiTestConfig.java | 1 + .../offer/CreateOfferUsingFixedPriceTest.java | 20 ++++++------- ...CreateOfferUsingMarketPriceMarginTest.java | 28 +++++++++---------- .../java/bisq/apitest/scenario/OfferTest.java | 14 +++++----- .../java/bisq/core/locale/CurrencyUtil.java | 4 +-- core/src/main/java/bisq/core/offer/Offer.java | 2 +- .../java/bisq/core/offer/OfferPayload.java | 6 ++-- .../trade/statistics/TradeStatistics2.java | 2 +- .../main/java/bisq/core/user/Preferences.java | 2 +- .../java/bisq/core/locale/BankUtilTest.java | 4 +-- .../bisq/core/locale/CurrencyUtilTest.java | 4 +-- .../test/java/bisq/core/offer/OfferMaker.java | 2 +- .../AltCoinAddressValidatorTest.java | 3 ++ .../java/bisq/core/user/PreferencesTest.java | 4 +-- .../bisq/core/util/FormattingUtilsTest.java | 4 +-- .../bisq/core/util/RegexValidatorTest.java | 4 +-- .../main/java/bisq/desktop/main/MainView.java | 6 ++-- .../desktop/main/offer/MutableOfferView.java | 2 +- .../main/offer/takeoffer/TakeOfferView.java | 2 +- .../main/settings/about/AboutView.java | 8 +++--- .../java/bisq/desktop/ComponentsDemo.java | 8 +++--- .../java/bisq/desktop/MarketsPrintTool.java | 2 +- .../daostate/DaoStateBlockListItemTest.java | 4 +-- .../trades/TradesChartsViewModelTest.java | 2 +- .../createoffer/CreateOfferDataModelTest.java | 4 +-- .../createoffer/CreateOfferViewModelTest.java | 4 +-- .../offerbook/OfferBookListItemMaker.java | 2 +- .../offerbook/OfferBookViewModelTest.java | 2 +- .../editoffer/EditOfferDataModelTest.java | 4 +-- .../desktop/maker/CurrencyListItemMakers.java | 4 +-- .../java/bisq/desktop/maker/OfferMaker.java | 2 +- .../desktop/maker/TradeCurrencyMakers.java | 4 +-- .../bisq/desktop/util/DisplayUtilsTest.java | 18 ++++++------ .../java/bisq/desktop/util/GUIUtilTest.java | 10 +++---- .../util/ImmutableCoinFormatterTest.java | 4 +-- .../validation/AccountNrValidatorTest.java | 4 +-- .../validation/BranchIdValidatorTest.java | 4 +-- .../NationalAccountIdValidatorTest.java | 4 +-- 38 files changed, 106 insertions(+), 102 deletions(-) diff --git a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java b/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java index 44897a2da0..0a779f4781 100644 --- a/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java +++ b/apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java @@ -57,6 +57,7 @@ public class ApiTestConfig { // Global constants public static final String BSQ = "BSQ"; public static final String BTC = "BTC"; + public static final String XMR = "XMR"; public static final String ARBITRATOR = "arbitrator"; public static final String MEDIATOR = "mediator"; public static final String REFUND_AGENT = "refundagent"; diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java index 081c6feadc..e5f4346280 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.config.ApiTestConfig.BSQ; -import static bisq.apitest.config.ApiTestConfig.BTC; +import static bisq.apitest.config.ApiTestConfig.XMR; import static bisq.cli.TableFormat.formatOfferTable; import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent; import static java.util.Collections.singletonList; @@ -47,7 +47,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { @Test @Order(1) - public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() { + public void testCreateAUDXMRBuyOfferUsingFixedPrice16000() { PaymentAccount audAccount = createDummyF2FAccount(aliceClient, "AU"); var newOffer = aliceClient.createFixedPricedOffer(BUY.name(), "aud", @@ -67,7 +67,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(audAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("AUD", newOffer.getCounterCurrencyCode()); assertFalse(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -80,14 +80,14 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(audAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("AUD", newOffer.getCounterCurrencyCode()); assertFalse(newOffer.getIsCurrencyForMakerFeeBtc()); } @Test @Order(2) - public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() { + public void testCreateUSDXMRBuyOfferUsingFixedPrice100001234() { PaymentAccount usdAccount = createDummyF2FAccount(aliceClient, "US"); var newOffer = aliceClient.createFixedPricedOffer(BUY.name(), "usd", @@ -107,7 +107,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(usdAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("USD", newOffer.getCounterCurrencyCode()); assertFalse(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -120,14 +120,14 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(usdAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("USD", newOffer.getCounterCurrencyCode()); assertFalse(newOffer.getIsCurrencyForMakerFeeBtc()); } @Test @Order(3) - public void testCreateEURBTCSellOfferUsingFixedPrice95001234() { + public void testCreateEURXMRSellOfferUsingFixedPrice95001234() { PaymentAccount eurAccount = createDummyF2FAccount(aliceClient, "FR"); var newOffer = aliceClient.createFixedPricedOffer(SELL.name(), "eur", @@ -147,7 +147,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals(5_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(eurAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("EUR", newOffer.getCounterCurrencyCode()); assertFalse(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -160,7 +160,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals(5_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(eurAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("EUR", newOffer.getCounterCurrencyCode()); assertFalse(newOffer.getIsCurrencyForMakerFeeBtc()); } diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java index 94c2519d91..c8c42b7c69 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.ApiTestConfig.BTC; +import static bisq.apitest.config.ApiTestConfig.XMR; import static bisq.cli.TableFormat.formatOfferTable; import static bisq.common.util.MathUtils.scaleDownByPowerOf10; import static bisq.common.util.MathUtils.scaleUpByPowerOf10; @@ -54,11 +54,11 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { private static final double MKT_PRICE_MARGIN_ERROR_TOLERANCE = 0.0050; // 0.50% private static final double MKT_PRICE_MARGIN_WARNING_TOLERANCE = 0.0001; // 0.01% - private static final String MAKER_FEE_CURRENCY_CODE = BTC; + private static final String MAKER_FEE_CURRENCY_CODE = XMR; @Test @Order(1) - public void testCreateUSDBTCBuyOffer5PctPriceMargin() { + public void testCreateUSDXMRBuyOffer5PctPriceMargin() { PaymentAccount usdAccount = createDummyF2FAccount(aliceClient, "US"); double priceMarginPctInput = 5.00; var newOffer = aliceClient.createMarketBasedPricedOffer(BUY.name(), @@ -78,7 +78,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(usdAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("USD", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -90,7 +90,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(usdAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("USD", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -99,7 +99,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { @Test @Order(2) - public void testCreateNZDBTCBuyOfferMinus2PctPriceMargin() { + public void testCreateNZDXMRBuyOfferMinus2PctPriceMargin() { PaymentAccount nzdAccount = createDummyF2FAccount(aliceClient, "NZ"); double priceMarginPctInput = -2.00; var newOffer = aliceClient.createMarketBasedPricedOffer(BUY.name(), @@ -119,7 +119,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(nzdAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("NZD", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -131,7 +131,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(10_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(nzdAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("NZD", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -140,7 +140,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { @Test @Order(3) - public void testCreateGBPBTCSellOfferMinus1Point5PctPriceMargin() { + public void testCreateGBPXMRSellOfferMinus1Point5PctPriceMargin() { PaymentAccount gbpAccount = createDummyF2FAccount(aliceClient, "GB"); double priceMarginPctInput = -1.5; var newOffer = aliceClient.createMarketBasedPricedOffer(SELL.name(), @@ -160,7 +160,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(5_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(gbpAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("GBP", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -172,7 +172,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(5_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(gbpAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("GBP", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -181,7 +181,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { @Test @Order(4) - public void testCreateBRLBTCSellOffer6Point55PctPriceMargin() { + public void testCreateBRLXMRSellOffer6Point55PctPriceMargin() { PaymentAccount brlAccount = createDummyF2FAccount(aliceClient, "BR"); double priceMarginPctInput = 6.55; var newOffer = aliceClient.createMarketBasedPricedOffer(SELL.name(), @@ -201,7 +201,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(5_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(brlAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("BRL", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); @@ -213,7 +213,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { assertEquals(5_000_000, newOffer.getMinAmount()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(brlAccount.getId(), newOffer.getPaymentAccountId()); - assertEquals(BTC, newOffer.getBaseCurrencyCode()); + assertEquals(XMR, newOffer.getBaseCurrencyCode()); assertEquals("BRL", newOffer.getCounterCurrencyCode()); assertTrue(newOffer.getIsCurrencyForMakerFeeBtc()); diff --git a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java b/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java index 15c11e65b4..5c531a9399 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java @@ -58,19 +58,19 @@ public class OfferTest extends AbstractOfferTest { @Order(3) public void testCreateOfferUsingFixedPrice() { CreateOfferUsingFixedPriceTest test = new CreateOfferUsingFixedPriceTest(); - test.testCreateAUDBTCBuyOfferUsingFixedPrice16000(); - test.testCreateUSDBTCBuyOfferUsingFixedPrice100001234(); - test.testCreateEURBTCSellOfferUsingFixedPrice95001234(); + test.testCreateAUDXMRBuyOfferUsingFixedPrice16000(); + test.testCreateUSDXMRBuyOfferUsingFixedPrice100001234(); + test.testCreateEURXMRSellOfferUsingFixedPrice95001234(); } @Test @Order(4) public void testCreateOfferUsingMarketPriceMargin() { CreateOfferUsingMarketPriceMarginTest test = new CreateOfferUsingMarketPriceMarginTest(); - test.testCreateUSDBTCBuyOffer5PctPriceMargin(); - test.testCreateNZDBTCBuyOfferMinus2PctPriceMargin(); - test.testCreateGBPBTCSellOfferMinus1Point5PctPriceMargin(); - test.testCreateBRLBTCSellOffer6Point55PctPriceMargin(); + test.testCreateUSDXMRBuyOffer5PctPriceMargin(); + test.testCreateNZDXMRBuyOfferMinus2PctPriceMargin(); + test.testCreateGBPXMRSellOfferMinus1Point5PctPriceMargin(); + test.testCreateBRLXMRSellOffer6Point55PctPriceMargin(); } @Test diff --git a/core/src/main/java/bisq/core/locale/CurrencyUtil.java b/core/src/main/java/bisq/core/locale/CurrencyUtil.java index f2581b45aa..6bd9c65cc3 100644 --- a/core/src/main/java/bisq/core/locale/CurrencyUtil.java +++ b/core/src/main/java/bisq/core/locale/CurrencyUtil.java @@ -532,9 +532,9 @@ public class CurrencyUtil { .filter(cryptoCurrency -> cryptoCurrency.getCode().equals(currencyCode)) .findAny(); - String btcOrRemovedAsset = "BTC".equals(currencyCode) ? "Bitcoin" : + String xmrOrRemovedAsset = "XMR".equals(currencyCode) ? "Monero" : removedCryptoCurrency.isPresent() ? removedCryptoCurrency.get().getName() : Res.get("shared.na"); - return getCryptoCurrency(currencyCode).map(TradeCurrency::getName).orElse(btcOrRemovedAsset); + return getCryptoCurrency(currencyCode).map(TradeCurrency::getName).orElse(xmrOrRemovedAsset); } try { return Currency.getInstance(currencyCode).getDisplayName(); diff --git a/core/src/main/java/bisq/core/offer/Offer.java b/core/src/main/java/bisq/core/offer/Offer.java index 05305dadf0..c79afcf99d 100644 --- a/core/src/main/java/bisq/core/offer/Offer.java +++ b/core/src/main/java/bisq/core/offer/Offer.java @@ -433,7 +433,7 @@ public class Offer implements NetworkPayload, PersistablePayload { return currencyCode; } - currencyCode = offerPayload.getBaseCurrencyCode().equals("BTC") ? + currencyCode = offerPayload.getBaseCurrencyCode().equals("XMR") ? offerPayload.getCounterCurrencyCode() : offerPayload.getBaseCurrencyCode(); return currencyCode; diff --git a/core/src/main/java/bisq/core/offer/OfferPayload.java b/core/src/main/java/bisq/core/offer/OfferPayload.java index 92f6ece603..1db517a1b3 100644 --- a/core/src/main/java/bisq/core/offer/OfferPayload.java +++ b/core/src/main/java/bisq/core/offer/OfferPayload.java @@ -384,12 +384,12 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay } // In the offer we support base and counter currency - // Fiat offers have base currency BTC and counterCurrency Fiat - // Altcoins have base currency Altcoin and counterCurrency BTC + // Fiat offers have base currency XMR and counterCurrency Fiat + // Altcoins have base currency Altcoin and counterCurrency XMR // The rest of the app does not support yet that concept of base currency and counter currencies // so we map here for convenience public String getCurrencyCode() { - return getBaseCurrencyCode().equals("BTC") ? getCounterCurrencyCode() : getBaseCurrencyCode(); + return getBaseCurrencyCode().equals("XMR") ? getCounterCurrencyCode() : getBaseCurrencyCode(); } @Override diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java index 4fb6948277..da74e6e6e9 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java +++ b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java @@ -307,7 +307,7 @@ public final class TradeStatistics2 implements ProcessOncePersistableNetworkPayl } public String getCurrencyCode() { - return baseCurrency.equals("BTC") ? counterCurrency : baseCurrency; + return baseCurrency.equals("XMR") ? counterCurrency : baseCurrency; } public Coin getTradeAmount() { diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java index 644cbf5e27..156a83f9ea 100644 --- a/core/src/main/java/bisq/core/user/Preferences.java +++ b/core/src/main/java/bisq/core/user/Preferences.java @@ -284,7 +284,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid setCryptoCurrencies(CurrencyUtil.getMainCryptoCurrencies()); BaseCurrencyNetwork baseCurrencyNetwork = Config.baseCurrencyNetwork(); - if ("BTC".equals(baseCurrencyNetwork.getCurrencyCode())) { + if ("BTC".equals(baseCurrencyNetwork.getCurrencyCode())) { // TODO (woodser): change to XMR when --baseCurrencyNetwork=XMR_REGTEST supported setBlockChainExplorerMainNet(BTC_MAIN_NET_EXPLORERS.get(0)); setBlockChainExplorerTestNet(BTC_TEST_NET_EXPLORERS.get(0)); } else { diff --git a/core/src/test/java/bisq/core/locale/BankUtilTest.java b/core/src/test/java/bisq/core/locale/BankUtilTest.java index faed124eb2..a3403f5b25 100644 --- a/core/src/test/java/bisq/core/locale/BankUtilTest.java +++ b/core/src/test/java/bisq/core/locale/BankUtilTest.java @@ -15,8 +15,8 @@ public class BankUtilTest { public void setup() { Locale.setDefault(new Locale("en", "US")); GlobalSettings.setLocale(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/core/src/test/java/bisq/core/locale/CurrencyUtilTest.java b/core/src/test/java/bisq/core/locale/CurrencyUtilTest.java index 592b438e46..baa66cb245 100644 --- a/core/src/test/java/bisq/core/locale/CurrencyUtilTest.java +++ b/core/src/test/java/bisq/core/locale/CurrencyUtilTest.java @@ -45,8 +45,8 @@ public class CurrencyUtilTest { public void setup() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/core/src/test/java/bisq/core/offer/OfferMaker.java b/core/src/test/java/bisq/core/offer/OfferMaker.java index aa9d294c2e..aed49ca2d2 100644 --- a/core/src/test/java/bisq/core/offer/OfferMaker.java +++ b/core/src/test/java/bisq/core/offer/OfferMaker.java @@ -46,7 +46,7 @@ public class OfferMaker { lookup.valueOf(useMarketBasedPrice, false), lookup.valueOf(amount, 100000L), lookup.valueOf(minAmount, 100000L), - lookup.valueOf(baseCurrencyCode, "BTC"), + lookup.valueOf(baseCurrencyCode, "XMR"), lookup.valueOf(counterCurrencyCode, "USD"), null, null, diff --git a/core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java b/core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java index acce0539fb..01f4baf5e5 100644 --- a/core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java +++ b/core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java @@ -44,6 +44,9 @@ public class AltCoinAddressValidatorTest { validator.setCurrencyCode("BTC"); assertTrue(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid); + + validator.setCurrencyCode("XMR"); + assertTrue(validator.validate("4AuUM6PedofLWKfRCX1fP3SoNZUzq6FSAbpevHRR6tVuMpZc3HznVeudmNGkEB75apjE7WKVgZZh1YvPVxZoHFN88NCdmWw").isValid); validator.setCurrencyCode("LTC"); assertTrue(validator.validate("Lg3PX8wRWmApFCoCMAsPF5P9dPHYQHEWKW").isValid); diff --git a/core/src/test/java/bisq/core/user/PreferencesTest.java b/core/src/test/java/bisq/core/user/PreferencesTest.java index f067d8680c..6b017a1b43 100644 --- a/core/src/test/java/bisq/core/user/PreferencesTest.java +++ b/core/src/test/java/bisq/core/user/PreferencesTest.java @@ -54,8 +54,8 @@ public class PreferencesTest { final Locale en_US = new Locale("en", "US"); Locale.setDefault(en_US); GlobalSettings.setLocale(en_US); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); persistenceManager = mock(PersistenceManager.class); Config config = new Config(); diff --git a/core/src/test/java/bisq/core/util/FormattingUtilsTest.java b/core/src/test/java/bisq/core/util/FormattingUtilsTest.java index 76f5a46e0b..b2d4b2a711 100644 --- a/core/src/test/java/bisq/core/util/FormattingUtilsTest.java +++ b/core/src/test/java/bisq/core/util/FormattingUtilsTest.java @@ -31,8 +31,8 @@ public class FormattingUtilsTest { @Before public void setUp() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/core/src/test/java/bisq/core/util/RegexValidatorTest.java b/core/src/test/java/bisq/core/util/RegexValidatorTest.java index 67d5075ade..cb5be94536 100644 --- a/core/src/test/java/bisq/core/util/RegexValidatorTest.java +++ b/core/src/test/java/bisq/core/util/RegexValidatorTest.java @@ -37,8 +37,8 @@ public class RegexValidatorTest { public void setup() { Locale.setDefault(new Locale("en", "US")); GlobalSettings.setLocale(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java index 24d17ed0cf..5e0ae652c1 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/bisq/desktop/main/MainView.java @@ -251,7 +251,7 @@ public class MainView extends InitializableView try { String preferredTradeCurrency = model.getPreferences().getPreferredTradeCurrency().getCode(); double availableBalance = Double.parseDouble( - model.getAvailableBalance().getValue().replace("BTC", "")); + model.getAvailableBalance().getValue().replace("XMR", "")); double marketPrice = Double.parseDouble(model.getMarketPrice(preferredTradeCurrency).getValue()); tooltipText += "\n" + currencyFormat.format(availableBalance * marketPrice) + " " + preferredTradeCurrency; @@ -276,7 +276,7 @@ public class MainView extends InitializableView try { String preferredTradeCurrency = model.getPreferences().getPreferredTradeCurrency().getCode(); double reservedBalance = Double.parseDouble( - model.getReservedBalance().getValue().replace("BTC", "")); + model.getReservedBalance().getValue().replace("XMR", "")); double marketPrice = Double.parseDouble(model.getMarketPrice(preferredTradeCurrency).getValue()); tooltipText += "\n" + currencyFormat.format(reservedBalance * marketPrice) + " " + preferredTradeCurrency; @@ -301,7 +301,7 @@ public class MainView extends InitializableView try { String preferredTradeCurrency = model.getPreferences().getPreferredTradeCurrency().getCode(); double lockedBalance = Double.parseDouble( - model.getLockedBalance().getValue().replace("BTC", "")); + model.getLockedBalance().getValue().replace("XMR", "")); double marketPrice = Double.parseDouble(model.getMarketPrice(preferredTradeCurrency).getValue()); tooltipText += "\n" + currencyFormat.format(lockedBalance * marketPrice) + " " + preferredTradeCurrency; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index b9783347fb..b6c5888e86 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -1464,7 +1464,7 @@ public abstract class MutableOfferView> exten vBox.getChildren().addAll(tradeFeeInBtcLabel, tradeFeeInBsqLabel); tradeFeeInBtcToggle = new AutoTooltipSlideToggleButton(); - tradeFeeInBtcToggle.setText("BTC"); + tradeFeeInBtcToggle.setText("BTC"); // TODO (woodser): update to XMR tradeFeeInBtcToggle.setVisible(false); tradeFeeInBtcToggle.setPadding(new Insets(-8, 5, -10, 5)); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index 09cd488572..2dc35618bb 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -1201,7 +1201,7 @@ public class TakeOfferView extends ActivatableViewAndModel { hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://bisq.network/contribute"); GridPane.setColumnSpan(hyperlinkWithIcon, 2); - boolean isBtc = Res.getBaseCurrencyCode().equals("BTC"); - addTitledGroupBg(root, ++gridRow, isBtc ? 3 : 2, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE); + boolean isXmr = Res.getBaseCurrencyCode().equals("XMR"); + addTitledGroupBg(root, ++gridRow, isXmr ? 3 : 2, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE); - label = addLabel(root, gridRow, Res.get(isBtc ? "setting.about.apisWithFee" : "setting.about.apis"), Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE); + label = addLabel(root, gridRow, Res.get(isXmr ? "setting.about.apisWithFee" : "setting.about.apis"), Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE); label.setWrapText(true); GridPane.setHalignment(label, HPos.LEFT); addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.pricesProvided"), "Bisq Price Index (https://bisq.wiki/Bisq_Price_Index)"); - if (isBtc) + if (isXmr) addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.feeEstimation.label"), "mempool.space (https://mempool.space)"); addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.versionDetails"), Layout.GROUP_DISTANCE); diff --git a/desktop/src/test/java/bisq/desktop/ComponentsDemo.java b/desktop/src/test/java/bisq/desktop/ComponentsDemo.java index 5577e81e23..4ea82f6400 100644 --- a/desktop/src/test/java/bisq/desktop/ComponentsDemo.java +++ b/desktop/src/test/java/bisq/desktop/ComponentsDemo.java @@ -51,8 +51,8 @@ public class ComponentsDemo extends Application { @Override public void start(Stage primaryStage) throws Exception { - final CryptoCurrency btc = new CryptoCurrency("BTC", "bitcoin"); - GlobalSettings.setDefaultTradeCurrency(btc); + final CryptoCurrency xmr = new CryptoCurrency("XMR", "monero"); + GlobalSettings.setDefaultTradeCurrency(xmr); GlobalSettings.setLocale(Locale.US); Res.setup(); @@ -85,9 +85,9 @@ public class ComponentsDemo extends Application { final Button buttonEnabled = FormBuilder.addButton(gridPane, rowIndex++, "Hello World"); buttonEnabled.setOnMouseClicked((click) -> { - //bar.enqueue(new JFXSnackbar.SnackbarEvent(Res.get("notification.walletUpdate.msg", "0.345 BTC"), "CLOSE", 3000, true, b -> bar.close())); + //bar.enqueue(new JFXSnackbar.SnackbarEvent(Res.get("notification.walletUpdate.msg", "0.345 XMR"), "CLOSE", 3000, true, b -> bar.close())); // new Popup<>().headLine(Res.get("popup.roundedFiatValues.headline")) -// .message(Res.get("popup.roundedFiatValues.msg", "BTC")) +// .message(Res.get("popup.roundedFiatValues.msg", "XMR")) // .show(); // new Notification().headLine(Res.get("notification.tradeCompleted.headline")) // .notification(Res.get("notification.tradeCompleted.msg")) diff --git a/desktop/src/test/java/bisq/desktop/MarketsPrintTool.java b/desktop/src/test/java/bisq/desktop/MarketsPrintTool.java index 896a492fe7..1f34b4bcc2 100644 --- a/desktop/src/test/java/bisq/desktop/MarketsPrintTool.java +++ b/desktop/src/test/java/bisq/desktop/MarketsPrintTool.java @@ -40,7 +40,7 @@ public class MarketsPrintTool { final Collection allSortedFiatCurrencies = CurrencyUtil.getAllSortedFiatCurrencies(); final Stream fiatStream = allSortedFiatCurrencies.stream() .filter(e -> !e.getCurrency().getCurrencyCode().equals("BSQ")) - .filter(e -> !e.getCurrency().getCurrencyCode().equals("BTC")) + .filter(e -> !e.getCurrency().getCurrencyCode().equals("BTC")) // TODO (woodser): update to XMR .map(e -> new MarketCurrency("btc_" + e.getCode().toLowerCase(), e.getName(), e.getCode())) .distinct(); diff --git a/desktop/src/test/java/bisq/desktop/main/dao/monitor/daostate/DaoStateBlockListItemTest.java b/desktop/src/test/java/bisq/desktop/main/dao/monitor/daostate/DaoStateBlockListItemTest.java index 182be1ba09..fd9b2f7c83 100644 --- a/desktop/src/test/java/bisq/desktop/main/dao/monitor/daostate/DaoStateBlockListItemTest.java +++ b/desktop/src/test/java/bisq/desktop/main/dao/monitor/daostate/DaoStateBlockListItemTest.java @@ -35,8 +35,8 @@ public class DaoStateBlockListItemTest { @Before public void setup() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java b/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java index 477ad29df9..5d2d4c58a2 100644 --- a/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java +++ b/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java @@ -70,7 +70,7 @@ public class TradesChartsViewModelTest { false, 0, 0, - "BTC", + "XMR", "EUR", null, null, diff --git a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java b/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java index 4129049bba..542498026f 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java +++ b/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java @@ -43,8 +43,8 @@ public class CreateOfferDataModelTest { @Before public void setUp() { - final CryptoCurrency btc = new CryptoCurrency("BTC", "bitcoin"); - GlobalSettings.setDefaultTradeCurrency(btc); + final CryptoCurrency xmr = new CryptoCurrency("XMR", "monero"); + GlobalSettings.setDefaultTradeCurrency(xmr); Res.setup(); XmrAddressEntry addressEntry = mock(XmrAddressEntry.class); diff --git a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java b/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java index 14b9c924b6..15e373db12 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java +++ b/desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java @@ -78,7 +78,7 @@ public class CreateOfferViewModelTest { @Before public void setUp() { - final CryptoCurrency btc = new CryptoCurrency("BTC", "bitcoin"); + final CryptoCurrency btc = new CryptoCurrency("XMR", "monero"); GlobalSettings.setDefaultTradeCurrency(btc); Res.setup(); @@ -135,7 +135,7 @@ public class CreateOfferViewModelTest { coinFormatter, tradeStats, null); - dataModel.initWithData(OfferPayload.Direction.BUY, new CryptoCurrency("BTC", "bitcoin")); + dataModel.initWithData(OfferPayload.Direction.BUY, new CryptoCurrency("XMR", "monero")); dataModel.activate(); model = new CreateOfferViewModel(dataModel, diff --git a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java b/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java index 55b243aa82..40ec2f44c5 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java +++ b/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java @@ -51,7 +51,7 @@ public class OfferBookListItemMaker { with(OfferMaker.direction, lookup.valueOf(direction, OfferPayload.Direction.BUY)), with(OfferMaker.useMarketBasedPrice, lookup.valueOf(useMarketBasedPrice, false)), with(OfferMaker.marketPriceMargin, lookup.valueOf(marketPriceMargin, 0.0)), - with(OfferMaker.baseCurrencyCode, lookup.valueOf(baseCurrencyCode, "BTC")), + with(OfferMaker.baseCurrencyCode, lookup.valueOf(baseCurrencyCode, "XMR")), with(OfferMaker.counterCurrencyCode, lookup.valueOf(counterCurrencyCode, "USD")), with(OfferMaker.id, lookup.valueOf(id, "1234")) ))); diff --git a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java b/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java index 9c63bebe90..18ed454534 100644 --- a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java +++ b/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java @@ -594,7 +594,7 @@ public class OfferBookViewModelTest { false, 0, 0, - "BTC", + "XMR", tradeCurrencyCode, null, null, diff --git a/desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java b/desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java index a4cf7c7367..5d91655bb2 100644 --- a/desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java +++ b/desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java @@ -61,8 +61,8 @@ public class EditOfferDataModelTest { @Before public void setUp() { - final CryptoCurrency btc = new CryptoCurrency("BTC", "bitcoin"); - GlobalSettings.setDefaultTradeCurrency(btc); + final CryptoCurrency xmr = new CryptoCurrency("XMR", "monero"); + GlobalSettings.setDefaultTradeCurrency(xmr); Res.setup(); FeeService feeService = mock(FeeService.class); diff --git a/desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java b/desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java index f85acc19bc..ac96eca481 100644 --- a/desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java +++ b/desktop/src/test/java/bisq/desktop/maker/CurrencyListItemMakers.java @@ -25,7 +25,7 @@ import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; -import static bisq.desktop.maker.TradeCurrencyMakers.bitcoin; +import static bisq.desktop.maker.TradeCurrencyMakers.monero; import static bisq.desktop.maker.TradeCurrencyMakers.euro; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.with; @@ -36,7 +36,7 @@ public class CurrencyListItemMakers { public static final Property numberOfTrades = new Property<>(); public static final Instantiator CurrencyListItem = lookup -> - new CurrencyListItem(lookup.valueOf(tradeCurrency, bitcoin), lookup.valueOf(numberOfTrades, 0)); + new CurrencyListItem(lookup.valueOf(tradeCurrency, monero), lookup.valueOf(numberOfTrades, 0)); public static final Maker bitcoinItem = a(CurrencyListItem); public static final Maker euroItem = a(CurrencyListItem, with(tradeCurrency, euro)); diff --git a/desktop/src/test/java/bisq/desktop/maker/OfferMaker.java b/desktop/src/test/java/bisq/desktop/maker/OfferMaker.java index e84f560f0b..c05e3138a8 100644 --- a/desktop/src/test/java/bisq/desktop/maker/OfferMaker.java +++ b/desktop/src/test/java/bisq/desktop/maker/OfferMaker.java @@ -50,7 +50,7 @@ public class OfferMaker { lookup.valueOf(useMarketBasedPrice, false), lookup.valueOf(amount, 100000L), lookup.valueOf(minAmount, 100000L), - lookup.valueOf(baseCurrencyCode, "BTC"), + lookup.valueOf(baseCurrencyCode, "XMR"), lookup.valueOf(counterCurrencyCode, "USD"), null, null, diff --git a/desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java b/desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java index cdd4d3cf4f..100ac8c68d 100644 --- a/desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java +++ b/desktop/src/test/java/bisq/desktop/maker/TradeCurrencyMakers.java @@ -34,12 +34,12 @@ public class TradeCurrencyMakers { public static final Property currencyName = new Property<>(); public static final Instantiator CryptoCurrency = lookup -> - new CryptoCurrency(lookup.valueOf(currencyCode, "BTC"), lookup.valueOf(currencyName, "Bitcoin")); + new CryptoCurrency(lookup.valueOf(currencyCode, "XMR"), lookup.valueOf(currencyName, "Monero")); public static final Instantiator FiatCurrency = lookup -> new FiatCurrency(lookup.valueOf(currencyCode, "EUR")); - public static final CryptoCurrency bitcoin = make(a(CryptoCurrency)); + public static final CryptoCurrency monero = make(a(CryptoCurrency)); public static final FiatCurrency euro = make(a(FiatCurrency)); public static final FiatCurrency usd = make(a(FiatCurrency).but(with(currencyCode, "USD"))); } diff --git a/desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java b/desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java index 632b49b82a..41308dd47c 100644 --- a/desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java +++ b/desktop/src/test/java/bisq/desktop/util/DisplayUtilsTest.java @@ -32,8 +32,8 @@ public class DisplayUtilsTest { @Before public void setUp() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test @@ -57,9 +57,9 @@ public class DisplayUtilsTest { @Test public void testFormatSameVolume() { Offer offer = mock(Offer.class); - Volume btc = Volume.parse("0.10", "BTC"); - when(offer.getMinVolume()).thenReturn(btc); - when(offer.getVolume()).thenReturn(btc); + Volume xmr = Volume.parse("0.10", "XMR"); + when(offer.getMinVolume()).thenReturn(xmr); + when(offer.getVolume()).thenReturn(xmr); assertEquals("0.10000000", DisplayUtils.formatVolume(offer.getVolume())); } @@ -67,11 +67,11 @@ public class DisplayUtilsTest { @Test public void testFormatDifferentVolume() { Offer offer = mock(Offer.class); - Volume btcMin = Volume.parse("0.10", "BTC"); - Volume btcMax = Volume.parse("0.25", "BTC"); + Volume xmrMin = Volume.parse("0.10", "XMR"); + Volume xmrMax = Volume.parse("0.25", "XMR"); when(offer.isRange()).thenReturn(true); - when(offer.getMinVolume()).thenReturn(btcMin); - when(offer.getVolume()).thenReturn(btcMax); + when(offer.getMinVolume()).thenReturn(xmrMin); + when(offer.getVolume()).thenReturn(xmrMax); assertEquals("0.10000000 - 0.25000000", DisplayUtils.formatVolume(offer, false, 0)); } diff --git a/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java b/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java index 1cab68540c..98e08b6338 100644 --- a/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java +++ b/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java @@ -39,7 +39,7 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import static bisq.desktop.maker.TradeCurrencyMakers.bitcoin; +import static bisq.desktop.maker.TradeCurrencyMakers.monero; import static bisq.desktop.maker.TradeCurrencyMakers.euro; import static com.natpryce.makeiteasy.MakeItEasy.a; import static com.natpryce.makeiteasy.MakeItEasy.make; @@ -57,14 +57,14 @@ public class GUIUtilTest { public void setup() { Locale.setDefault(new Locale("en", "US")); GlobalSettings.setLocale(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test public void testTradeCurrencyConverter() { Map offerCounts = new HashMap<>() {{ - put("BTC", 11); + put("XMR", 11); put("EUR", 10); }}; StringConverter tradeCurrencyConverter = GUIUtil.getTradeCurrencyConverter( @@ -73,7 +73,7 @@ public class GUIUtilTest { offerCounts ); - assertEquals("✦ Bitcoin (BTC) - 11 offers", tradeCurrencyConverter.toString(bitcoin)); + assertEquals("✦ Monero (XMR) - 11 offers", tradeCurrencyConverter.toString(monero)); assertEquals("★ Euro (EUR) - 10 offers", tradeCurrencyConverter.toString(euro)); } diff --git a/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java b/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java index 1d91e0ba37..0f2d06caa8 100644 --- a/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java +++ b/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java @@ -44,8 +44,8 @@ public class ImmutableCoinFormatterTest { @Before public void setUp() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java b/desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java index 4584d98cd0..1de80967cb 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java +++ b/desktop/src/test/java/bisq/desktop/util/validation/AccountNrValidatorTest.java @@ -14,8 +14,8 @@ public class AccountNrValidatorTest { @Before public void setup() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java b/desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java index 4b6eca1834..c1809814e7 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java +++ b/desktop/src/test/java/bisq/desktop/util/validation/BranchIdValidatorTest.java @@ -15,8 +15,8 @@ public class BranchIdValidatorTest { @Before public void setup() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test diff --git a/desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java b/desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java index ab057c0b33..2873b85ce6 100644 --- a/desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java +++ b/desktop/src/test/java/bisq/desktop/util/validation/NationalAccountIdValidatorTest.java @@ -15,8 +15,8 @@ public class NationalAccountIdValidatorTest { @Before public void setup() { Locale.setDefault(new Locale("en", "US")); - Res.setBaseCurrencyCode("BTC"); - Res.setBaseCurrencyName("Bitcoin"); + Res.setBaseCurrencyCode("XMR"); + Res.setBaseCurrencyName("Monero"); } @Test