Skip to content

Commit 941ad81

Browse files
committed
Merge remote-tracking branch 'origin/dev-gmx-trade' into dev-gmx-trade
# Conflicts: # demeter/broker/_typing.py # demeter/gmx/market2.py # samples/strategy-example/delta_hedging.pkl
2 parents 23e44bb + 36ff4a5 commit 941ad81

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

demeter/gmx/market2.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
import pandas as pd
55
from orjson import orjson
66

7-
from .gmx_v2.MarketUtils import MarketUtils
8-
from .helper2 import load_gmx_v2_data, get_price_from_v2_data
9-
from .gmx_v2 import PoolConfig, LPResult, PositionResult
10-
from .gmx_v2.ExecuteDepositUtils import ExecuteDepositUtils
11-
from .gmx_v2.ExecuteWithdrawUtils import ExecuteWithdrawUtils
12-
from .gmx_v2.ExecuteOrderUtils import ExecuteOrderUtils
13-
from .gmx_v2.ReaderPositionUtils import ReaderPositionUtils
14-
from .. import MarketStatus, TokenInfo, DECIMAL_0, ChainType, DemeterWarning, DemeterError, UnitDecimal
15-
from ..broker import Market, MarketInfo, MarketBalance
167
from ._typing2 import (
178
GmxV2Pool,
189
GmxV2Description,
@@ -25,11 +16,12 @@
2516
Gmx2DecreasePositionAction,
2617
position_dict_to_dataframe
2718
)
28-
from .gmx_v2 import PoolConfig, LPResult, PositionResult
19+
from .gmx_v2 import PoolConfig, LPResult
2920
from .gmx_v2.ExecuteDepositUtils import ExecuteDepositUtils
3021
from .gmx_v2.ExecuteWithdrawUtils import ExecuteWithdrawUtils
31-
from .gmx_v2.ExecuteOrderUtils import ExecuteOrderUtils
3222
from .gmx_v2.MarketUtils import MarketUtils
23+
from .gmx_v2.ExecuteOrderUtils import ExecuteOrderUtils
24+
from .gmx_v2.ReaderPositionUtils import ReaderPositionUtils
3325
from .helper2 import load_gmx_v2_data, get_price_from_v2_data
3426
from .. import TokenInfo, DECIMAL_0, ChainType, DemeterError, UnitDecimal
3527
from .._typing import USD
4.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)