From 263dbfa0c2387af2a15fc5165fa36efd27c0b48e Mon Sep 17 00:00:00 2001 From: Rostislav Lyupa Date: Thu, 23 Jan 2025 09:33:17 +0300 Subject: [PATCH] rename position risk endpoints --- v2/futures/client.go | 8 ++++---- v2/futures/position_risk.go | 34 ++++++++++++++++---------------- v2/futures/position_risk_test.go | 12 +++++------ v2/futures/rebate_newuser.go | 1 - 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/v2/futures/client.go b/v2/futures/client.go index 526d66b02..e7f4b6ed5 100644 --- a/v2/futures/client.go +++ b/v2/futures/client.go @@ -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} diff --git a/v2/futures/position_risk.go b/v2/futures/position_risk.go index b9930c680..670f16089 100644 --- a/v2/futures/position_risk.go +++ b/v2/futures/position_risk.go @@ -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", @@ -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"` @@ -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", @@ -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"` diff --git a/v2/futures/position_risk_test.go b/v2/futures/position_risk_test.go index b607571e4..8b5805979 100644 --- a/v2/futures/position_risk_test.go +++ b/v2/futures/position_risk_test.go @@ -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", @@ -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") @@ -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", @@ -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") diff --git a/v2/futures/rebate_newuser.go b/v2/futures/rebate_newuser.go index 4d77615b7..79dcbd2f1 100644 --- a/v2/futures/rebate_newuser.go +++ b/v2/futures/rebate_newuser.go @@ -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"`