mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-05 07:26:47 +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:
@@ -18,7 +18,6 @@ import (
|
||||
exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/order"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/request"
|
||||
"github.com/thrasher-corp/gocryptotrader/log"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -686,13 +685,18 @@ func (c *CoinbasePro) SendHTTPRequest(ep exchange.URL, path string, result inter
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return c.SendPayload(context.Background(), &request.Item{
|
||||
|
||||
item := &request.Item{
|
||||
Method: http.MethodGet,
|
||||
Path: endpoint + path,
|
||||
Result: result,
|
||||
Verbose: c.Verbose,
|
||||
HTTPDebugging: c.HTTPDebugging,
|
||||
HTTPRecording: c.HTTPRecording,
|
||||
}
|
||||
|
||||
return c.SendPayload(context.Background(), request.Unset, func() (*request.Item, error) {
|
||||
return item, nil
|
||||
})
|
||||
}
|
||||
|
||||
@@ -705,44 +709,40 @@ func (c *CoinbasePro) SendAuthenticatedHTTPRequest(ep exchange.URL, method, path
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
payload := []byte("")
|
||||
|
||||
if params != nil {
|
||||
payload, err = json.Marshal(params)
|
||||
if err != nil {
|
||||
return errors.New("sendAuthenticatedHTTPRequest: Unable to JSON request")
|
||||
newRequest := func() (*request.Item, error) {
|
||||
payload := []byte("")
|
||||
if params != nil {
|
||||
payload, err = json.Marshal(params)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
if c.Verbose {
|
||||
log.Debugf(log.ExchangeSys, "Request JSON: %s\n", payload)
|
||||
}
|
||||
now := time.Now()
|
||||
n := strconv.FormatInt(now.Unix(), 10)
|
||||
message := n + method + "/" + path + string(payload)
|
||||
hmac := crypto.GetHMAC(crypto.HashSHA256, []byte(message), []byte(c.API.Credentials.Secret))
|
||||
headers := make(map[string]string)
|
||||
headers["CB-ACCESS-SIGN"] = crypto.Base64Encode(hmac)
|
||||
headers["CB-ACCESS-TIMESTAMP"] = n
|
||||
headers["CB-ACCESS-KEY"] = c.API.Credentials.Key
|
||||
headers["CB-ACCESS-PASSPHRASE"] = c.API.Credentials.ClientID
|
||||
headers["Content-Type"] = "application/json"
|
||||
|
||||
return &request.Item{
|
||||
Method: method,
|
||||
Path: endpoint + path,
|
||||
Headers: headers,
|
||||
Body: bytes.NewBuffer(payload),
|
||||
Result: result,
|
||||
AuthRequest: true,
|
||||
Verbose: c.Verbose,
|
||||
HTTPDebugging: c.HTTPDebugging,
|
||||
HTTPRecording: c.HTTPRecording,
|
||||
}, nil
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
n := strconv.FormatInt(now.Unix(), 10)
|
||||
message := n + method + "/" + path + string(payload)
|
||||
hmac := crypto.GetHMAC(crypto.HashSHA256, []byte(message), []byte(c.API.Credentials.Secret))
|
||||
headers := make(map[string]string)
|
||||
headers["CB-ACCESS-SIGN"] = crypto.Base64Encode(hmac)
|
||||
headers["CB-ACCESS-TIMESTAMP"] = n
|
||||
headers["CB-ACCESS-KEY"] = c.API.Credentials.Key
|
||||
headers["CB-ACCESS-PASSPHRASE"] = c.API.Credentials.ClientID
|
||||
headers["Content-Type"] = "application/json"
|
||||
|
||||
// Timestamp must be within 30 seconds of the api service time
|
||||
ctx, cancel := context.WithDeadline(context.Background(), now.Add(30*time.Second))
|
||||
defer cancel()
|
||||
return c.SendPayload(ctx, &request.Item{
|
||||
Method: method,
|
||||
Path: endpoint + path,
|
||||
Headers: headers,
|
||||
Body: bytes.NewBuffer(payload),
|
||||
Result: result,
|
||||
AuthRequest: true,
|
||||
Verbose: c.Verbose,
|
||||
HTTPDebugging: c.HTTPDebugging,
|
||||
HTTPRecording: c.HTTPRecording,
|
||||
})
|
||||
return c.SendPayload(context.Background(), request.Unset, newRequest)
|
||||
}
|
||||
|
||||
// GetFee returns an estimate of fee based on type of transaction
|
||||
|
||||
Reference in New Issue
Block a user