ENH: Raise error when trying to ingest data of exchange that is not s…

…upported - issue scrtlabs#341
LuCeHe · Jun 5, 2018 · ae1effa · ae1effa
1 parent 70a6775
commit ae1effa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/catalyst/__main__.py b/catalyst/__main__.py
@@ -14,8 +14,7 @@
 from catalyst.exchange.utils.exchange_utils import delete_algo_folder
 from catalyst.utils.cli import Date, Timestamp
 from catalyst.utils.run_algo import _run, load_extensions
-
-from catalyst.constants import SUPPORTED_EXCHANGES
+from catalyst.exchange.utils.bundle_utils import EXCHANGE_NAMES
 
 try:
     __IPYTHON__
@@ -587,9 +586,12 @@ def ingest_exchange(ctx, exchange_name, data_frequency, start, end,
 
     if exchange_name is None:
         ctx.fail("must specify an exchange name '-x'")
-    if exchange_name not in SUPPORTED_EXCHANGES:
-        ctx.fail("ingest-exchange does not support {}, please choose exchange from: {}".format(exchange_name,
-                                                                                               SUPPORTED_EXCHANGES))
+    if exchange_name not in EXCHANGE_NAMES:
+        ctx.fail(
+            "ingest-exchange does not support {}, "
+            "please choose exchange from: {}".format(
+                exchange_name,
+                EXCHANGE_NAMES))
 
     exchange_bundle = ExchangeBundle(exchange_name)
 

diff --git a/catalyst/constants.py b/catalyst/constants.py
@@ -44,5 +44,3 @@
 
 SUPPORTED_WALLETS = ['metamask', 'ledger', 'trezor', 'bitbox', 'keystore',
                      'key']
-
-SUPPORTED_EXCHANGES = ['bitfinex', 'poloniex', 'bittrex']
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,5 +44,3 @@

		SUPPORTED_WALLETS = ['metamask', 'ledger', 'trezor', 'bitbox', 'keystore',
		'key']

		SUPPORTED_EXCHANGES = ['bitfinex', 'poloniex', 'bittrex']