From 7435b5ec962e2166c3344b1bfb248acff62ee104 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Fri, 4 Mar 2022 06:58:21 +0100
Subject: [PATCH] Fix small merge errors

---
 tests/rpc/test_rpc.py     | 4 ----
 tests/test_persistence.py | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py
index 3796a634f..5fe3cae42 100644
--- a/tests/rpc/test_rpc.py
+++ b/tests/rpc/test_rpc.py
@@ -116,7 +116,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'is_short': False,
         'funding_fees': 0.0,
         'trading_mode': TradingMode.SPOT,
-        # 'filled_entery_orders': [{
         'orders': [{
             'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05,
             'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',
@@ -125,7 +124,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
             'is_open': False, 'pair': 'ETH/BTC', 'order_id': ANY,
             'remaining': ANY, 'status': ANY
         }],
-        # 'filled_exit_orders': [],
     }
 
     mocker.patch('freqtrade.exchange.Exchange.get_rate',
@@ -200,7 +198,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'is_short': False,
         'funding_fees': 0.0,
         'trading_mode': TradingMode.SPOT,
-        # 'filled_entry_orders': [{
         'orders': [{
             'amount': 91.07468123, 'average': 1.098e-05, 'safe_price': 1.098e-05,
             'cost': 0.0009999999999054, 'filled': 91.07468123, 'ft_order_side': 'buy',
@@ -208,7 +205,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
             'order_filled_timestamp': ANY, 'order_type': 'limit', 'price': 1.098e-05,
             'is_open': False, 'pair': 'ETH/BTC', 'order_id': ANY,
             'remaining': ANY, 'status': ANY}],
-        # 'filled_exit_orders': [],
     }
 
 
diff --git a/tests/test_persistence.py b/tests/test_persistence.py
index 6261dc99a..1b8567d6e 100644
--- a/tests/test_persistence.py
+++ b/tests/test_persistence.py
@@ -1608,8 +1608,6 @@ def test_to_json(default_conf, fee):
                       'is_short': None,
                       'trading_mode': None,
                       'funding_fees': None,
-                      'filled_entry_orders': [],
-                      'filled_exit_orders': [],
                       'orders': [],
                       }
 
@@ -1685,8 +1683,6 @@ def test_to_json(default_conf, fee):
                       'is_short': None,
                       'trading_mode': None,
                       'funding_fees': None,
-                      'filled_entry_orders': [],
-                      'filled_exit_orders': [],
                       'orders': [],
                       }