Improve funding_fee_calc method structure

This commit is contained in:
Matthias
2024-01-04 15:23:15 +01:00
parent ec1b2e1da5
commit 3c1bbd9610

View File

@@ -2736,15 +2736,15 @@ class Exchange:
timeframe = self._ft_has['mark_ohlcv_timeframe'] timeframe = self._ft_has['mark_ohlcv_timeframe']
timeframe_ff = self._ft_has.get('funding_fee_timeframe', timeframe_ff = self._ft_has.get('funding_fee_timeframe',
self._ft_has['mark_ohlcv_timeframe']) self._ft_has['mark_ohlcv_timeframe'])
mark_price_type = CandleType.from_string(self._ft_has["mark_ohlcv_price"])
if not close_date: if not close_date:
close_date = datetime.now(timezone.utc) close_date = datetime.now(timezone.utc)
since_ms = int(timeframe_to_prev_date(timeframe, open_date).timestamp()) * 1000 since_ms = int(timeframe_to_prev_date(timeframe, open_date).timestamp()) * 1000
mark_comb: PairWithTimeframe = ( mark_comb: PairWithTimeframe = (pair, timeframe, mark_price_type)
pair, timeframe, CandleType.from_string(self._ft_has["mark_ohlcv_price"]))
funding_comb: PairWithTimeframe = (pair, timeframe_ff, CandleType.FUNDING_RATE) funding_comb: PairWithTimeframe = (pair, timeframe_ff, CandleType.FUNDING_RATE)
candle_histories = self.refresh_latest_ohlcv( candle_histories = self.refresh_latest_ohlcv(
[mark_comb, funding_comb], [mark_comb, funding_comb],
since_ms=since_ms, since_ms=since_ms,