From cd04e1b0f9fbcbc61982d04c861effeae6072a9b Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sat, 10 Mar 2018 10:06:42 -0500 Subject: [PATCH] Put new code for altcoin in right places. --- .../io/bisq/common/locale/CurrencyUtil.java | 4 ++- .../statistics/TradeStatisticsManager.java | 3 +- .../validation/AltCoinAddressValidator.java | 24 +++++++------- .../AltCoinAddressValidatorTest.java | 33 ++++++++++--------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java b/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java index ef48ba3ddc..fa5a35abe7 100644 --- a/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java +++ b/common/src/main/java/io/bisq/common/locale/CurrencyUtil.java @@ -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 diff --git a/core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java b/core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java index a1fb513a13..c26d0c37a6 100644 --- a/core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java +++ b/core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java @@ -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); diff --git a/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java index 23e65bb433..ff5f4b0861 100644 --- a/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java @@ -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); diff --git a/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java index b23c4150d8..8a35270ee3 100644 --- a/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java +++ b/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java @@ -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); + } }