mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-08 23:16:54 +00:00
requester: defer execution of request.Item generation in closure (#723)
* requester: defer execution of request.Item generation in closure. * bithumb: fix issue * coinut/itbit: fix linter issues * binance: fix bug on recvWindow setting * requester: standardize sendpayload + add readme update * nonce: remove inc() function * request: defer unlockiflocked * binance: revert changes for open orders * btcmarkets: defer auth generation functionality, rm context deadline as this will be created just before sending HTTP request. * binance: move const to top * exmo: remove debug output as its generated in the requester function * ftx: defer auth functionality * requester: move error to top * bittrex: defer auth functionality * bitmex: defer auth functionality and remove deadline as generation occurs after rate limiting. * btse: defer auth functionality * coinbasepro: defer auth functionality and removed context deadline as this is generated after rate limiting * coinbene: defer auth functionality and remove context deadline as this is generated after rate limiting * huobi: defer auth functionality and remove context deadline as this is generated after rate limiting * huobi-futures: defer auth functionality and remove context deadline as this is generated after rate limiting * kraken: defer auth functionality and remove context deadline as this is generated after rate limiting * kraken: remove deadline protection for timestamp generation * okgroup: defer auth functionality and remove context deadline as this is generated after rate limiting * poloniex: defer auth functionality * zb: defer auth functionality and remove context deadline as this is generated after rate limiting * exchanges: clean up log output which are done and inspected in the requester package * binance: fix path bug on every retry, rm timeout context as this is not needed * coinbene: fix path bug on retry * binance: consolidate functionality * coinbene: fix linter issues * poloniex: linter fix * kraken: change add -> set * bitstamp: fix path bug for retry * BTSE: fix retry path bug * coinbene: fix path bug whoopsie by me * gateio: fix bug where on retry it does not reset reader * localbitcoins: fix path bug on retry * zb: change domain to land * exchanges: make sure io.Reader is generated every request * exchanges: move reader generation into function scope * wrapper_issues: setup exchange manager * engine: expand withdraw manager test * engine: dont look for environment * bitstamp: fix pathing bug (@thrasher-) * engine/withdraw_manager: purge tests as this is covered in repository withdraw
This commit is contained in:
Ryan O'Hara-Reid
GitHub
@@ -795,18 +795,24 @@ func (h *HUOBI) SendHTTPRequest(ep exchange.URL, path string, result interface{}
|
||||
return err
|
||||
}
|
||||
var tempResp json.RawMessage
|
||||
var errCap errorCapture
|
||||
err = h.SendPayload(context.Background(), &request.Item{
|
||||
|
||||
item := &request.Item{
|
||||
Method: http.MethodGet,
|
||||
Path: endpoint + path,
|
||||
Result: &tempResp,
|
||||
Verbose: h.Verbose,
|
||||
HTTPDebugging: h.HTTPDebugging,
|
||||
HTTPRecording: h.HTTPRecording,
|
||||
}
|
||||
|
||||
err = h.SendPayload(context.Background(), request.Unset, func() (*request.Item, error) {
|
||||
return item, nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var errCap errorCapture
|
||||
if err := json.Unmarshal(tempResp, &errCap); err == nil {
|
||||
if errCap.Code != 200 && errCap.ErrMsg != "" {
|
||||
return errors.New(errCap.ErrMsg)
|
||||
@@ -828,56 +834,57 @@ func (h *HUOBI) SendAuthenticatedHTTPRequest(ep exchange.URL, method, endpoint s
|
||||
values = url.Values{}
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
values.Set("AccessKeyId", h.API.Credentials.Key)
|
||||
values.Set("SignatureMethod", "HmacSHA256")
|
||||
values.Set("SignatureVersion", "2")
|
||||
values.Set("Timestamp", now.UTC().Format("2006-01-02T15:04:05"))
|
||||
|
||||
if isVersion2API {
|
||||
endpoint = "/v" + huobiAPIVersion2 + "/" + endpoint
|
||||
} else {
|
||||
endpoint = "/v" + huobiAPIVersion + "/" + endpoint
|
||||
}
|
||||
|
||||
payload := fmt.Sprintf("%s\napi.huobi.pro\n%s\n%s",
|
||||
method, endpoint, values.Encode())
|
||||
|
||||
headers := make(map[string]string)
|
||||
|
||||
if method == http.MethodGet {
|
||||
headers["Content-Type"] = "application/x-www-form-urlencoded"
|
||||
} else {
|
||||
headers["Content-Type"] = "application/json"
|
||||
}
|
||||
|
||||
hmac := crypto.GetHMAC(crypto.HashSHA256, []byte(payload), []byte(h.API.Credentials.Secret))
|
||||
values.Set("Signature", crypto.Base64Encode(hmac))
|
||||
urlPath := ePoint + common.EncodeURLValues(endpoint, values)
|
||||
|
||||
var body []byte
|
||||
if data != nil {
|
||||
body, err = json.Marshal(data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Time difference between your timestamp and standard should be less than 1 minute.
|
||||
ctx, cancel := context.WithDeadline(context.Background(), now.Add(time.Minute))
|
||||
defer cancel()
|
||||
interim := json.RawMessage{}
|
||||
err = h.SendPayload(ctx, &request.Item{
|
||||
Method: method,
|
||||
Path: urlPath,
|
||||
Headers: headers,
|
||||
Body: bytes.NewReader(body),
|
||||
Result: &interim,
|
||||
AuthRequest: true,
|
||||
Verbose: h.Verbose,
|
||||
HTTPDebugging: h.HTTPDebugging,
|
||||
HTTPRecording: h.HTTPRecording,
|
||||
})
|
||||
newRequest := func() (*request.Item, error) {
|
||||
now := time.Now()
|
||||
values.Set("AccessKeyId", h.API.Credentials.Key)
|
||||
values.Set("SignatureMethod", "HmacSHA256")
|
||||
values.Set("SignatureVersion", "2")
|
||||
values.Set("Timestamp", now.UTC().Format("2006-01-02T15:04:05"))
|
||||
|
||||
if isVersion2API {
|
||||
endpoint = "/v" + huobiAPIVersion2 + "/" + endpoint
|
||||
} else {
|
||||
endpoint = "/v" + huobiAPIVersion + "/" + endpoint
|
||||
}
|
||||
|
||||
payload := fmt.Sprintf("%s\napi.huobi.pro\n%s\n%s",
|
||||
method, endpoint, values.Encode())
|
||||
|
||||
headers := make(map[string]string)
|
||||
|
||||
if method == http.MethodGet {
|
||||
headers["Content-Type"] = "application/x-www-form-urlencoded"
|
||||
} else {
|
||||
headers["Content-Type"] = "application/json"
|
||||
}
|
||||
|
||||
hmac := crypto.GetHMAC(crypto.HashSHA256, []byte(payload), []byte(h.API.Credentials.Secret))
|
||||
values.Set("Signature", crypto.Base64Encode(hmac))
|
||||
urlPath := ePoint + common.EncodeURLValues(endpoint, values)
|
||||
|
||||
var body []byte
|
||||
if data != nil {
|
||||
body, err = json.Marshal(data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
return &request.Item{
|
||||
Method: method,
|
||||
Path: urlPath,
|
||||
Headers: headers,
|
||||
Body: bytes.NewReader(body),
|
||||
Result: &interim,
|
||||
AuthRequest: true,
|
||||
Verbose: h.Verbose,
|
||||
HTTPDebugging: h.HTTPDebugging,
|
||||
HTTPRecording: h.HTTPRecording,
|
||||
}, nil
|
||||
}
|
||||
|
||||
err = h.SendPayload(context.Background(), request.Unset, newRequest)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -1118,50 +1118,56 @@ func (h *HUOBI) FuturesAuthenticatedHTTPRequest(ep exchange.URL, method, endpoin
|
||||
if values == nil {
|
||||
values = url.Values{}
|
||||
}
|
||||
now := time.Now()
|
||||
values.Set("AccessKeyId", h.API.Credentials.Key)
|
||||
values.Set("SignatureMethod", "HmacSHA256")
|
||||
values.Set("SignatureVersion", "2")
|
||||
values.Set("Timestamp", now.UTC().Format("2006-01-02T15:04:05"))
|
||||
sigPath := fmt.Sprintf("%s\napi.hbdm.com\n/%s\n%s",
|
||||
method, endpoint, values.Encode())
|
||||
headers := make(map[string]string)
|
||||
if method == http.MethodGet {
|
||||
headers["Content-Type"] = "application/x-www-form-urlencoded"
|
||||
} else {
|
||||
headers["Content-Type"] = "application/json"
|
||||
}
|
||||
hmac := crypto.GetHMAC(crypto.HashSHA256, []byte(sigPath), []byte(h.API.Credentials.Secret))
|
||||
sigValues := url.Values{}
|
||||
sigValues.Add("Signature", crypto.Base64Encode(hmac))
|
||||
urlPath :=
|
||||
common.EncodeURLValues(ePoint+endpoint, values) + "&" + sigValues.Encode()
|
||||
var body io.Reader
|
||||
var payload []byte
|
||||
if data != nil {
|
||||
payload, err = json.Marshal(data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
body = bytes.NewBuffer(payload)
|
||||
}
|
||||
|
||||
var tempResp json.RawMessage
|
||||
var errCap errorCapture
|
||||
ctx, cancel := context.WithDeadline(context.Background(), now.Add(15*time.Second))
|
||||
defer cancel()
|
||||
if err := h.SendPayload(ctx, &request.Item{
|
||||
Method: method,
|
||||
Path: urlPath,
|
||||
Headers: headers,
|
||||
Body: body,
|
||||
Result: &tempResp,
|
||||
AuthRequest: true,
|
||||
Verbose: h.Verbose,
|
||||
HTTPDebugging: h.HTTPDebugging,
|
||||
HTTPRecording: h.HTTPRecording,
|
||||
}); err != nil {
|
||||
newRequest := func() (*request.Item, error) {
|
||||
now := time.Now()
|
||||
values.Set("AccessKeyId", h.API.Credentials.Key)
|
||||
values.Set("SignatureMethod", "HmacSHA256")
|
||||
values.Set("SignatureVersion", "2")
|
||||
values.Set("Timestamp", now.UTC().Format("2006-01-02T15:04:05"))
|
||||
sigPath := fmt.Sprintf("%s\napi.hbdm.com\n/%s\n%s",
|
||||
method, endpoint, values.Encode())
|
||||
headers := make(map[string]string)
|
||||
if method == http.MethodGet {
|
||||
headers["Content-Type"] = "application/x-www-form-urlencoded"
|
||||
} else {
|
||||
headers["Content-Type"] = "application/json"
|
||||
}
|
||||
hmac := crypto.GetHMAC(crypto.HashSHA256, []byte(sigPath), []byte(h.API.Credentials.Secret))
|
||||
sigValues := url.Values{}
|
||||
sigValues.Add("Signature", crypto.Base64Encode(hmac))
|
||||
urlPath :=
|
||||
common.EncodeURLValues(ePoint+endpoint, values) + "&" + sigValues.Encode()
|
||||
var body io.Reader
|
||||
var payload []byte
|
||||
if data != nil {
|
||||
payload, err = json.Marshal(data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
body = bytes.NewBuffer(payload)
|
||||
}
|
||||
|
||||
return &request.Item{
|
||||
Method: method,
|
||||
Path: urlPath,
|
||||
Headers: headers,
|
||||
Body: body,
|
||||
Result: &tempResp,
|
||||
AuthRequest: true,
|
||||
Verbose: h.Verbose,
|
||||
HTTPDebugging: h.HTTPDebugging,
|
||||
HTTPRecording: h.HTTPRecording,
|
||||
}, nil
|
||||
}
|
||||
|
||||
err = h.SendPayload(context.Background(), request.Unset, newRequest)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var errCap errorCapture
|
||||
if err := json.Unmarshal(tempResp, &errCap); err == nil {
|
||||
if errCap.Code != 200 && errCap.ErrMsg != "" {
|
||||
return errors.New(errCap.ErrMsg)
|
||||
|
||||
Reference in New Issue
Block a user