lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-14 19:13:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1762 from c9s/edwin/bybit/adjust-rate-limit
Some checks failed
Go / build (1.21, 6.2) (push) Has been cancelled
Details
golang-lint / lint (push) Has been cancelled
Details

Browse Source 
MINOR: [bybit] use individual rate limit on wallet-balance API
This commit is contained in:
bailantaotao 2024-10-02 17:36:21 +08:00 committed by GitHub
commit 0ba1fc5215
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/exchange/bybit/bybitapi/get_wallet_balances_request.go
View File

@ -70,7 +70,7 @@ type WalletBalances struct {
} `json:"coin"`
}
//go:generate GetRequest -url "/v5/account/wallet-balance" -type GetWalletBalancesRequest -responseDataType .WalletBalancesResponse
//go:generate GetRequest -url "/v5/account/wallet-balance" -type GetWalletBalancesRequest -responseDataType .WalletBalancesResponse -rateLimiter 1+15/1s
type GetWalletBalancesRequest struct {
client requestgen.AuthenticatedAPIClient

30
pkg/exchange/bybit/bybitapi/get_wallet_balances_request_requestgen.go
View File

@ -1,4 +1,4 @@
// Code generated by "requestgen -method GET -responseType .APIResponse -responseDataField Result -url /v5/account/wallet-balance -type GetWalletBalancesRequest -responseDataType .WalletBalancesResponse"; DO NOT EDIT.
// Code generated by "requestgen -method GET -responseType .APIResponse -responseDataField Result -url /v5/account/wallet-balance -type GetWalletBalancesRequest -responseDataType .WalletBalancesResponse -rateLimiter 1+15/1s"; DO NOT EDIT.
package bybitapi
@ -6,11 +6,14 @@ import (
"context"
"encoding/json"
"fmt"
"golang.org/x/time/rate"
"net/url"
"reflect"
"regexp"
)
var GetWalletBalancesRequestLimiter = rate.NewLimiter(15.000000150000002, 1)
func (g *GetWalletBalancesRequest) AccountType(accountType AccountType) *GetWalletBalancesRequest {
g.accountType = accountType
return g
@ -150,6 +153,9 @@ func (g *GetWalletBalancesRequest) GetPath() string {
// Do generates the request object and send the request object to the API endpoint
func (g *GetWalletBalancesRequest) Do(ctx context.Context) (*WalletBalancesResponse, error) {
if err := GetWalletBalancesRequestLimiter.Wait(ctx); err != nil {
return nil, err
}
// no body params
var params interface{}
@ -173,15 +179,29 @@ func (g *GetWalletBalancesRequest) Do(ctx context.Context) (*WalletBalancesRespo
}
var apiResponse APIResponse
if err := response.DecodeJSON(&apiResponse); err != nil {
return nil, err
type responseUnmarshaler interface {
Unmarshal(data []byte) error
}
if unmarshaler, ok := interface{}(&apiResponse).(responseUnmarshaler); ok {
if err := unmarshaler.Unmarshal(response.Body); err != nil {
return nil, err
}
} else {
// The line below checks the content type, however, some API server might not send the correct content type header,
// Hence, this is commented for backward compatibility
// response.IsJSON()
if err := response.DecodeJSON(&apiResponse); err != nil {
return nil, err
}
}
type responseValidator interface {
Validate() error
}
validator, ok := interface{}(apiResponse).(responseValidator)
if ok {
if validator, ok := interface{}(&apiResponse).(responseValidator); ok {
if err := validator.Validate(); err != nil {
return nil, err
}

4
pkg/exchange/bybit/exchange.go
View File

@ -518,10 +518,6 @@ func (e *Exchange) QueryAccount(ctx context.Context) (*types.Account, error) {
}
func (e *Exchange) QueryAccountBalances(ctx context.Context) (types.BalanceMap, error) {
if err := sharedRateLimiter.Wait(ctx); err != nil {
return nil, fmt.Errorf("query account balances rate limiter wait error: %w", err)
}
req := e.client.NewGetWalletBalancesRequest()
accounts, err := req.Do(ctx)
if err != nil {