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

Add leverage/short properties to api responses

Browse Source
This commit is contained in:
Matthias 2022-02-01 07:08:43 +01:00
parent 7dd50f78cf
commit 45e533fc3e
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ from pydantic import BaseModel
from freqtrade.constants import DATETIME_PRINT_FORMAT from freqtrade.constants import DATETIME_PRINT_FORMAT
from freqtrade.enums import OrderTypeValues, SignalDirection from freqtrade.enums import OrderTypeValues, SignalDirection
from freqtrade.enums.tradingmode import TradingMode
class Ping(BaseModel): class Ping(BaseModel):
@ -229,6 +230,11 @@ class TradeSchema(BaseModel):
max_rate: Optional[float] max_rate: Optional[float]
open_order_id: Optional[str] open_order_id: Optional[str]
leverage: Optional[float]
interest_rate: Optional[float]
funding_fees: Optional[float]
trading_mode: Optional[TradingMode]
class OpenTradeSchema(TradeSchema): class OpenTradeSchema(TradeSchema):
stoploss_current_dist: Optional[float] stoploss_current_dist: Optional[float]

17
tests/rpc/test_rpc_apiserver.py
View File

@ -17,6 +17,7 @@ from requests.auth import _basic_auth_str
from freqtrade.__init__ import __version__ from freqtrade.__init__ import __version__
from freqtrade.enums import CandleType, RunMode, State from freqtrade.enums import CandleType, RunMode, State
from freqtrade.enums.tradingmode import TradingMode
from freqtrade.exceptions import DependencyException, ExchangeError, OperationalException from freqtrade.exceptions import DependencyException, ExchangeError, OperationalException
from freqtrade.loggers import setup_logging, setup_logging_pre from freqtrade.loggers import setup_logging, setup_logging_pre
from freqtrade.persistence import PairLocks, Trade from freqtrade.persistence import PairLocks, Trade
@ -962,6 +963,10 @@ def test_api_status(botclient, mocker, ticker, fee, markets, is_short,
'enter_tag': None, 'enter_tag': None,
'timeframe': 5, 'timeframe': 5,
'exchange': 'binance', 'exchange': 'binance',
'leverage': 1.0,
'interest_rate': 0.0,
'funding_fees': None,
'trading_mode': ANY,
} }
mocker.patch('freqtrade.exchange.Exchange.get_rate', mocker.patch('freqtrade.exchange.Exchange.get_rate',
@ -1061,7 +1066,6 @@ def test_api_whitelist(botclient):
} }
# TODO -lev: add test for forcebuy (short) when feature is supported
@pytest.mark.parametrize('endpoint', [ @pytest.mark.parametrize('endpoint', [
'forcebuy', 'forcebuy',
'forceenter', 'forceenter',
@ -1101,7 +1105,8 @@ def test_api_forceentry(botclient, mocker, fee, endpoint):
close_rate=0.265441, close_rate=0.265441,
id=22, id=22,
timeframe=5, timeframe=5,
strategy=CURRENT_TEST_STRATEGY strategy=CURRENT_TEST_STRATEGY,
trading_mode=TradingMode.SPOT
)) ))
mocker.patch("freqtrade.rpc.RPC._rpc_force_entry", fbuy_mock) mocker.patch("freqtrade.rpc.RPC._rpc_force_entry", fbuy_mock)
@ -1109,8 +1114,8 @@ def test_api_forceentry(botclient, mocker, fee, endpoint):
data='{"pair": "ETH/BTC"}') data='{"pair": "ETH/BTC"}')
assert_response(rc) assert_response(rc)
assert rc.json() == { assert rc.json() == {
'amount': 1, 'amount': 1.0,
'amount_requested': 1, 'amount_requested': 1.0,
'trade_id': 22, 'trade_id': 22,
'close_date': None, 'close_date': None,
'close_timestamp': None, 'close_timestamp': None,
@ -1157,6 +1162,10 @@ def test_api_forceentry(botclient, mocker, fee, endpoint):
'enter_tag': None, 'enter_tag': None,
'timeframe': 5, 'timeframe': 5,
'exchange': 'binance', 'exchange': 'binance',
'leverage': None,
'interest_rate': None,
'funding_fees': None,
'trading_mode': 'spot',
} }