Skip to content

fix(margin): update delete request #798

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

Merged
carlosmiei merged 6 commits into from
Jan 22, 2026
+24 −24
Merged

fix(margin): update delete request #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98503ae
margin: update delete request
sc0Vu Jan 21, 2026
e5cd851
margin: update test
sc0Vu Jan 22, 2026
4fcf994
margin: change type of order id
sc0Vu Jan 22, 2026
3f0bcfb
fmt
sc0Vu Jan 22, 2026
94f5c5f
vet
sc0Vu Jan 22, 2026
6eb598e
margin: fix test
sc0Vu Jan 22, 2026
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
30 changes: 15 additions & 15 deletions v2/margin_order_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,21 +236,21 @@ func (s *CancelMarginOrderService) Do(ctx context.Context, opts ...RequestOption
endpoint: "/sapi/v1/margin/order",
secType: secTypeSigned,
}
r.setFormParam("symbol", s.symbol)
r.setParam("symbol", s.symbol)
if s.orderID != nil {
r.setFormParam("orderId", *s.orderID)
r.setParam("orderId", *s.orderID)
}
if s.origClientOrderID != nil {
r.setFormParam("origClientOrderId", *s.origClientOrderID)
r.setParam("origClientOrderId", *s.origClientOrderID)
}
if s.newClientOrderID != nil {
r.setFormParam("newClientOrderId", *s.newClientOrderID)
r.setParam("newClientOrderId", *s.newClientOrderID)
}
if s.isIsolated != nil {
if *s.isIsolated {
r.setFormParam("isIsolated", "TRUE")
r.setParam("isIsolated", "TRUE")
} else {
r.setFormParam("isIsolated", "FALSE")
r.setParam("isIsolated", "FALSE")
}
}

Expand Down Expand Up @@ -292,12 +292,12 @@ func (s *CancelAllMarginOrdersService) Do(ctx context.Context, opts ...RequestOp
endpoint: "/sapi/v1/margin/openOrders",
secType: secTypeSigned,
}
r.setFormParam("symbol", s.symbol)
r.setParam("symbol", s.symbol)
if s.isIsolated != nil {
if *s.isIsolated {
r.setFormParam("isIsolated", "TRUE")
r.setParam("isIsolated", "TRUE")
} else {
r.setFormParam("isIsolated", "FALSE")
r.setParam("isIsolated", "FALSE")
}
}

Expand Down Expand Up @@ -525,7 +525,7 @@ type CancelMarginOrderResponse struct {
type CancelAllMarginOrdersResponse struct {
Symbol string `json:"symbol"`
OrigClientOrderID string `json:"origClientOrderId"`
OrderID string `json:"orderId"`
OrderID int64 `json:"orderId"`
ClientOrderID string `json:"clientOrderId"`
TransactTime int64 `json:"transactTime"`
Price string `json:"price"`
Expand Down Expand Up @@ -835,18 +835,18 @@ func (s *CancelMarginOCOService) Do(ctx context.Context, opts ...RequestOption)
endpoint: "/sapi/v1/margin/orderList",
secType: secTypeSigned,
}
r.setFormParam("symbol", s.symbol)
r.setParam("symbol", s.symbol)
if s.listClientOrderID != "" {
r.setFormParam("listClientOrderId", s.listClientOrderID)
r.setParam("listClientOrderId", s.listClientOrderID)
}
if s.isIsolated != nil {
r.setFormParam("isIsolated", *s.isIsolated)
r.setParam("isIsolated", *s.isIsolated)
}
if s.orderListID != 0 {
r.setFormParam("orderListId", s.orderListID)
r.setParam("orderListId", s.orderListID)
}
if s.newClientOrderID != "" {
r.setFormParam("newClientOrderId", s.newClientOrderID)
r.setParam("newClientOrderId", s.newClientOrderID)
}
data, err := s.c.callAPI(ctx, r, opts...)
if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions v2/margin_order_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func (s *marginOrderServiceTestSuite) TestCancelOrder() {
origClientOrderID := "myOrder1"
newClientOrderID := "cancelMyOrder1"
s.assertReq(func(r *request) {
e := newSignedRequest().setFormParams(params{
e := newSignedRequest().setParams(params{
"symbol": symbol,
"orderId": orderID,
"origClientOrderId": origClientOrderID,
Expand Down Expand Up @@ -220,7 +220,7 @@ func (s *marginOrderServiceTestSuite) TestCancelOrder() {
func (s *marginOrderServiceTestSuite) TestCancelAllOrder() {
data := []byte(`[{
"symbol": "LTCBTC",
"orderId": "28",
"orderId": 28,
"origClientOrderId": "myOrder1",
"clientOrderId": "cancelMyOrder1",
"transactTime": 1507725176595,
Expand All @@ -238,7 +238,7 @@ func (s *marginOrderServiceTestSuite) TestCancelAllOrder() {

symbol := "LTCBTC"
s.assertReq(func(r *request) {
e := newSignedRequest().setFormParams(params{
e := newSignedRequest().setParams(params{
"symbol": symbol,
})
s.assertRequestEqual(e, r)
Expand All @@ -251,7 +251,7 @@ func (s *marginOrderServiceTestSuite) TestCancelAllOrder() {
e := []*CancelAllMarginOrdersResponse{
&CancelAllMarginOrdersResponse{
Symbol: "LTCBTC",
OrderID: "28",
OrderID: 28,
OrigClientOrderID: "myOrder1",
ClientOrderID: "cancelMyOrder1",
TransactTime: 1507725176595,
Expand Down Expand Up @@ -780,7 +780,7 @@ func (s *marginOrderServiceTestSuite) TestCancelOCO() {
symbol := "LTCBTC"
listClientOrderID := "C3wyj4WVEktd7u9aVBRXcN"
s.assertReq(func(r *request) {
e := newSignedRequest().setFormParams(params{
e := newSignedRequest().setParams(params{
"symbol": symbol,
"listClientOrderId": listClientOrderID,
})
Expand Down
6 changes: 3 additions & 3 deletions v2/margin_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,8 +1137,8 @@ func (s *CloseIsolatedMarginUserStreamService) Do(ctx context.Context, opts ...R
secType: secTypeAPIKey,
}

r.setFormParam("listenKey", s.listenKey)
r.setFormParam("symbol", s.symbol)
r.setParam("listenKey", s.listenKey)
r.setParam("symbol", s.symbol)

_, err = s.c.callAPI(ctx, r, opts...)
return err
Expand Down Expand Up @@ -1213,7 +1213,7 @@ func (s *CloseMarginUserStreamService) Do(ctx context.Context, opts ...RequestOp
secType: secTypeAPIKey,
}

r.setFormParam("listenKey", s.listenKey)
r.setParam("listenKey", s.listenKey)

_, err = s.c.callAPI(ctx, r, opts...)
return err
Expand Down
2 changes: 1 addition & 1 deletion v2/margin_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ func (s *marginTestSuite) TestCloseMarginUserStream() {

listenKey := "dummykey"
s.assertReq(func(r *request) {
s.assertRequestEqual(newRequest().setFormParam("listenKey", listenKey), r)
s.assertRequestEqual(newRequest().setParam("listenKey", listenKey), r)
})

err := s.client.NewCloseMarginUserStreamService().ListenKey(listenKey).Do(newContext())
Expand Down