Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Futures Position Risk backward compatibility #659

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Futures Position Risk backward compatibility #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions v2/futures/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,14 @@ func (c *Client) NewGetBalanceService() *GetBalanceService {
return &GetBalanceService{c: c}
}

func (c *Client) NewGetPositionRiskV2Service() *GetPositionRiskV2Service {
return &GetPositionRiskV2Service{c: c}
}

func (c *Client) NewGetPositionRiskService() *GetPositionRiskService {
return &GetPositionRiskService{c: c}
}

func (c *Client) NewGetPositionRiskV3Service() *GetPositionRiskV3Service {
return &GetPositionRiskV3Service{c: c}
}

// NewGetPositionMarginHistoryService init getting position margin history service
func (c *Client) NewGetPositionMarginHistoryService() *GetPositionMarginHistoryService {
return &GetPositionMarginHistoryService{c: c}
Expand Down
34 changes: 17 additions & 17 deletions v2/futures/position_risk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ import (
"net/http"
)

// GetPositionRiskService get account balance
type GetPositionRiskV2Service struct {
// GetPositionRiskV3Service get account balance
type GetPositionRiskService struct {
c *Client
symbol string
}

// Symbol set symbol
func (s *GetPositionRiskV2Service) Symbol(symbol string) *GetPositionRiskV2Service {
func (s *GetPositionRiskService) Symbol(symbol string) *GetPositionRiskService {
s.symbol = symbol
return s
}

// Do send request
func (s *GetPositionRiskV2Service) Do(ctx context.Context, opts ...RequestOption) (res []*PositionRiskV2, err error) {
func (s *GetPositionRiskService) Do(ctx context.Context, opts ...RequestOption) (res []*PositionRisk, err error) {
r := &request{
method: http.MethodGet,
endpoint: "/fapi/v2/positionRisk",
Expand All @@ -30,18 +30,18 @@ func (s *GetPositionRiskV2Service) Do(ctx context.Context, opts ...RequestOption
}
data, _, err := s.c.callAPI(ctx, r, opts...)
if err != nil {
return []*PositionRiskV2{}, err
return []*PositionRisk{}, err
}
res = make([]*PositionRiskV2, 0)
res = make([]*PositionRisk, 0)
err = json.Unmarshal(data, &res)
if err != nil {
return []*PositionRiskV2{}, err
return []*PositionRisk{}, err
}
return res, nil
}

// PositionRisk define position risk info
type PositionRiskV2 struct {
type PositionRisk struct {
EntryPrice string `json:"entryPrice"`
BreakEvenPrice string `json:"breakEvenPrice"`
MarginType string `json:"marginType"`
Expand All @@ -59,25 +59,25 @@ type PositionRiskV2 struct {
IsolatedWallet string `json:"isolatedWallet"`
}

type GetPositionRiskService struct {
type GetPositionRiskV3Service struct {
c *Client
symbol string
recvWindow *int64
}

// Symbol set symbol
func (s *GetPositionRiskService) Symbol(symbol string) *GetPositionRiskService {
func (s *GetPositionRiskV3Service) Symbol(symbol string) *GetPositionRiskV3Service {
s.symbol = symbol
return s
}

func (s *GetPositionRiskService) RecvWindow(rw int64) *GetPositionRiskService {
func (s *GetPositionRiskV3Service) RecvWindow(rw int64) *GetPositionRiskV3Service {
s.recvWindow = &rw
return s
}

// Do send request
func (s *GetPositionRiskService) Do(ctx context.Context, opts ...RequestOption) (res []*PositionRisk, err error) {
func (s *GetPositionRiskV3Service) Do(ctx context.Context, opts ...RequestOption) (res []*PositionRiskV3, err error) {
r := &request{
method: http.MethodGet,
endpoint: "/fapi/v3/positionRisk",
Expand All @@ -92,18 +92,18 @@ func (s *GetPositionRiskService) Do(ctx context.Context, opts ...RequestOption)

data, _, err := s.c.callAPI(ctx, r, opts...)
if err != nil {
return []*PositionRisk{}, err
return []*PositionRiskV3{}, err
}
res = make([]*PositionRisk, 0)
res = make([]*PositionRiskV3, 0)
err = json.Unmarshal(data, &res)
if err != nil {
return []*PositionRisk{}, err
return []*PositionRiskV3{}, err
}
return res, nil
}

// PositionRisk define position risk info
type PositionRisk struct {
// PositionRiskV3 define position risk info
type PositionRiskV3 struct {
Symbol string `json:"symbol"`
PositionSide string `json:"positionSide"`
PositionAmt string `json:"positionAmt"`
Expand Down
12 changes: 6 additions & 6 deletions v2/futures/position_risk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ func (s *positionRiskServiceTestSuite) TestGetPositionRiskV2() {
})
s.assertRequestEqual(e, r)
})
res, err := s.client.NewGetPositionRiskV2Service().Symbol(symbol).
res, err := s.client.NewGetPositionRiskService().Symbol(symbol).
Do(newContext(), WithRecvWindow(recvWindow))
r := s.r()
r.NoError(err)
r.Len(res, 1)
e := &PositionRiskV2{
e := &PositionRisk{
EntryPrice: "10359.38000",
BreakEvenPrice: "10387.38000",
MarginType: "isolated",
Expand All @@ -67,7 +67,7 @@ func (s *positionRiskServiceTestSuite) TestGetPositionRiskV2() {
s.assertPositionRiskV2Equal(e, res[0])
}

func (s *positionRiskServiceTestSuite) assertPositionRiskV2Equal(e, a *PositionRiskV2) {
func (s *positionRiskServiceTestSuite) assertPositionRiskV2Equal(e, a *PositionRisk) {
r := s.r()
r.Equal(e.EntryPrice, a.EntryPrice, "EntryPrice")
r.Equal(e.BreakEvenPrice, a.BreakEvenPrice, "BreakEvenPrice")
Expand Down Expand Up @@ -121,12 +121,12 @@ func (s *positionRiskServiceTestSuite) TestGetPositionRisk() {
})
s.assertRequestEqual(e, r)
})
res, err := s.client.NewGetPositionRiskService().Symbol(symbol).
res, err := s.client.NewGetPositionRiskV3Service().Symbol(symbol).
Do(newContext(), WithRecvWindow(recvWindow))
r := s.r()
r.NoError(err)
r.Len(res, 1)
e := &PositionRisk{
e := &PositionRiskV3{
Symbol: "BTCUSDT",
PositionSide: "BOTH",
PositionAmt: "0.000",
Expand All @@ -151,7 +151,7 @@ func (s *positionRiskServiceTestSuite) TestGetPositionRisk() {
s.assertPositionRiskEqual(e, res[0])
}

func (s *positionRiskServiceTestSuite) assertPositionRiskEqual(e, a *PositionRisk) {
func (s *positionRiskServiceTestSuite) assertPositionRiskEqual(e, a *PositionRiskV3) {
r := s.r()
r.Equal(e.Symbol, a.Symbol, "Symbol")
r.Equal(e.PositionSide, a.PositionSide, "PositionSide")
Expand Down
1 change: 0 additions & 1 deletion v2/futures/rebate_newuser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ func (s *GetRebateNewUserService) Do(ctx context.Context, opts ...RequestOption)
return res, nil
}

// PositionRisk define position risk info
type RebateNewUser struct {
BrokerId string `json:"brokerId"`
RebateWorking bool `json:"rebateWorking"`
Expand Down
Loading