linters: Add modernise tool check and fix issues (#2012)

* linters: Add modernise tool check and fix issues

* engine: Simplify exch.SetDefaults call and remove localWG

* CI: Revert config versions lint workflow

Author: thrasher-

.github/workflows/config-versions-lint.yml

@@ -13,4 +13,4 @@ jobs:
       with:
         go-version: ${{ env.GO_VERSION }}
     - name: Check config versions are continuous
-      run: go test ./config/versions/ -tags config_versions -run Continuity
+      run: go test ./config/versions/ -tags config_versions -run Continuity

.github/workflows/configs-json-lint.yml

@@ -6,6 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+          go-version: 1.25.x
+          
     - name: Check for currency.NewPair(BTC, USD) used instead of currency.NewBTCUSD
       run: |
         grep -r -n --color=always -E "currency.NewPair\(currency.BTC, currency.USDT?\)" * || exit 0
@@ -62,4 +67,24 @@ jobs:
         grep -r -n -I --color=always --exclude-dir=.git -P "$PATTERN" . || exit 0
         echo "::error::Remove zero-width/format, separator or combining-mark characters"
         exit 1
+        
+    - name: Check configs JSON format
+      run: |
+        files=("config_example.json" "testdata/configtest.json")
+        for file in "${files[@]}"; do
+          processed_file="${file%.*}_processed.${file##*.}"
+          jq '.exchanges |= sort_by(.name)' --indent 1 $file > $processed_file
+          if ! diff $file $processed_file; then
+            echo "jq differences found in $file! Please run 'make lint_configs'"
+            exit 1
+          else
+            rm $processed_file
+            echo "No differences found in $file 🌞"
+          fi
+        done
+        
+    - name: Check Go modernise tool issues
+      run: |
+        go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -test ./...
+    
 

.github/workflows/misc.yml

@@ -11,7 +11,7 @@ DRIVER ?= psql
 RACE_FLAG := $(if $(NO_RACE_TEST),,-race)
 CONFIG_FLAG = $(if $(CONFIG),-config $(CONFIG),)
 
-.PHONY: all lint lint_docker check test build install fmt gofumpt update_deps
+.PHONY: all lint lint_docker check test build install fmt gofumpt update_deps modernise
 
 all: check build
 
@@ -41,6 +41,10 @@ gofumpt:
 	@command -v gofumpt >/dev/null 2>&1 || go install mvdan.cc/gofumpt@latest
 	$(GOFUMPTBIN) -l -w $(GO_FILES_TO_FORMAT)
 
+modernise:
+	@command -v modernize >/dev/null 2>&1 || go install golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest
+	modernize -test ./...
+
 update_deps:
 	go mod verify
 	go mod tidy

Makefile

@@ -81,25 +81,20 @@ func (bt *BackTest) RunLive() error {
 	if bt.LiveDataHandler == nil {
 		return errLiveOnly
 	}
-	var err error
 	if bt.LiveDataHandler.IsRealOrders() {
-		err = bt.LiveDataHandler.UpdateFunding(false)
-		if err != nil {
+		if err := bt.LiveDataHandler.UpdateFunding(false); err != nil {
 			return err
 		}
 	}
-	err = bt.LiveDataHandler.Start()
-	if err != nil {
+	if err := bt.LiveDataHandler.Start(); err != nil {
 		return err
 	}
-	bt.wg.Add(1)
-	go func() {
-		err = bt.liveCheck()
-		if err != nil {
+
+	bt.wg.Go(func() {
+		if err := bt.liveCheck(); err != nil {
 			log.Errorln(common.LiveStrategy, err)
 		}
-		bt.wg.Done()
-	}()
+	})
 
 	return nil
 }

backtester/engine/backtest.go

@@ -1321,37 +1321,27 @@ func TestLiveLoop(t *testing.T) {
 
 	// dataUpdated case
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		err = bt.liveCheck()
-		assert.NoError(t, err)
-
-		wg.Done()
-	}()
+	wg.Go(func() {
+		assert.NoError(t, bt.liveCheck())
+	})
 	dc.dataUpdated <- true
 	dc.shutdown <- true
 	wg.Wait()
 
 	// shutdown from error case
-	wg.Add(1)
 	dc.started = 0
-	go func() {
-		defer wg.Done()
-		err = bt.liveCheck()
-		assert.NoError(t, err)
-	}()
+	wg.Go(func() {
+		assert.NoError(t, bt.liveCheck())
+	})
 	dc.shutdownErr <- true
 	wg.Wait()
 
 	// shutdown case
 	dc.started = 1
 	bt.shutdown = make(chan struct{})
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		err = bt.liveCheck()
-		assert.NoError(t, err)
-	}()
+	wg.Go(func() {
+		assert.NoError(t, bt.liveCheck())
+	})
 	dc.shutdown <- true
 	wg.Wait()
 

backtester/engine/backtest_test.go

@@ -135,12 +135,9 @@ func TestLiveHandlerStopFromError(t *testing.T) {
 
 	dc.started = 1
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		err = dc.SignalStopFromError(errNoCredsNoLive)
-		assert.NoError(t, err)
-	}()
+	wg.Go(func() {
+		assert.NoError(t, dc.SignalStopFromError(errNoCredsNoLive))
+	})
 	wg.Wait()
 
 	var dh *dataChecker
@@ -177,19 +174,15 @@ func TestUpdated(t *testing.T) {
 		dataUpdated: make(chan bool, 10),
 	}
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		_ = dc.Updated()
-		wg.Done()
-	}()
+	})
 	wg.Wait()
 
 	dc = nil
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		_ = dc.Updated()
-		wg.Done()
-	}()
+	})
 	wg.Wait()
 }
 

backtester/engine/live_test.go

@@ -34,13 +34,11 @@ func main() {
 	var wg sync.WaitGroup
 	for i := range exchange.Exchanges {
 		name := exchange.Exchanges[i]
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			if err := engine.Bot.LoadExchange(name); err != nil {
 				log.Printf("Failed to load exchange %s. Err: %s", name, err)
 			}
-		}()
+		})
 	}
 	wg.Wait()
 	log.Println("Done.")

cmd/exchange_wrapper_coverage/main.go

@@ -74,13 +74,11 @@ func main() {
 			wrapperConfig.Exchanges[strings.ToLower(name)] = &config.APICredentialsConfig{}
 		}
 		if shouldLoadExchange(name) {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				if err = bot.LoadExchange(name); err != nil {
 					log.Printf("Failed to load exchange %s. Err: %s", name, err)
 				}
-			}()
+			})
 		}
 	}
 	wg.Wait()

cmd/exchange_wrapper_issues/main.go

@@ -179,14 +179,22 @@ Run the following after completing changes:
 
 This ensures proper formatting across the codebase.
 
-## Linters
+## Linters and other miscellaneous checks
 
 Run the following to check for linting issues:
 
 ```console
     golangci-lint run ./... (or make lint)
 ```
 
+Run the following tool to check for Go modernise issues:
+
+```console
+    make modernise
+```
+
+Several other miscellaneous checks will be ran via [GitHub actions](/.github/workflows/misc.yml).
+
 - All lint warnings and errors must be resolved before merging.
 - Use `//nolint:linter-name` sparingly and always explain the reason in a comment next to the code.
 - Examples of valid use: