mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 14:42:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Put new code for altcoin in right places.

Browse source
This commit is contained in:
Manfred Karrer 2018-03-10 10:06:42 -05:00
parent 8754f41c1e
commit cd04e1b0f9
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
4 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/io/bisq/common/locale/CurrencyUtil.java
View file

@ -135,7 +135,6 @@ public class CurrencyUtil {
result.add(new CryptoCurrency("PASC", "Pascal Coin", true));
result.add(new CryptoCurrency("PEPECASH", "Pepe Cash"));
result.add(new CryptoCurrency("PIVX", "PIVX"));
result.add(new CryptoCurrency("ALC", "Angelcoin"));
result.add(new CryptoCurrency("POST", "PostCoin"));
result.add(new CryptoCurrency("PNC", "Pranacoin"));
result.add(new CryptoCurrency("RDD", "ReddCoin"));
@ -171,6 +170,9 @@ public class CurrencyUtil {
result.add(new CryptoCurrency("ACH", "AchieveCoin"));
result.add(new CryptoCurrency("VDN", "vDinar"));
// Added 0.7.0
result.add(new CryptoCurrency("ALC", "Angelcoin"));
result.sort(TradeCurrency::compareTo);
// Util for printing all altcoins for adding to FAQ page

3
core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
View file

@ -214,7 +214,6 @@ public class TradeStatisticsManager {
coinsWithValidator.add("DASH");
coinsWithValidator.add("ETH");
coinsWithValidator.add("PIVX");
coinsWithValidator.add("ALC");
coinsWithValidator.add("IOP");
coinsWithValidator.add("888");
coinsWithValidator.add("ZEC");
@ -264,6 +263,8 @@ public class TradeStatisticsManager {
newlyAdded.add("SOS");
newlyAdded.add("ACH");
newlyAdded.add("VDN");
// v0.7.0
coinsWithValidator.add("ALC");
coinsWithValidator.addAll(newlyAdded);

24
gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
View file

@ -180,18 +180,6 @@ public final class AltCoinAddressValidator extends InputValidator {
} else {
return regexTestFailed;
}
case "ALC":
if (input.matches("^[A][a-km-zA-HJ-NP-Z1-9]{25,34}$")) {
//noinspection ConstantConditions
try {
Address.fromBase58(AlcParams.get(), input);
return new ValidationResult(true);
} catch (AddressFormatException e) {
return new ValidationResult(false, getErrorMessage(e));
}
} else {
return regexTestFailed;
}
case "IOP":
if (input.matches("^[p][a-km-zA-HJ-NP-Z1-9]{25,34}$")) {
//noinspection ConstantConditions
@ -477,6 +465,18 @@ public final class AltCoinAddressValidator extends InputValidator {
else
return new ValidationResult(true);
case "ALC":
if (input.matches("^[A][a-km-zA-HJ-NP-Z1-9]{25,34}$")) {
//noinspection ConstantConditions
try {
Address.fromBase58(AlcParams.get(), input);
return new ValidationResult(true);
} catch (AddressFormatException e) {
return new ValidationResult(false, getErrorMessage(e));
}
} else {
return regexTestFailed;
}
// Add new coins at the end...
default:
log.debug("Validation for AltCoinAddress not implemented yet. currencyCode: " + currencyCode);

33
gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
View file

@ -144,22 +144,6 @@ public class AltCoinAddressValidatorTest {
assertFalse(validator.validate("").isValid);
}
@Test
public void testALC() {
AltCoinAddressValidator validator = new AltCoinAddressValidator();
validator.setCurrencyCode("ALC");
assertTrue(validator.validate("AQJTNtWcP7opxuR52Lf5vmoQTC8EHQ6GxV").isValid);
assertTrue(validator.validate("ALEK7jttmqtx2ZhXHg69Zr426qKBnzYA9E").isValid);
assertTrue(validator.validate("AP1egWUthPoYvZL57aBk4RPqUgjG1fJGn6").isValid);
assertTrue(validator.validate("AST3zfvPdZ35npxAVC8ABgVCxxDLwTmAHU").isValid);
assertFalse(validator.validate("1AQJTNtWcP7opxuR52Lf5vmoQTC8EHQ6GxV").isValid);
assertFalse(validator.validate("1ALEK7jttmqtx2ZhXHg69Zr426qKBnzYA9E").isValid);
assertFalse(validator.validate("1AP1egWUthPoYvZL57aBk4RPqUgjG1fJGn6").isValid);
assertFalse(validator.validate("").isValid);
}
@Test
public void testIOP() {
AltCoinAddressValidator validator = new AltCoinAddressValidator();
@ -754,4 +738,21 @@ public class AltCoinAddressValidatorTest {
assertFalse(validator.validate("DG1KpSsSXd3uitgwHaA1i6T1Bj1hWLONGER").isValid);
assertFalse(validator.validate("HG1KpSsSXd3uitgwHaA1i6T1Bj1hWEwAxB").isValid);
}
// Added 0.7.0
@Test
public void testALC() {
AltCoinAddressValidator validator = new AltCoinAddressValidator();
validator.setCurrencyCode("ALC");
assertTrue(validator.validate("AQJTNtWcP7opxuR52Lf5vmoQTC8EHQ6GxV").isValid);
assertTrue(validator.validate("ALEK7jttmqtx2ZhXHg69Zr426qKBnzYA9E").isValid);
assertTrue(validator.validate("AP1egWUthPoYvZL57aBk4RPqUgjG1fJGn6").isValid);
assertTrue(validator.validate("AST3zfvPdZ35npxAVC8ABgVCxxDLwTmAHU").isValid);
assertFalse(validator.validate("1AQJTNtWcP7opxuR52Lf5vmoQTC8EHQ6GxV").isValid);
assertFalse(validator.validate("1ALEK7jttmqtx2ZhXHg69Zr426qKBnzYA9E").isValid);
assertFalse(validator.validate("1AP1egWUthPoYvZL57aBk4RPqUgjG1fJGn6").isValid);
assertFalse(validator.validate("").isValid);
}
}