From c0a7a2b64c2d3aeec789243773c2110cc993cd25 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 16 Apr 2018 17:49:05 -0230 Subject: [PATCH 1/3] Added support for FlashCoin in coinmarketcap --- .../sources/coinmarketcap/CoinmarketcapRateSource.java | 9 ++++++++- .../dash/sources/coinmarketcap/ICoinmarketcapAPI.java | 9 +++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java index 1573f17..e6aed7e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/CoinmarketcapRateSource.java @@ -43,6 +43,8 @@ public class CoinmarketcapRateSource implements IRateSource { result.add(ICurrencies.DASH); result.add(ICurrencies.XMR); result.add(ICurrencies.POT); + result.add(ICurrencies.FLASH); + return result; } @@ -66,7 +68,12 @@ public class CoinmarketcapRateSource implements IRateSource { if (!getFiatCurrencies().contains(fiatCurrency)) { return null; } - CMCTicker[] tickers = api.getTickers(fiatCurrency); + CMCTicker[] tickers; + if(ICurrencies.FLASH.equalsIgnoreCase(cryptoCurrency)){ + tickers = api.getTickers(cryptoCurrency,fiatCurrency); + }else + tickers = api.getTickers(fiatCurrency); + for (int i = 0; i < tickers.length; i++) { CMCTicker ticker = tickers[i]; if (cryptoCurrency.equalsIgnoreCase(ticker.getSymbol())) { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java index 798e2b6..786b1ba 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java @@ -17,10 +17,7 @@ ************************************************************************************/ package com.generalbytes.batm.server.extensions.extra.dash.sources.coinmarketcap; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @Path("/v1/ticker") @@ -29,4 +26,8 @@ public interface ICoinmarketcapAPI { @GET @Path("/") CMCTicker[] getTickers(@QueryParam("convert") String fiatCurrency); + + @GET + @Path("/{cryptoToGet}/?convert={convert}") + CMCTicker[] getTickers(@PathParam("cryptoToGet") String marketID,@QueryParam("convert") String fiatCurrency); } From b05dba5477ca2bbbede91373b8d255b732c82069 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 16 Apr 2018 17:54:43 -0230 Subject: [PATCH 2/3] modified crypto to get tag name --- .../extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java index 786b1ba..230136f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/dash/sources/coinmarketcap/ICoinmarketcapAPI.java @@ -29,5 +29,5 @@ public interface ICoinmarketcapAPI { @GET @Path("/{cryptoToGet}/?convert={convert}") - CMCTicker[] getTickers(@PathParam("cryptoToGet") String marketID,@QueryParam("convert") String fiatCurrency); + CMCTicker[] getTickers(@PathParam("cryptoToGet") String cryptoToGet,@QueryParam("convert") String fiatCurrency); } From a474898014b4a7771b5736b11657885cff9959ab Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 16 Apr 2018 18:59:56 -0230 Subject: [PATCH 3/3] Bug fix in the tester function to test other crypto than the first in the list for tester functions --- .../com/generalbytes/batm/server/extensions/test/Tester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java b/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java index de3f958..c705d50 100644 --- a/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java +++ b/server_extensions_test/src/main/java/com/generalbytes/batm/server/extensions/test/Tester.java @@ -404,7 +404,7 @@ public class Tester { System.out.println(" " + fiatCurrency); } System.out.println("Crypto Currencies:"); - String selectedCryptoCurrency = null; + String selectedCryptoCurrency = params; for (String cryptoCurrency : cryptoCurrencies) { if (selectedCryptoCurrency == null) { selectedCryptoCurrency = cryptoCurrency;