Merge pull request #2212 from makarid/develop

[bitbay] I have corrected a bug in transactions method of BitbayTradeService

Author: timmolter

xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeService.java

@@ -19,11 +19,7 @@
 import org.knowm.xchange.dto.trade.UserTrades;
 import org.knowm.xchange.exceptions.NotAvailableFromExchangeException;
 import org.knowm.xchange.service.trade.TradeService;
-import org.knowm.xchange.service.trade.params.CancelOrderByIdParams;
-import org.knowm.xchange.service.trade.params.CancelOrderParams;
-import org.knowm.xchange.service.trade.params.TradeHistoryParamCurrencyPair;
-import org.knowm.xchange.service.trade.params.TradeHistoryParams;
-import org.knowm.xchange.service.trade.params.TradeHistoryParamsZero;
+import org.knowm.xchange.service.trade.params.*;
 import org.knowm.xchange.service.trade.params.orders.OpenOrdersParams;
 
 /**
@@ -93,7 +89,7 @@ public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException
 
   @Override
   public TradeHistoryParams createTradeHistoryParams() {
-    return new TradeHistoryParamsZero();
+    return new TradeHistoryParamsAll();
   }
 
   @Override

xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayTradeServiceRaw.java

@@ -27,7 +27,7 @@ public List<BitbayOrder> getBitbayOpenOrders() throws IOException, ExchangeExcep
   }
 
   public List<Map> getBitbayTransactions(CurrencyPair currencyPair) throws IOException, ExchangeException {
-    return bitbayAuthenticated.transactions(apiKey, sign, exchange.getNonceFactory(), currencyPair == null ? null : currencyPair.toString());
+    return bitbayAuthenticated.transactions(apiKey, sign, exchange.getNonceFactory(), currencyPair == null ? null : currencyPair.base.toString()+"-"+currencyPair.counter.toString());
   }
 
   public BitbayTradeResponse placeBitbayOrder(LimitOrder order) throws IOException {