From 48beb279c01e2e1d86a842add42a4c8778c272af Mon Sep 17 00:00:00 2001 From: gcarq Date: Mon, 11 Sep 2017 13:59:11 +0200 Subject: [PATCH] rename btc_amount to stake_amount --- main.py | 4 ++-- persistence.py | 2 +- rpc/telegram.py | 2 +- test/test_main.py | 2 +- test/test_persistence.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 6de813653..493be3494 100755 --- a/main.py +++ b/main.py @@ -148,7 +148,7 @@ def create_trade(stake_amount: float, _exchange: exchange.Exchange) -> Optional[ """ logger.info('Creating new trade with stake_amount: %f ...', stake_amount) whitelist = _CONF[_exchange.name.lower()]['pair_whitelist'] - # Check if btc_amount is fulfilled + # Check if stake_amount is fulfilled if exchange.get_balance(_CONF['stake_currency']) < stake_amount: raise ValueError( 'stake amount is not fulfilled (currency={}'.format(_CONF['stake_currency']) @@ -188,7 +188,7 @@ def create_trade(stake_amount: float, _exchange: exchange.Exchange) -> Optional[ logger.info(message) telegram.send_msg(message) return Trade(pair=pair, - btc_amount=stake_amount, + stake_amount=stake_amount, open_rate=open_rate, open_date=datetime.utcnow(), amount=amount, diff --git a/persistence.py b/persistence.py index 8ba8079f9..dd917a750 100644 --- a/persistence.py +++ b/persistence.py @@ -49,7 +49,7 @@ class Trade(Base): open_rate = Column(Float, nullable=False) close_rate = Column(Float) close_profit = Column(Float) - btc_amount = Column(Float, nullable=False) + stake_amount = Column(Float, name='btc_amount', nullable=False) amount = Column(Float, nullable=False) open_date = Column(DateTime, nullable=False, default=datetime.utcnow) close_date = Column(DateTime) diff --git a/rpc/telegram.py b/rpc/telegram.py index 80d557406..cf764a65c 100644 --- a/rpc/telegram.py +++ b/rpc/telegram.py @@ -157,7 +157,7 @@ def _profit(bot: Bot, update: Update) -> None: current_rate = exchange.get_ticker(trade.pair)['bid'] profit = 100 * ((current_rate - trade.open_rate) / trade.open_rate) - profit_amounts.append((profit / 100) * trade.btc_amount) + profit_amounts.append((profit / 100) * trade.stake_amount) profits.append(profit) best_pair = Trade.session.query(Trade.pair, func.sum(Trade.close_profit).label('profit_sum')) \ diff --git a/test/test_main.py b/test/test_main.py index 12b9db5ec..bd9bb0c47 100644 --- a/test/test_main.py +++ b/test/test_main.py @@ -61,7 +61,7 @@ class TestMain(unittest.TestCase): self.assertEqual(trade.pair, 'BTC_ETH') self.assertEqual(trade.exchange, exchange.Exchange.BITTREX) self.assertEqual(trade.amount, 206.43811673387373) - self.assertEqual(trade.btc_amount, 15.0) + self.assertEqual(trade.stake_amount, 15.0) self.assertEqual(trade.is_open, True) self.assertIsNotNone(trade.open_date) buy_signal.assert_called_once_with('BTC_ETH') diff --git a/test/test_persistence.py b/test/test_persistence.py index 65af0ad8a..8875b0e78 100644 --- a/test/test_persistence.py +++ b/test/test_persistence.py @@ -10,7 +10,7 @@ class TestTrade(unittest.TestCase): with patch('main.exchange.sell', side_effect='mocked_order_id') as api_mock: trade = Trade( pair='BTC_ETH', - btc_amount=1.00, + stake_amount=1.00, open_rate=0.50, amount=10.00, exchange=Exchange.BITTREX,