max: fix max v3 order cancel api

This commit is contained in:
c9s 2023-03-01 16:45:33 +08:00
parent 06eff47058
commit 6137905f42
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
3 changed files with 35 additions and 8 deletions

View File

@ -293,11 +293,18 @@ func (e *Exchange) CancelAllOrders(ctx context.Context) ([]types.Order, error) {
} }
req := e.v3order.NewCancelWalletOrderAllRequest(walletType) req := e.v3order.NewCancelWalletOrderAllRequest(walletType)
var maxOrders, err = req.Do(ctx) var orderResponses, err = req.Do(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var maxOrders []maxapi.Order
for _, resp := range orderResponses {
if resp.Error == nil {
maxOrders = append(maxOrders, resp.Order)
}
}
return toGlobalOrders(maxOrders) return toGlobalOrders(maxOrders)
} }
@ -311,11 +318,18 @@ func (e *Exchange) CancelOrdersBySymbol(ctx context.Context, symbol string) ([]t
req := e.v3order.NewCancelWalletOrderAllRequest(walletType) req := e.v3order.NewCancelWalletOrderAllRequest(walletType)
req.Market(market) req.Market(market)
maxOrders, err := req.Do(ctx) var orderResponses, err = req.Do(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var maxOrders []maxapi.Order
for _, resp := range orderResponses {
if resp.Error == nil {
maxOrders = append(maxOrders, resp.Order)
}
}
return toGlobalOrders(maxOrders) return toGlobalOrders(maxOrders)
} }
@ -328,11 +342,18 @@ func (e *Exchange) CancelOrdersByGroupID(ctx context.Context, groupID uint32) ([
req := e.v3order.NewCancelWalletOrderAllRequest(walletType) req := e.v3order.NewCancelWalletOrderAllRequest(walletType)
req.GroupID(groupID) req.GroupID(groupID)
maxOrders, err := req.Do(ctx) var orderResponses, err = req.Do(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var maxOrders []maxapi.Order
for _, resp := range orderResponses {
if resp.Error == nil {
maxOrders = append(maxOrders, resp.Order)
}
}
return toGlobalOrders(maxOrders) return toGlobalOrders(maxOrders)
} }

View File

@ -6,11 +6,16 @@ import "github.com/c9s/requestgen"
//go:generate -command PostRequest requestgen -method POST //go:generate -command PostRequest requestgen -method POST
//go:generate -command DeleteRequest requestgen -method DELETE //go:generate -command DeleteRequest requestgen -method DELETE
type OrderCancelResponse struct {
Order Order
Error *string
}
func (s *OrderService) NewCancelWalletOrderAllRequest(walletType WalletType) *CancelWalletOrderAllRequest { func (s *OrderService) NewCancelWalletOrderAllRequest(walletType WalletType) *CancelWalletOrderAllRequest {
return &CancelWalletOrderAllRequest{client: s.Client, walletType: walletType} return &CancelWalletOrderAllRequest{client: s.Client, walletType: walletType}
} }
//go:generate DeleteRequest -url "/api/v3/wallet/:walletType/orders" -type CancelWalletOrderAllRequest -responseType []Order //go:generate DeleteRequest -url "/api/v3/wallet/:walletType/orders" -type CancelWalletOrderAllRequest -responseType []OrderCancelResponse
type CancelWalletOrderAllRequest struct { type CancelWalletOrderAllRequest struct {
client requestgen.AuthenticatedAPIClient client requestgen.AuthenticatedAPIClient

View File

@ -1,4 +1,4 @@
// Code generated by "requestgen -method DELETE -url /api/v3/wallet/:walletType/orders -type CancelWalletOrderAllRequest -responseType []Order"; DO NOT EDIT. // Code generated by "requestgen -method DELETE -url /api/v3/wallet/:walletType/orders -type CancelWalletOrderAllRequest -responseType []OrderCancelResponse"; DO NOT EDIT.
package v3 package v3
@ -6,10 +6,11 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/c9s/bbgo/pkg/exchange/max/maxapi"
"net/url" "net/url"
"reflect" "reflect"
"regexp" "regexp"
max "github.com/c9s/bbgo/pkg/exchange/max/maxapi"
) )
func (c *CancelWalletOrderAllRequest) Side(side string) *CancelWalletOrderAllRequest { func (c *CancelWalletOrderAllRequest) Side(side string) *CancelWalletOrderAllRequest {
@ -165,7 +166,7 @@ func (c *CancelWalletOrderAllRequest) GetSlugsMap() (map[string]string, error) {
return slugs, nil return slugs, nil
} }
func (c *CancelWalletOrderAllRequest) Do(ctx context.Context) ([]max.Order, error) { func (c *CancelWalletOrderAllRequest) Do(ctx context.Context) ([]OrderCancelResponse, error) {
params, err := c.GetParameters() params, err := c.GetParameters()
if err != nil { if err != nil {
@ -191,7 +192,7 @@ func (c *CancelWalletOrderAllRequest) Do(ctx context.Context) ([]max.Order, erro
return nil, err return nil, err
} }
var apiResponse []max.Order var apiResponse []OrderCancelResponse
if err := response.DecodeJSON(&apiResponse); err != nil { if err := response.DecodeJSON(&apiResponse); err != nil {
return nil, err return nil, err
} }