Merge pull request #798 from sc0Vu/patch-delete-request-1

carlosmiei · web-flow · commit 41a23101d8bf · 2026-01-22T10:51:20.000-05:00
fix(margin): update delete request
diff --git a/v2/margin_order_service.go b/v2/margin_order_service.go
@@ -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")
 		}
 	}
 
@@ -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")
 		}
 	}
 
@@ -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"`
@@ -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 {
diff --git a/v2/margin_order_service_test.go b/v2/margin_order_service_test.go
@@ -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,
@@ -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,
@@ -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)
@@ -251,7 +251,7 @@ func (s *marginOrderServiceTestSuite) TestCancelAllOrder() {
 	e := []*CancelAllMarginOrdersResponse{
 		&CancelAllMarginOrdersResponse{
 			Symbol:                   "LTCBTC",
-			OrderID:                  "28",
+			OrderID:                  28,
 			OrigClientOrderID:        "myOrder1",
 			ClientOrderID:            "cancelMyOrder1",
 			TransactTime:             1507725176595,
@@ -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,
 		})
diff --git a/v2/margin_service.go b/v2/margin_service.go
@@ -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
@@ -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
diff --git a/v2/margin_service_test.go b/v2/margin_service_test.go
@@ -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())

Original file line number	Diff line number	Diff line change
`@@ -236,21 +236,21 @@ func (s *CancelMarginOrderService) Do(ctx context.Context, opts ...RequestOption`
`236`	`236`	`endpoint: "/sapi/v1/margin/order",`
`237`	`237`	`secType: secTypeSigned,`
`238`	`238`	`}`
`239`		`- r.setFormParam("symbol", s.symbol)`
	`239`	`+ r.setParam("symbol", s.symbol)`
`240`	`240`	`if s.orderID != nil {`
`241`		`- r.setFormParam("orderId", *s.orderID)`
	`241`	`+ r.setParam("orderId", *s.orderID)`
`242`	`242`	`}`
`243`	`243`	`if s.origClientOrderID != nil {`
`244`		`- r.setFormParam("origClientOrderId", *s.origClientOrderID)`
	`244`	`+ r.setParam("origClientOrderId", *s.origClientOrderID)`
`245`	`245`	`}`
`246`	`246`	`if s.newClientOrderID != nil {`
`247`		`- r.setFormParam("newClientOrderId", *s.newClientOrderID)`
	`247`	`+ r.setParam("newClientOrderId", *s.newClientOrderID)`
`248`	`248`	`}`
`249`	`249`	`if s.isIsolated != nil {`
`250`	`250`	`if *s.isIsolated {`
`251`		`- r.setFormParam("isIsolated", "TRUE")`
	`251`	`+ r.setParam("isIsolated", "TRUE")`
`252`	`252`	`} else {`
`253`		`- r.setFormParam("isIsolated", "FALSE")`
	`253`	`+ r.setParam("isIsolated", "FALSE")`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`@@ -292,12 +292,12 @@ func (s *CancelAllMarginOrdersService) Do(ctx context.Context, opts ...RequestOp`
`292`	`292`	`endpoint: "/sapi/v1/margin/openOrders",`
`293`	`293`	`secType: secTypeSigned,`
`294`	`294`	`}`
`295`		`- r.setFormParam("symbol", s.symbol)`
	`295`	`+ r.setParam("symbol", s.symbol)`
`296`	`296`	`if s.isIsolated != nil {`
`297`	`297`	`if *s.isIsolated {`
`298`		`- r.setFormParam("isIsolated", "TRUE")`
	`298`	`+ r.setParam("isIsolated", "TRUE")`
`299`	`299`	`} else {`
`300`		`- r.setFormParam("isIsolated", "FALSE")`
	`300`	`+ r.setParam("isIsolated", "FALSE")`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`
`@@ -525,7 +525,7 @@ type CancelMarginOrderResponse struct {`
`525`	`525`	`type CancelAllMarginOrdersResponse struct {`
`526`	`526`	Symbol string `json:"symbol"`
`527`	`527`	OrigClientOrderID string `json:"origClientOrderId"`
`528`		- OrderID string `json:"orderId"`
	`528`	+ OrderID int64 `json:"orderId"`
`529`	`529`	ClientOrderID string `json:"clientOrderId"`
`530`	`530`	TransactTime int64 `json:"transactTime"`
`531`	`531`	Price string `json:"price"`
`@@ -835,18 +835,18 @@ func (s *CancelMarginOCOService) Do(ctx context.Context, opts ...RequestOption)`
`835`	`835`	`endpoint: "/sapi/v1/margin/orderList",`
`836`	`836`	`secType: secTypeSigned,`
`837`	`837`	`}`
`838`		`- r.setFormParam("symbol", s.symbol)`
	`838`	`+ r.setParam("symbol", s.symbol)`
`839`	`839`	`if s.listClientOrderID != "" {`
`840`		`- r.setFormParam("listClientOrderId", s.listClientOrderID)`
	`840`	`+ r.setParam("listClientOrderId", s.listClientOrderID)`
`841`	`841`	`}`
`842`	`842`	`if s.isIsolated != nil {`
`843`		`- r.setFormParam("isIsolated", *s.isIsolated)`
	`843`	`+ r.setParam("isIsolated", *s.isIsolated)`
`844`	`844`	`}`
`845`	`845`	`if s.orderListID != 0 {`
`846`		`- r.setFormParam("orderListId", s.orderListID)`
	`846`	`+ r.setParam("orderListId", s.orderListID)`
`847`	`847`	`}`
`848`	`848`	`if s.newClientOrderID != "" {`
`849`		`- r.setFormParam("newClientOrderId", s.newClientOrderID)`
	`849`	`+ r.setParam("newClientOrderId", s.newClientOrderID)`
`850`	`850`	`}`
`851`	`851`	`data, err := s.c.callAPI(ctx, r, opts...)`
`852`	`852`	`if err != nil {`