From f838ba2a9bf592cb3a1369f8ed6365517d539add Mon Sep 17 00:00:00 2001 From: Matthias Voppichler Date: Sun, 22 Apr 2018 10:04:30 +0200 Subject: [PATCH] remove fee column from bot --- freqtrade/freqtradebot.py | 1 - freqtrade/persistence.py | 1 - freqtrade/tests/test_freqtradebot.py | 12 ++++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index b737f0e83..6acda804d 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -328,7 +328,6 @@ class FreqtradeBot(object): pair=pair, stake_amount=stake_amount, amount=amount, - fee=fee, fee_open=fee, fee_close=fee, open_rate=buy_limit, diff --git a/freqtrade/persistence.py b/freqtrade/persistence.py index 6fea67c88..ed81ad2ec 100644 --- a/freqtrade/persistence.py +++ b/freqtrade/persistence.py @@ -85,7 +85,6 @@ class Trade(_DECL_BASE): exchange = Column(String, nullable=False) pair = Column(String, nullable=False) is_open = Column(Boolean, nullable=False, default=True) - fee = Column(Float, nullable=False, default=0.0) fee_open = Column(Float, nullable=False, default=0.0) fee_close = Column(Float, nullable=False, default=0.0) open_rate = Column(Float) diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py index 800a536bc..1c22d97f9 100644 --- a/freqtrade/tests/test_freqtradebot.py +++ b/freqtrade/tests/test_freqtradebot.py @@ -812,7 +812,8 @@ def test_check_handle_timedout_buy(default_conf, ticker, limit_buy_order_old, fe exchange='bittrex', open_order_id='123456789', amount=90.99181073, - fee=0.0, + fee_open=0.0, + fee_close=0.0, stake_amount=1, open_date=arrow.utcnow().shift(minutes=-601).datetime, is_open=True @@ -851,7 +852,8 @@ def test_check_handle_timedout_sell(default_conf, ticker, limit_sell_order_old, exchange='bittrex', open_order_id='123456789', amount=90.99181073, - fee=0.0, + fee_open=0.0, + fee_close=0.0, stake_amount=1, open_date=arrow.utcnow().shift(hours=-5).datetime, close_date=arrow.utcnow().shift(minutes=-601).datetime, @@ -890,7 +892,8 @@ def test_check_handle_timedout_partial(default_conf, ticker, limit_buy_order_old exchange='bittrex', open_order_id='123456789', amount=90.99181073, - fee=0.0, + fee_open=0.0, + fee_close=0.0, stake_amount=1, open_date=arrow.utcnow().shift(minutes=-601).datetime, is_open=True @@ -937,7 +940,8 @@ def test_check_handle_timedout_exception(default_conf, ticker, mocker, caplog) - exchange='bittrex', open_order_id='123456789', amount=90.99181073, - fee=0.0, + fee_open=0.0, + fee_close=0.0, stake_amount=1, open_date=arrow.utcnow().shift(minutes=-601).datetime, is_open=True