From 31ac4598ba966b60be897ef22884442fa63eeb6f Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Tue, 25 Feb 2020 07:16:37 +0100
Subject: [PATCH] Fix last occurances of pair splitting

---
 freqtrade/exchange/exchange.py       | 4 ++--
 freqtrade/pairlist/VolumePairList.py | 4 ++--
 freqtrade/rpc/rpc.py                 | 4 ++--
 tests/rpc/test_rpc.py                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py
index 0e0d2dabe..6964986b0 100644
--- a/freqtrade/exchange/exchange.py
+++ b/freqtrade/exchange/exchange.py
@@ -232,13 +232,13 @@ class Exchange:
         """
         Return a pair's quote currency
         """
-        return self.markets[pair].get('quote')
+        return self.markets.get(pair, {}).get('quote')
 
     def get_pair_base_currency(self, pair: str) -> str:
         """
         Return a pair's quote currency
         """
-        return self.markets[pair].get('base')
+        return self.markets.get(pair, {}).get('base')
 
     def klines(self, pair_interval: Tuple[str, str], copy: bool = True) -> DataFrame:
         if pair_interval in self._klines:
diff --git a/freqtrade/pairlist/VolumePairList.py b/freqtrade/pairlist/VolumePairList.py
index e50dafb63..e1cdb4a43 100644
--- a/freqtrade/pairlist/VolumePairList.py
+++ b/freqtrade/pairlist/VolumePairList.py
@@ -91,9 +91,9 @@ class VolumePairList(IPairList):
 
         if self._pairlist_pos == 0:
             # If VolumePairList is the first in the list, use fresh pairlist
-            # check length so that we make sure that '/' is actually in the string
+            # check base currency equals to stake currency.
             filtered_tickers = [v for k, v in tickers.items()
-                                if (len(k.split('/')) == 2 and k.split('/')[1] == base_currency
+                                if (self._exchange.get_pair_quote_currency(k) == base_currency
                                     and v[key] is not None)]
         else:
             # If other pairlist is in front, use the incomming pairlist.
diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index 3411318bb..d680d36b1 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -462,7 +462,7 @@ class RPC:
 
         # Check pair is in stake currency
         stake_currency = self._freqtrade.config.get('stake_currency')
-        if not pair.endswith(stake_currency):
+        if not self._freqtrade.exchange.get_pair_quote_currency(pair) == stake_currency:
             raise RPCException(
                 f'Wrong pair selected. Please pairs with stake {stake_currency} pairs only')
         # check if valid pair
@@ -517,7 +517,7 @@ class RPC:
         if add:
             stake_currency = self._freqtrade.config.get('stake_currency')
             for pair in add:
-                if (pair.endswith(stake_currency)
+                if (self._freqtrade.exchange.get_pair_quote_currency(pair) == stake_currency
                         and pair not in self._freqtrade.pairlists.blacklist):
                     self._freqtrade.pairlists.blacklist.append(pair)
 
diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py
index a35bfa0d6..3c99e6b92 100644
--- a/tests/rpc/test_rpc.py
+++ b/tests/rpc/test_rpc.py
@@ -687,7 +687,7 @@ def test_rpcforcebuy(mocker, default_conf, ticker, fee, limit_buy_order) -> None
 
     # Test buy pair not with stakes
     with pytest.raises(RPCException, match=r'Wrong pair selected. Please pairs with stake.*'):
-        rpc._rpc_forcebuy('XRP/ETH', 0.0001)
+        rpc._rpc_forcebuy('LTC/ETH', 0.0001)
     pair = 'XRP/BTC'
 
     # Test not buying