Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-24 23:46:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

add gold and silver, refactor money types to traditional and crypto

Browse source
This commit is contained in:
woodser 2023-05-15 17:10:01 -04:00
parent 65bc78d3d7
commit 29706339ef
210 changed files with 2629 additions and 2373 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/test/java/haveno/core/payment/validation/AltCoinAddressValidatorTest.java → core/src/test/java/haveno/core/payment/validation/CryptoAddressValidatorTest.java
View file

@ -27,11 +27,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class AltCoinAddressValidatorTest {
public class CryptoAddressValidatorTest {
@Test
public void test() {
AltCoinAddressValidator validator = new AltCoinAddressValidator(new AssetRegistry());
CryptoAddressValidator validator = new CryptoAddressValidator(new AssetRegistry());
BaseCurrencyNetwork baseCurrencyNetwork = Config.baseCurrencyNetwork();
String currencyCode = baseCurrencyNetwork.getCurrencyCode();

40
core/src/test/java/haveno/core/user/PreferencesTest.java
View file

@ -22,7 +22,7 @@ import haveno.common.persistence.PersistenceManager;
import haveno.core.locale.CountryUtil;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.FiatCurrency;
import haveno.core.locale.TraditionalCurrency;
import haveno.core.locale.GlobalSettings;
import haveno.core.locale.Res;
import haveno.core.xmr.nodes.LocalBitcoinNode;
@ -63,36 +63,36 @@ public class PreferencesTest {
@Test
public void testAddFiatCurrency() {
final FiatCurrency usd = new FiatCurrency("USD");
final FiatCurrency usd2 = new FiatCurrency("USD");
final ObservableList<FiatCurrency> fiatCurrencies = preferences.getFiatCurrenciesAsObservable();
final TraditionalCurrency usd = new TraditionalCurrency("USD");
final TraditionalCurrency usd2 = new TraditionalCurrency("USD");
final ObservableList<TraditionalCurrency> traditionalCurrencies = preferences.getTraditionalCurrenciesAsObservable();
preferences.addFiatCurrency(usd);
preferences.addTraditionalCurrency(usd);
assertEquals(1, fiatCurrencies.size());
assertEquals(1, traditionalCurrencies.size());
preferences.addFiatCurrency(usd2);
preferences.addTraditionalCurrency(usd2);
assertEquals(1, fiatCurrencies.size());
assertEquals(1, traditionalCurrencies.size());
}
@Test
public void testGetUniqueListOfFiatCurrencies() {
PreferencesPayload payload = mock(PreferencesPayload.class);
List<FiatCurrency> fiatCurrencies = CurrencyUtil.getMainFiatCurrencies();
final FiatCurrency usd = new FiatCurrency("USD");
fiatCurrencies.add(usd);
List<TraditionalCurrency> traditionalCurrencies = CurrencyUtil.getMainTraditionalCurrencies();
final TraditionalCurrency usd = new TraditionalCurrency("USD");
traditionalCurrencies.add(usd);
when(persistenceManager.getPersisted(anyString())).thenReturn(payload);
when(payload.getUserLanguage()).thenReturn("en");
when(payload.getUserCountry()).thenReturn(CountryUtil.getDefaultCountry());
when(payload.getPreferredTradeCurrency()).thenReturn(usd);
when(payload.getFiatCurrencies()).thenReturn(fiatCurrencies);
when(payload.getTraditionalCurrencies()).thenReturn(traditionalCurrencies);
preferences.readPersisted(() -> {
assertEquals(7, preferences.getFiatCurrenciesAsObservable().size());
assertTrue(preferences.getFiatCurrenciesAsObservable().contains(usd));
assertEquals(7, preferences.getTraditionalCurrenciesAsObservable().size());
assertTrue(preferences.getTraditionalCurrenciesAsObservable().contains(usd));
});
}
@ -107,7 +107,7 @@ public class PreferencesTest {
when(persistenceManager.getPersisted(anyString())).thenReturn(payload);
when(payload.getUserLanguage()).thenReturn("en");
when(payload.getUserCountry()).thenReturn(CountryUtil.getDefaultCountry());
when(payload.getPreferredTradeCurrency()).thenReturn(new FiatCurrency("USD"));
when(payload.getPreferredTradeCurrency()).thenReturn(new TraditionalCurrency("USD"));
when(payload.getCryptoCurrencies()).thenReturn(cryptoCurrencies);
preferences.readPersisted(() -> {
@ -119,9 +119,9 @@ public class PreferencesTest {
public void testUpdateOfPersistedFiatCurrenciesAfterLocaleChanged() {
PreferencesPayload payload = mock(PreferencesPayload.class);
List<FiatCurrency> fiatCurrencies = new ArrayList<>();
final FiatCurrency usd = new FiatCurrency(Currency.getInstance("USD"), new Locale("de", "AT"));
fiatCurrencies.add(usd);
List<TraditionalCurrency> traditionalCurrencies = new ArrayList<>();
final TraditionalCurrency usd = new TraditionalCurrency(Currency.getInstance("USD"), new Locale("de", "AT"));
traditionalCurrencies.add(usd);
assertEquals("US-Dollar (USD)", usd.getNameAndCode());
@ -129,10 +129,10 @@ public class PreferencesTest {
when(payload.getUserLanguage()).thenReturn("en");
when(payload.getUserCountry()).thenReturn(CountryUtil.getDefaultCountry());
when(payload.getPreferredTradeCurrency()).thenReturn(usd);
when(payload.getFiatCurrencies()).thenReturn(fiatCurrencies);
when(payload.getTraditionalCurrencies()).thenReturn(traditionalCurrencies);
preferences.readPersisted(() -> {
assertEquals("US Dollar (USD)", preferences.getFiatCurrenciesAsObservable().get(0).getNameAndCode());
assertEquals("US Dollar (USD)", preferences.getTraditionalCurrenciesAsObservable().get(0).getNameAndCode());
});
}
}

5
core/src/test/java/haveno/core/util/FormattingUtilsTest.java
View file

@ -5,7 +5,8 @@ import com.natpryce.makeiteasy.Property;
import haveno.core.locale.GlobalSettings;
import haveno.core.locale.Res;
import haveno.core.monetary.Price;
import org.bitcoinj.utils.Fiat;
import haveno.core.monetary.TraditionalMoney;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -22,7 +23,7 @@ public class FormattingUtilsTest {
private static final Property<Price, String> currencyCode = new Property<>();
private static final Property<Price, String> priceString = new Property<>();
private static final Maker<Price> usdPrice = a(lookup ->
new Price(Fiat.parseFiat(lookup.valueOf(currencyCode, "USD"), lookup.valueOf(priceString, "100"))));
new Price(TraditionalMoney.parseTraditionalMoney(lookup.valueOf(currencyCode, "USD"), lookup.valueOf(priceString, "100"))));
@BeforeEach
public void setUp() {