d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-30 07:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linter fixes (#246)

Browse Source 
Linter fixes
This commit is contained in:
Adrian Gallagher
2019-02-05 16:26:04 +11:00
committed by GitHub
parent d7368c1a8d
commit 5e5ca8a887
85 changed files with 641 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
exchanges/request/request.go
View File

@@ -16,7 +16,8 @@ import (
log "github.com/thrasher-/gocryptotrader/logger"
)
var supportedMethods = []string{"GET", "POST", "HEAD", "PUT", "DELETE", "OPTIONS", "CONNECT"}
var supportedMethods = []string{http.MethodGet, http.MethodPost, http.MethodHead,
http.MethodPut, http.MethodDelete, http.MethodOptions, http.MethodConnect}
const (
maxRequestJobs = 50
@@ -256,10 +257,10 @@ func (r *Requester) checkRequest(method, path string, body io.Reader, headers ma
}
// DoRequest performs a HTTP/HTTPS request with the supplied params
func (r *Requester) DoRequest(req *http.Request, method, path string, headers map[string]string, body io.Reader, result interface{}, authRequest, verbose bool) error {
func (r *Requester) DoRequest(req *http.Request, path string, body io.Reader, result interface{}, authRequest, verbose bool) error {
if verbose {
log.Debugf("%s exchange request path: %s requires rate limiter: %v", r.Name, path, r.RequiresRateLimiter())
for k, d := range headers {
for k, d := range req.Header {
log.Debugf("%s exchange request header [%s]: %s", r.Name, k, d)
}
log.Debug(body)
@@ -353,7 +354,7 @@ func (r *Requester) worker() {
if !r.IsRateLimited(x.AuthRequest) {
r.IncrementRequests(x.AuthRequest)
err := r.DoRequest(x.Request, x.Method, x.Path, x.Headers, x.Body, x.Result, x.AuthRequest, x.Verbose)
err := r.DoRequest(x.Request, x.Path, x.Body, x.Result, x.AuthRequest, x.Verbose)
x.JobResult <- &JobResult{
Error: err,
Result: x.Result,
@@ -374,7 +375,7 @@ func (r *Requester) worker() {
log.Debugf("%s request. No longer rate limited! Doing request", r.Name)
}
err := r.DoRequest(x.Request, x.Method, x.Path, x.Headers, x.Body, x.Result, x.AuthRequest, x.Verbose)
err := r.DoRequest(x.Request, x.Path, x.Body, x.Result, x.AuthRequest, x.Verbose)
x.JobResult <- &JobResult{
Error: err,
Result: x.Result,
@@ -407,7 +408,7 @@ func (r *Requester) SendPayload(method, path string, headers map[string]string,
}
if !r.RequiresRateLimiter() {
return r.DoRequest(req, method, path, headers, body, result, authRequest, verbose)
return r.DoRequest(req, path, body, result, authRequest, verbose)
}
if len(r.Jobs) == maxRequestJobs {

20
exchanges/request/request_test.go
View File

@@ -200,7 +200,7 @@ func TestCheckRequest(t *testing.T) {
func TestDoRequest(t *testing.T) {
var test *Requester
err := test.SendPayload("GET", "https://www.google.com", nil, nil, nil, false, true)
err := test.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, nil, false, true)
if err == nil {
t.Fatal("not iniitalised")
}
@@ -216,12 +216,12 @@ func TestDoRequest(t *testing.T) {
t.Fatal("unexpected values")
}
err = r.SendPayload("GET", "", nil, nil, nil, false, true)
err = r.SendPayload(http.MethodGet, "", nil, nil, nil, false, true)
if err == nil {
t.Fatal("unexpected values")
}
err = r.SendPayload("GET", "https://www.google.com", nil, nil, nil, false, true)
err = r.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, nil, false, true)
if err != nil {
t.Fatal("unexpected values")
}
@@ -233,7 +233,7 @@ func TestDoRequest(t *testing.T) {
r.SetRateLimit(false, time.Second, 0)
r.SetRateLimit(true, time.Second, 0)
err = r.SendPayload("GET", "https://www.google.com", nil, nil, nil, false, true)
err = r.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, nil, false, true)
if err != nil {
t.Fatal("unexpected values")
}
@@ -250,7 +250,7 @@ func TestDoRequest(t *testing.T) {
t.Fatal("unexepcted values")
}
err = r.SendPayload("GET", "https://www.google.com", nil, nil, nil, false, true)
err = r.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, nil, false, true)
if err != nil {
t.Fatal("unexpected values")
}
@@ -261,27 +261,27 @@ func TestDoRequest(t *testing.T) {
t.Fatal("unexepcted values")
}
err = r.SendPayload("GET", "https://www.google.com", nil, nil, nil, true, true)
err = r.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, nil, true, true)
if err != nil {
t.Fatal("unexpected values")
}
var result interface{}
err = r.SendPayload("GET", "https://www.google.com", nil, nil, result, false, true)
err = r.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, result, false, true)
if err != nil {
t.Fatal(err)
}
headers := make(map[string]string)
headers["content-type"] = "content/text"
err = r.SendPayload("POST", "https://bitfinex.com", headers, nil, result, false, true)
err = r.SendPayload(http.MethodPost, "https://bitfinex.com", headers, nil, result, false, true)
if err != nil {
t.Fatal(err)
}
r.StartCycle()
r.UnauthLimit.SetRequests(100)
err = r.SendPayload("GET", "https://www.google.com", nil, nil, result, false, false)
err = r.SendPayload(http.MethodGet, "https://www.google.com", nil, nil, result, false, false)
if err != nil {
t.Fatal("unexpected values")
}
@@ -297,7 +297,7 @@ func TestDoRequest(t *testing.T) {
}
r.HTTPClient.Timeout = 1 * time.Second
err = r.SendPayload("POST", "https://httpstat.us/200?sleep=20000", nil, nil, nil, false, true)
err = r.SendPayload(http.MethodPost, "https://httpstat.us/200?sleep=20000", nil, nil, nil, false, true)
if err == nil {
t.Fatal(err)
}