adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #597 from xmatthias/obj_ccxt_fix_nullref

Browse Source 
use local config-object for check_exchange (fixes Nonetype Attribute error when starting the bot)
This commit is contained in:
Samuel Husso 2018-04-05 08:05:38 +03:00 committed by GitHub
commit f3847a3a9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/configuration.py
View File

@ -102,7 +102,7 @@ class Configuration(object):
self.logger.info('Dry run is disabled. (--dry_run_db ignored)') self.logger.info('Dry run is disabled. (--dry_run_db ignored)')
# Check if the exchange set by the user is supported # Check if the exchange set by the user is supported
self.check_exchange() self.check_exchange(config)
return config return config
@ -203,12 +203,12 @@ class Configuration(object):
return self.config return self.config
def check_exchange(self) -> bool: def check_exchange(self, config: Dict[str, Any]) -> bool:
""" """
Check if the exchange name in the config file is supported by Freqtrade Check if the exchange name in the config file is supported by Freqtrade
:return: True or raised an exception if the exchange if not supported :return: True or raised an exception if the exchange if not supported
""" """
exchange = self.config.get('exchange', {}).get('name').lower() exchange = config.get('exchange', {}).get('name').lower()
if exchange not in ccxt.exchanges: if exchange not in ccxt.exchanges:
exception_msg = 'Exchange "{}" not supported.\n' \ exception_msg = 'Exchange "{}" not supported.\n' \

8
freqtrade/tests/test_configuration.py
View File

@ -326,13 +326,11 @@ def test_check_exchange(default_conf) -> None:
# Test a valid exchange # Test a valid exchange
conf.get('exchange').update({'name': 'BITTREX'}) conf.get('exchange').update({'name': 'BITTREX'})
configuration.config = conf assert configuration.check_exchange(conf)
assert configuration.check_exchange()
# Test a valid exchange # Test a valid exchange
conf.get('exchange').update({'name': 'binance'}) conf.get('exchange').update({'name': 'binance'})
configuration.config = conf assert configuration.check_exchange(conf)
assert configuration.check_exchange()
# Test a invalid exchange # Test a invalid exchange
conf.get('exchange').update({'name': 'unknown_exchange'}) conf.get('exchange').update({'name': 'unknown_exchange'})
@ -342,4 +340,4 @@ def test_check_exchange(default_conf) -> None:
OperationalException, OperationalException,
match=r'.*Exchange "unknown_exchange" not supported.*' match=r'.*Exchange "unknown_exchange" not supported.*'
): ):
configuration.check_exchange() configuration.check_exchange(conf)