From ef608e64664dea4d89c1ac3319d28d1ffa5fea77 Mon Sep 17 00:00:00 2001 From: Vlado Dimitriev Date: Fri, 25 May 2018 11:51:16 +0200 Subject: [PATCH 1/5] Added support for macedonian denar --- .gitignore | 14 +++++- server_extensions_api/build.gradle | 3 ++ .../batm/server/extensions/Country.java | 2 +- .../batm/server/coinutil/Base58Test.java | 50 +++++++++++++++++++ 4 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java diff --git a/.gitignore b/.gitignore index 77921c6..7fdadd3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,16 @@ out/ *.iml target install-libs.sh -.mvn-repo \ No newline at end of file +.mvn-repo +*.project +*.classpath +/settings/ +/.settings/ +/.settings/* +.settings/ +.settings/* +/bin/ +/bin/* +bin/ +bin/* +bin \ No newline at end of file diff --git a/server_extensions_api/build.gradle b/server_extensions_api/build.gradle index 7540019..e23b9ec 100644 --- a/server_extensions_api/build.gradle +++ b/server_extensions_api/build.gradle @@ -23,6 +23,9 @@ dependencies { compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25') compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25') compile(group: 'com.sun.mail', name: 'javax.mail', version: '1.4.7') + compile(group: 'commons-codec', name: 'commons-codec', version: '1.3') + + testCompile (group: 'junit', name: 'junit', version: '4.10') } publishing { diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Country.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Country.java index 3b88a96..df849bf 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Country.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Country.java @@ -141,7 +141,7 @@ public enum Country { LT("LT", "LTU", "Lithuania"), LU("LU", "LUX", "Luxembourg"), MO("MO", "MAC", "Macao"), - MK("MK", "MKD", "Macedonia (the former Yugoslav Republic of)"), + MK("MK", "MKD", "Macedonia"), MG("MG", "MDG", "Madagascar"), MW("MW", "MWI", "Malawi"), MY("MY", "MYS", "Malaysia"), diff --git a/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java b/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java new file mode 100644 index 0000000..da7f165 --- /dev/null +++ b/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java @@ -0,0 +1,50 @@ +package com.generalbytes.batm.server.coinutil; + +import org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Base64; + +public class Base58Test { + + private static final Logger log = LoggerFactory.getLogger("com.generalbytes.batm.server.coinutil.Base58Test"); + + @Test + public void bitcoinAddressTest() { + String address = "35qL43qYwLdKtnR7yMfGNDvzv6WyZ8yT2n"; + try { + Base58.decodeToBigInteger(address); + Base58.decodeChecked(address); + System.out.println("Address = " + address); + Assert.assertNotNull(address); + } catch (AddressFormatException e) { + log.debug("isAddressValid - address = " + address); + Assert.assertTrue(false); + } + } + + @Test + public void bitcoinCashAddressTest() { + String address = "qze82zm3uuufcdftffy7auyxav8wyxntxqqcswq5s7"; + try { + Base58.decodeToBigInteger(address); + Base58.decodeChecked(address); + System.out.println("Address = " + address); + Assert.assertNotNull(address); + } catch (AddressFormatException e) { + log.info("isAddressValid - address = " + address); + Assert.assertTrue(false); + } + } + + @Test + public void encodeSimpleString() { + String originalInput = "test input"; + String encodedString = "qze82zm3uuufcdftffy7auyxav8wyxntxqqcswq5s7"; + byte[] decodedBytes = Base64.getDecoder().decode(encodedString); + String decodedString = new String(decodedBytes); + Assert.assertNotNull(decodedString); + } +} From 8e02cffc9d73100a713df6532dd98cb3bbb50494 Mon Sep 17 00:00:00 2001 From: Vlado Dimitriev Date: Fri, 25 May 2018 11:56:28 +0200 Subject: [PATCH 2/5] BATM-496 removed some println in unit test --- .../java/com/generalbytes/batm/server/coinutil/Base58Test.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java b/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java index da7f165..9dab353 100644 --- a/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java +++ b/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java @@ -17,7 +17,6 @@ public class Base58Test { try { Base58.decodeToBigInteger(address); Base58.decodeChecked(address); - System.out.println("Address = " + address); Assert.assertNotNull(address); } catch (AddressFormatException e) { log.debug("isAddressValid - address = " + address); @@ -31,7 +30,6 @@ public class Base58Test { try { Base58.decodeToBigInteger(address); Base58.decodeChecked(address); - System.out.println("Address = " + address); Assert.assertNotNull(address); } catch (AddressFormatException e) { log.info("isAddressValid - address = " + address); From c66b3018036f81b086b44f5943945fcd764fc970 Mon Sep 17 00:00:00 2001 From: Vlado Dimitriev Date: Fri, 25 May 2018 15:27:47 +0200 Subject: [PATCH 3/5] BATM-496 Added MKD in Currencies class --- .../com/generalbytes/batm/server/extensions/Currencies.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java index 97932dd..87ea732 100644 --- a/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java +++ b/server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/Currencies.java @@ -55,6 +55,7 @@ public class Currencies { public static final String GBP = "GBP"; public static final String HUF = "HUF"; public static final String JPY = "JPY"; + public static final String MKD = "MKD"; public static final String SGD = "SGD"; public static final String USD = "USD"; public static final String XAF = "XAF"; @@ -100,6 +101,7 @@ public class Currencies { fiat.add(GBP); fiat.add(HUF); fiat.add(JPY); + fiat.add(MKD); fiat.add(SGD); fiat.add(USD); fiat.add(XAF); From 0ae5cd343b71858caa58eb7780763098ee1ef286 Mon Sep 17 00:00:00 2001 From: Vlado Dimitriev Date: Fri, 25 May 2018 16:47:40 +0200 Subject: [PATCH 4/5] BATM-496 Removed test class --- .../batm/server/coinutil/Base58Test.java | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java diff --git a/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java b/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java deleted file mode 100644 index 9dab353..0000000 --- a/server_extensions_api/src/test/java/com/generalbytes/batm/server/coinutil/Base58Test.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.generalbytes.batm.server.coinutil; - -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Base64; - -public class Base58Test { - - private static final Logger log = LoggerFactory.getLogger("com.generalbytes.batm.server.coinutil.Base58Test"); - - @Test - public void bitcoinAddressTest() { - String address = "35qL43qYwLdKtnR7yMfGNDvzv6WyZ8yT2n"; - try { - Base58.decodeToBigInteger(address); - Base58.decodeChecked(address); - Assert.assertNotNull(address); - } catch (AddressFormatException e) { - log.debug("isAddressValid - address = " + address); - Assert.assertTrue(false); - } - } - - @Test - public void bitcoinCashAddressTest() { - String address = "qze82zm3uuufcdftffy7auyxav8wyxntxqqcswq5s7"; - try { - Base58.decodeToBigInteger(address); - Base58.decodeChecked(address); - Assert.assertNotNull(address); - } catch (AddressFormatException e) { - log.info("isAddressValid - address = " + address); - Assert.assertTrue(false); - } - } - - @Test - public void encodeSimpleString() { - String originalInput = "test input"; - String encodedString = "qze82zm3uuufcdftffy7auyxav8wyxntxqqcswq5s7"; - byte[] decodedBytes = Base64.getDecoder().decode(encodedString); - String decodedString = new String(decodedBytes); - Assert.assertNotNull(decodedString); - } -} From f880d348c8a281ff7252b7ca189dd965ab5ef0fa Mon Sep 17 00:00:00 2001 From: rpanak-generalbytes <31093482+rpanak-generalbytes@users.noreply.github.com> Date: Mon, 28 May 2018 14:22:08 +0200 Subject: [PATCH 5/5] Update build.gradle --- server_extensions_api/build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server_extensions_api/build.gradle b/server_extensions_api/build.gradle index 9474dbd..5549983 100644 --- a/server_extensions_api/build.gradle +++ b/server_extensions_api/build.gradle @@ -24,9 +24,6 @@ dependencies { compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25') compile(group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25') compile(group: 'com.sun.mail', name: 'javax.mail', version: '1.4.7') - compile(group: 'commons-codec', name: 'commons-codec', version: '1.3') - - testCompile (group: 'junit', name: 'junit', version: '4.10') } if (hasProperty('gbArtifactoryUser') && hasProperty('gbArtifactoryPassword') && hasProperty('gbArtifactoryUploadUrl')) { @@ -47,4 +44,4 @@ if (hasProperty('gbArtifactoryUser') && hasProperty('gbArtifactoryPassword') && } } } -} \ No newline at end of file +}