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

Improve naming of variables

Browse Source
This commit is contained in:
Matthias 2021-09-19 13:29:09 +02:00
parent ab88217186
commit ec03531771
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
freqtrade/rpc/api_server/api_schemas.py
View File

@ -54,7 +54,6 @@ class Balances(BaseModel):
starting_capital_fiat_pct: float starting_capital_fiat_pct: float
class Count(BaseModel): class Count(BaseModel):
current: int current: int
max: int max: int

15
freqtrade/rpc/rpc.py
View File

@ -459,7 +459,7 @@ class RPC:
self._freqtrade.wallets.update(require_update=False) self._freqtrade.wallets.update(require_update=False)
starting_capital = self._freqtrade.wallets.get_starting_balance() starting_capital = self._freqtrade.wallets.get_starting_balance()
starting_capital_fiat = self._fiat_converter.convert_amount( starting_cap_fiat = self._fiat_converter.convert_amount(
starting_capital, stake_currency, fiat_display_currency) if self._fiat_converter else 0 starting_capital, stake_currency, fiat_display_currency) if self._fiat_converter else 0
for coin, balance in self._freqtrade.wallets.get_all_balances().items(): for coin, balance in self._freqtrade.wallets.get_all_balances().items():
@ -500,11 +500,8 @@ class RPC:
total, stake_currency, fiat_display_currency) if self._fiat_converter else 0 total, stake_currency, fiat_display_currency) if self._fiat_converter else 0
starting_capital_ratio = 0.0 starting_capital_ratio = 0.0
starting_capital_fiat_ratio = 0.0 starting_capital_ratio = (total / starting_capital) - 1 if starting_capital else 0.0
if starting_capital: starting_cap_fiat_ratio = (value / starting_cap_fiat) - 1 if starting_cap_fiat else 0.0
starting_capital_ratio = (total / starting_capital) - 1
if starting_capital_fiat:
starting_capital_fiat_ratio = (value / starting_capital_fiat) - 1
return { return {
'currencies': output, 'currencies': output,
@ -515,9 +512,9 @@ class RPC:
'starting_capital': starting_capital, 'starting_capital': starting_capital,
'starting_capital_ratio': starting_capital_ratio, 'starting_capital_ratio': starting_capital_ratio,
'starting_capital_pct': round(starting_capital_ratio * 100, 2), 'starting_capital_pct': round(starting_capital_ratio * 100, 2),
'starting_capital_fiat': starting_capital_fiat, 'starting_capital_fiat': starting_cap_fiat,
'starting_capital_fiat_ratio': starting_capital_fiat_ratio, 'starting_capital_fiat_ratio': starting_cap_fiat_ratio,
'starting_capital_fiat_pct': round(starting_capital_fiat_ratio * 100, 2), 'starting_capital_fiat_pct': round(starting_cap_fiat_ratio * 100, 2),
'note': 'Simulated balances' if self._freqtrade.config['dry_run'] else '' 'note': 'Simulated balances' if self._freqtrade.config['dry_run'] else ''
} }

3
freqtrade/rpc/telegram.py
View File

@ -649,8 +649,7 @@ class Telegram(RPCHandler):
f" `({result['starting_capital_pct']}%)`\n" f" `({result['starting_capital_pct']}%)`\n"
f"\t`{result['symbol']}: " f"\t`{result['symbol']}: "
f"{round_coin_value(result['value'], result['symbol'], False)}`" f"{round_coin_value(result['value'], result['symbol'], False)}`"
f" `({result['starting_capital_fiat_pct']}%)`\n" f" `({result['starting_capital_fiat_pct']}%)`\n")
)
self._send_msg(output, reload_able=True, callback_path="update_balance", self._send_msg(output, reload_able=True, callback_path="update_balance",
query=update.callback_query) query=update.callback_query)
except RPCException as e: except RPCException as e: