golangci-lint/CI: Bump versions and introduce new linters (thrasher-c…

…orp#798) * golangci-lint/CI: Bump versions Fix remaining linter issues * Specifically set AppVeyor version * Fix the infamous typos 👀 * Add go env cmd to AppVeyor * Add go version cmd to AppVeyor * Specify AppVeyor image, adjust linters * Update go get to go install due to deprecation * Bump golangci-lint timeout time for AppVeyor * Change NW contract to NQ * Address nitters * GetRandomPair -> Pair{} * Address nits * Address time nitterinos plus additional tweaks * More time inception upgrades! * Bending time and space
CryptoXBot · Oct 14, 2021 · f0d45aa · f0d45aa
1 parent 0a91af0
commit f0d45aa
Show file tree

Hide file tree

Showing 194 changed files with 1,507 additions and 1,234 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,5 +1,7 @@
 build: off
 
+image: Visual Studio 2019
+
 clone_folder: c:\gopath\src\github.com\thrasher-corp\gocryptotrader
 
 cache:
@@ -26,7 +28,7 @@ environment:
   PSQL_SSLMODE: disable
   PSQL_SKIPSQLCMD: true
   PSQL_TESTDBNAME: gct_dev_ci
-stack: go 1.16.x
+stack: go 1.17.x
 
 services:
   - postgresql96
@@ -45,11 +47,13 @@ build_script:
 
 before_test:
   - cd c:\gopath\src\github.com\thrasher-corp\gocryptotrader
-  - go get
+  - go env
+  - go version
+  - go install
 
 test_script:
   # test back-end
-  - go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0
+  - go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.1
   - '%GOPATH%\bin\golangci-lint.exe run --verbose'
   - ps: >-
       if($env:APPVEYOR_SCHEDULED_BUILD -eq 'true') {

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -9,4 +9,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.31
+          version: v1.42.1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,7 +1,7 @@
 on: [push, pull_request]
 name: CI
 env:
-  GO_VERSION: 1.16.x
+  GO_VERSION: 1.17.x
 jobs:
   backend-psql:
     name: GoCryptoTrader back-end with PSQL

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  timeout: 2m30s
+  timeout: 3m
   issues-exit-code: 1
   tests: true
   skip-dirs:
@@ -25,11 +25,18 @@ linters:
 # disabled by default linters
     - asciicheck
     - bodyclose
+#   - cyclop
     - depguard
     - dogsled
 #   - dupl
+    - durationcheck
+    - errname
+#   - errorlint
 #   - exhaustive
+#   - exhaustivestruct
     - exportloopref
+#   - forbidigo
+    - forcetypeassert
 #   - funlen
     - gci
 #   - gochecknoglobals
@@ -43,31 +50,45 @@ linters:
 #   - goerr113
     - gofmt
 #   - gofumpt
-    - goheader
+#   - goheader
     - goimports
-    - golint
+#   - golint // deprecated since 1.41.0, replaced by revive
 #   - gomnd
+    - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec
-#   - interfacer
-#   - lll
+    - ifshort
+#   - importas
+#   - interfacer // deprecated by its owner
+#   - lll 
+    - makezero
 #   - maligned
     - misspell
     - nakedret
 #   - nestif
+    - nilerr
 #   - nlreturn
     - noctx
     - nolintlint
+#   - paralleltest
 #   - prealloc
+    - predeclared
+#   - promlinter
+    - revive
     - rowserrcheck
-    - scopelint
-    - sqlclosecheck
+#   - scopelint // deprecated since v1.39.0, replaced by exportloopref
+#   - sqlclosecheck
     - stylecheck
+#   - tagliatelle
 #   - testpackage
+    - thelper
+    - tparallel
     - unconvert
     - unparam
+    - wastedassign
     - whitespace
+#   - wrapcheck
 #   - wsl
 
 linters-settings:

diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
       dist: xenial
       name: 'GoCryptoTrader [back-end] [linux] [64-bit]'
       go:
-        - 1.15.x
+        - 1.17.x
       env:
         - GO111MODULE=on
         - PSQL_USER=postgres
@@ -43,7 +43,7 @@ matrix:
       dist: xenial
       name: 'GoCryptoTrader [back-end] [linux] [32-bit]'
       go:
-        - 1.15.x
+        - 1.17.x
       env:
         - GO111MODULE=on
         - NO_RACE_TEST=1
@@ -72,7 +72,7 @@ matrix:
       os: osx
       name: 'GoCryptoTrader [back-end] [darwin]'
       go:
-        - 1.15.x
+        - 1.17.x
       env:
         - GO111MODULE=on
         - PSQL_USER=postgres

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15 as build
+FROM golang:1.17 as build
 WORKDIR /go/src/github.com/thrasher-corp/gocryptotrader
 COPY . .
 RUN GO111MODULE=on go mod vendor

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 LDFLAGS = -ldflags "-w -s"
 GCTPKG = github.com/thrasher-corp/gocryptotrader
-LINTPKG = github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0
+LINTPKG = github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.1
 LINTBIN = $(GOPATH)/bin/golangci-lint
 GCTLISTENPORT=9050
 GCTPROFILERLISTENPORT=8085
@@ -14,11 +14,11 @@ CONFIG_FLAG = $(if $(CONFIG),-config $(CONFIG),)
 all: check build
 
 get:
-	GO111MODULE=on go get $(GCTPKG)
+	go install $(GCTPKG)
 
 linter:
-	GO111MODULE=on go get $(GCTPKG)
-	GO111MODULE=on go get $(LINTPKG)
+	go install $(GCTPKG)
+	go install $(LINTPKG)
 	test -z "$$($(LINTBIN) run --verbose | tee /dev/stderr)"
 
 check: linter test
@@ -31,19 +31,19 @@ else
 endif
 
 build:
-	GO111MODULE=on go build $(LDFLAGS)
+	go build $(LDFLAGS)
 
 install:
-	GO111MODULE=on go install $(LDFLAGS)
+	go install $(LDFLAGS)
 
 fmt:
 	gofmt -l -w -s $(shell find . -type f -name '*.go')
 
 update_deps:
-	GO111MODULE=on go mod verify
-	GO111MODULE=on go mod tidy
+	go mod verify
+	go mod tidy
 	rm -rf vendor
-	GO111MODULE=on go mod vendor
+	go mod vendor
 
 .PHONY: profile_heap
 profile_heap:

diff --git a/backtester/config/config_test.go b/backtester/config/config_test.go
@@ -1208,8 +1208,7 @@ func TestValidate(t *testing.T) {
 			},
 		},
 	}
-	err := c.Validate()
-	if !errors.Is(err, nil) {
+	if err := c.Validate(); !errors.Is(err, nil) {
 		t.Errorf("received %v expected %v", err, nil)
 	}
 }
diff --git a/backtester/config/configbuilder/main.go b/backtester/config/configbuilder/main.go
@@ -399,8 +399,7 @@ func parseDatabase(reader *bufio.Reader, cfg *config.Config) error {
 	}
 
 	fmt.Printf("What is the end date? Leave blank for \"%v\"\n", defaultStart.Format(gctcommon.SimpleTimeFormat))
-	endDate := quickParse(reader)
-	if endDate != "" {
+	if endDate := quickParse(reader); endDate != "" {
 		cfg.DataSettings.DatabaseData.EndDate, err = time.Parse(endDate, gctcommon.SimpleTimeFormat)
 		if err != nil {
 			return err

diff --git a/backtester/data/data_test.go b/backtester/data/data_test.go
@@ -19,8 +19,7 @@ type fakeDataHandler struct {
 func TestBaseDataFunctions(t *testing.T) {
 	t.Parallel()
 	var d Base
-	latest := d.Latest()
-	if latest != nil {
+	if latest := d.Latest(); latest != nil {
 		t.Error("expected nil")
 	}
 	d.Next()
@@ -37,17 +36,14 @@ func TestBaseDataFunctions(t *testing.T) {
 	if o != 0 {
 		t.Error("expected 0")
 	}
-	list := d.List()
-	if list != nil {
+	if list := d.List(); list != nil {
 		t.Error("expected nil")
 	}
-	history := d.History()
-	if history != nil {
+	if history := d.History(); history != nil {
 		t.Error("expected nil")
 	}
 	d.SetStream(nil)
-	st := d.GetStream()
-	if st != nil {
+	if st := d.GetStream(); st != nil {
 		t.Error("expected nil")
 	}
 	d.Reset()
@@ -91,24 +87,24 @@ func TestStream(t *testing.T) {
 
 	d.SortStream()
 
-	f = d.Next().(fakeDataHandler)
-	if f.time != 1 {
+	f, ok := d.Next().(fakeDataHandler)
+	if f.time != 1 || !ok {
 		t.Error("expected 1")
 	}
-	f = d.Next().(fakeDataHandler)
-	if f.time != 2 {
+	f, ok = d.Next().(fakeDataHandler)
+	if f.time != 2 || !ok {
 		t.Error("expected 2")
 	}
-	f = d.Next().(fakeDataHandler)
-	if f.time != 4 {
+	f, ok = d.Next().(fakeDataHandler)
+	if f.time != 4 || !ok {
 		t.Error("expected 4")
 	}
-	f = d.Next().(fakeDataHandler)
-	if f.time != 10 {
+	f, ok = d.Next().(fakeDataHandler)
+	if f.time != 10 || !ok {
 		t.Error("expected 10")
 	}
-	f = d.Next().(fakeDataHandler)
-	if f.time != 20 {
+	f, ok = d.Next().(fakeDataHandler)
+	if f.time != 20 || !ok {
 		t.Error("expected 20")
 	}
 }

diff --git a/backtester/data/kline/kline_test.go b/backtester/data/kline/kline_test.go
@@ -81,8 +81,7 @@ func TestHasDataAtTime(t *testing.T) {
 			},
 		},
 	}
-	err := d.Load()
-	if err != nil {
+	if err := d.Load(); err != nil {
 		t.Error(err)
 	}
 

diff --git a/backtester/eventhandlers/eventholder/eventholder_test.go b/backtester/eventhandlers/eventholder/eventholder_test.go
@@ -28,8 +28,7 @@ func TestAppendEvent(t *testing.T) {
 func TestNextEvent(t *testing.T) {
 	t.Parallel()
 	e := Holder{Queue: []common.EventHandler{}}
-	ev := e.NextEvent()
-	if ev != nil {
+	if ev := e.NextEvent(); ev != nil {
 		t.Error("expected not ok")
 	}
 

diff --git a/backtester/eventhandlers/portfolio/holdings/holdings.go b/backtester/eventhandlers/portfolio/holdings/holdings.go
@@ -58,8 +58,7 @@ func (h *Holding) HasFunds() bool {
 
 func (h *Holding) update(e fill.Event, f funding.IPairReader) {
 	direction := e.GetDirection()
-	o := e.GetOrder()
-	if o != nil {
+	if o := e.GetOrder(); o != nil {
 		amount := decimal.NewFromFloat(o.Amount)
 		fee := decimal.NewFromFloat(o.Fee)
 		price := decimal.NewFromFloat(o.Price)

diff --git a/backtester/eventhandlers/portfolio/holdings/holdings_test.go b/backtester/eventhandlers/portfolio/holdings/holdings_test.go
@@ -60,7 +60,7 @@ func TestUpdate(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	t1 := h.Timestamp
+	t1 := h.Timestamp // nolint:ifshort,nolintlint // false positive and triggers only on Windows
 	h.Update(&fill.Fill{
 		Base: event.Base{
 			Time: time.Now(),

diff --git a/backtester/eventhandlers/portfolio/portfolio.go b/backtester/eventhandlers/portfolio/portfolio.go
@@ -262,8 +262,7 @@ func (p *Portfolio) addComplianceSnapshot(fillEvent fill.Event) error {
 		return err
 	}
 	prevSnap := complianceManager.GetLatestSnapshot()
-	fo := fillEvent.GetOrder()
-	if fo != nil {
+	if fo := fillEvent.GetOrder(); fo != nil {
 		price := decimal.NewFromFloat(fo.Price)
 		amount := decimal.NewFromFloat(fo.Amount)
 		fee := decimal.NewFromFloat(fo.Fee)

diff --git a/backtester/eventhandlers/statistics/statistics_test.go b/backtester/eventhandlers/statistics/statistics_test.go
@@ -376,8 +376,7 @@ func TestAddComplianceSnapshotForTime(t *testing.T) {
 func TestSerialise(t *testing.T) {
 	t.Parallel()
 	s := Statistic{}
-	_, err := s.Serialise()
-	if err != nil {
+	if _, err := s.Serialise(); err != nil {
 		t.Error(err)
 	}
 }

diff --git a/backtester/eventhandlers/strategies/dollarcostaverage/dollarcostaverage_test.go b/backtester/eventhandlers/strategies/dollarcostaverage/dollarcostaverage_test.go
@@ -21,8 +21,7 @@ import (
 
 func TestName(t *testing.T) {
 	d := Strategy{}
-	n := d.Name()
-	if n != Name {
+	if n := d.Name(); n != Name {
 		t.Errorf("expected %v", Name)
 	}
 }

diff --git a/backtester/eventhandlers/strategies/rsi/rsi.go b/backtester/eventhandlers/strategies/rsi/rsi.go
@@ -55,9 +55,8 @@ func (s *Strategy) OnSignal(d data.Handler, _ funding.IFundTransferer) (signal.E
 		return nil, err
 	}
 	es.SetPrice(d.Latest().ClosePrice())
-	offset := d.Offset()
 
-	if offset <= int(s.rsiPeriod.IntPart()) {
+	if offset := d.Offset(); offset <= int(s.rsiPeriod.IntPart()) {
 		es.AppendReason("Not enough data for signal generation")
 		es.SetDirection(common.DoNothing)
 		return &es, nil

diff --git a/backtester/eventhandlers/strategies/rsi/rsi_test.go b/backtester/eventhandlers/strategies/rsi/rsi_test.go
@@ -22,8 +22,7 @@ import (
 func TestName(t *testing.T) {
 	t.Parallel()
 	d := Strategy{}
-	n := d.Name()
-	if n != Name {
+	if n := d.Name(); n != Name {
 		t.Errorf("expected %v", Name)
 	}
 }