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

.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

@@ -1,24 +0,0 @@
-name: configs-json-lint
-on: [push, pull_request]
-
-jobs:
-  lint:
-    name: configs JSON lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-
-      - 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

.github/workflows/misc.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 ./...
+    
 

Makefile

@@ -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

backtester/engine/backtest.go

@@ -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 := bt.LiveDataHandler.UpdateFunding(false); err != nil {
-		if err != nil {
 			return err
 		}
 	}
-	err = bt.LiveDataHandler.Start()
+	if err := bt.LiveDataHandler.Start(); err != nil {
-	if err != nil {
 		return err
 	}
-	bt.wg.Add(1)
+
-	go func() {
+	bt.wg.Go(func() {
-		err = bt.liveCheck()
+		if err := bt.liveCheck(); err != nil {
-		if err != nil {
 			log.Errorln(common.LiveStrategy, err)
 		}
-		bt.wg.Done()
+	})
-	}()
 
 	return nil
 }

backtester/engine/backtest_test.go

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

backtester/engine/live_test.go

@@ -135,12 +135,9 @@ func TestLiveHandlerStopFromError(t *testing.T) {
 
 	dc.started = 1
 	var wg sync.WaitGroup
-	wg.Add(1)
+	wg.Go(func() {
-	go func() {
+		assert.NoError(t, dc.SignalStopFromError(errNoCredsNoLive))
-		defer wg.Done()
+	})
-		err = dc.SignalStopFromError(errNoCredsNoLive)
-		assert.NoError(t, err)
-	}()
 	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)
+	wg.Go(func() {
-	go func() {
 		_ = dc.Updated()
-		wg.Done()
+	})
-	}()
 	wg.Wait()
 
 	dc = nil
-	wg.Add(1)
+	wg.Go(func() {
-	go func() {
 		_ = dc.Updated()
-		wg.Done()
+	})
-	}()
 	wg.Wait()
 }
 

cmd/exchange_wrapper_coverage/main.go

@@ -34,13 +34,11 @@ func main() {
 	var wg sync.WaitGroup
 	for i := range exchange.Exchanges {
 		name := exchange.Exchanges[i]
-		wg.Add(1)
+		wg.Go(func() {
-		go func() {
-			defer wg.Done()
 			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_issues/main.go

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

docs/CODING_GUIDELINES.md

@@ -179,7 +179,7 @@ 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:
 
@@ -187,6 +187,14 @@ Run the following to check for linting issues:
     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:

engine/apiserver.go

@@ -180,9 +180,7 @@ func (m *apiServerManager) StartRESTServer() error {
 			ReadHeaderTimeout: time.Minute,
 		}
 	}
-	m.wgRest.Add(1)
+	m.wgRest.Go(func() {
-	go func() {
-		defer m.wgRest.Done()
 		err := m.restHTTPServer.ListenAndServe()
 		if err != nil {
 			atomic.StoreInt32(&m.restStarted, 0)
@@ -190,7 +188,7 @@ func (m *apiServerManager) StartRESTServer() error {
 				log.Errorln(log.APIServerMgr, err)
 			}
 		}
-	}()
+	})
 	return nil
 }
 
@@ -422,9 +420,7 @@ func (m *apiServerManager) StartWebsocketServer() error {
 		}
 	}
 
-	m.wgWebsocket.Add(1)
+	m.wgWebsocket.Go(func() {
-	go func() {
-		defer m.wgWebsocket.Done()
 		err := m.websocketHTTPServer.ListenAndServe()
 		if err != nil {
 			atomic.StoreInt32(&m.websocketStarted, 0)
@@ -432,7 +428,7 @@ func (m *apiServerManager) StartWebsocketServer() error {
 				log.Errorln(log.APIServerMgr, err)
 			}
 		}
-	}()
+	})
 	return nil
 }
 

engine/engine.go

@@ -731,12 +731,8 @@ func (bot *Engine) LoadExchange(name string) error {
 		return ErrExchangeFailedToLoad
 	}
 
-	var localWG sync.WaitGroup
+	exch.SetDefaults()
-	localWG.Add(1)
+
-	go func() {
-		exch.SetDefaults()
-		localWG.Done()
-	}()
 	exchCfg, err := bot.Config.GetExchangeConfig(name)
 	if err != nil {
 		return err
@@ -789,7 +785,6 @@ func (bot *Engine) LoadExchange(name string) error {
 		exchCfg.HTTPDebugging = bot.Settings.EnableExchangeHTTPDebugging
 	}
 
-	localWG.Wait()
 	if !bot.Settings.EnableExchangeHTTPRateLimiter {
 		err = exch.DisableRateLimiter()
 		if err != nil {

engine/websocketroutine_manager.go

@@ -134,19 +134,15 @@ func (m *WebsocketRoutineManager) websocketRoutine() {
 			continue
 		}
 
-		wg.Add(1)
+		wg.Go(func() {
-		go func() {
+			if err := m.websocketDataReceiver(ws); err != nil {
-			defer wg.Done()
-			err = m.websocketDataReceiver(ws)
-			if err != nil {
 				log.Errorf(log.WebsocketMgr, "%v", err)
 			}
 
-			err = ws.Connect()
+			if err := ws.Connect(); err != nil {
-			if err != nil {
 				log.Errorf(log.WebsocketMgr, "%v", err)
 			}
-		}()
+		})
 	}
 	wg.Wait()
 }
@@ -166,9 +162,7 @@ func (m *WebsocketRoutineManager) websocketDataReceiver(ws *websocket.Manager) e
 		return errRoutineManagerNotStarted
 	}
 
-	m.wg.Add(1)
+	m.wg.Go(func() {
-	go func() {
-		defer m.wg.Done()
 		for {
 			select {
 			case <-m.shutdown:
@@ -187,7 +181,7 @@ func (m *WebsocketRoutineManager) websocketDataReceiver(ws *websocket.Manager) e
 				m.mu.RUnlock()
 			}
 		}
-	}()
+	})
 	return nil
 }
 

exchange/websocket/connection.go

@@ -233,9 +233,7 @@ func (c *connection) SetupPingHandler(epl request.EndpointLimit, handler PingHan
 		})
 		return
 	}
-	c.Wg.Add(1)
+	c.Wg.Go(func() {
-	go func() {
-		defer c.Wg.Done()
 		ticker := time.NewTicker(handler.Delay)
 		for {
 			select {
@@ -250,7 +248,7 @@ func (c *connection) SetupPingHandler(epl request.EndpointLimit, handler PingHan
 				}
 			}
 		}
-	}()
+	})
 }
 
 // setConnectedStatus sets connection status if changed it will return true.

exchanges/binance/binance_websocket.go

@@ -703,9 +703,7 @@ func (o *orderbookManager) setNeedsFetchingBook(pair currency.Pair) error {
 // SynchroniseWebsocketOrderbook synchronises full orderbook for currency pair
 // asset
 func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
-	e.Websocket.Wg.Add(1)
+	e.Websocket.Wg.Go(func() {
-	go func() {
-		defer e.Websocket.Wg.Done()
 		for {
 			select {
 			case <-e.Websocket.ShutdownC:
@@ -717,15 +715,12 @@ func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
 					}
 				}
 			case j := <-e.obm.jobs:
-				err := e.processJob(ctx, j.Pair)
+				if err := e.processJob(ctx, j.Pair); err != nil {
-				if err != nil {
+					log.Errorf(log.WebsocketMgr, "%s processing websocket orderbook error: %v", e.Name, err)
-					log.Errorf(log.WebsocketMgr,
-						"%s processing websocket orderbook error %v",
-						e.Name, err)
 				}
 			}
 		}
-	}()
+	})
 }
 
 // processJob fetches and processes orderbook updates

exchanges/binanceus/binanceus_websocket.go

@@ -632,9 +632,7 @@ func (e *Exchange) setupOrderbookManager(ctx context.Context) {
 
 // SynchroniseWebsocketOrderbook synchronises full orderbook for currency pair asset
 func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
-	e.Websocket.Wg.Add(1)
+	e.Websocket.Wg.Go(func() {
-	go func() {
-		defer e.Websocket.Wg.Done()
 		for {
 			select {
 			case <-e.Websocket.ShutdownC:
@@ -646,15 +644,12 @@ func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
 					}
 				}
 			case j := <-e.obm.jobs:
-				err := e.processJob(ctx, j.Pair)
+				if err := e.processJob(ctx, j.Pair); err != nil {
-				if err != nil {
+					log.Errorf(log.WebsocketMgr, "%s processing websocket orderbook error: %v", e.Name, err)
-					log.Errorf(log.WebsocketMgr,
-						"%s processing websocket orderbook error %v",
-						e.Name, err)
 				}
 			}
 		}
-	}()
+	})
 }
 
 // ProcessOrderbookUpdate processes the websocket orderbook update

exchanges/bithumb/bithumb_ws_orderbook.go

@@ -105,9 +105,7 @@ func (e *Exchange) applyBufferUpdate(pair currency.Pair) error {
 // SynchroniseWebsocketOrderbook synchronises full orderbook for currency pair
 // asset
 func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
-	e.Websocket.Wg.Add(1)
+	e.Websocket.Wg.Go(func() {
-	go func() {
-		defer e.Websocket.Wg.Done()
 		for {
 			select {
 			case <-e.Websocket.ShutdownC:
@@ -119,13 +117,12 @@ func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
 					}
 				}
 			case j := <-e.obm.jobs:
-				err := e.processJob(ctx, j.Pair)
+				if err := e.processJob(ctx, j.Pair); err != nil {
-				if err != nil {
+					log.Errorf(log.WebsocketMgr, "%s processing websocket orderbook error: %v", e.Name, err)
-					log.Errorf(log.WebsocketMgr, "%s processing websocket orderbook error %v", e.Name, err)
 				}
 			}
 		}
-	}()
+	})
 }
 
 // processJob fetches and processes orderbook updates

exchanges/gateio/gateio_websocket_request_types.go

@@ -171,7 +171,7 @@ type WebsocketFuturesAmendOrder struct {
 
 // WebsocketFutureOrdersList defines a websocket future orders list
 type WebsocketFutureOrdersList struct {
-	Contract currency.Pair `json:"contract,omitempty"`
+	Contract currency.Pair `json:"contract,omitzero"`
 	Asset    asset.Item    `json:"-"` // Only used internally for routing
 	Status   string        `json:"status"`
 	Limit    int64         `json:"limit,omitempty"`

exchanges/kucoin/kucoin_futures.go

@@ -72,10 +72,7 @@ func (e *Exchange) GetFuturesTickers(ctx context.Context) ([]*ticker.Price, erro
 			errC <- err
 			break
 		}
-		wg.Add(1)
+		wg.Go(func() {
-		go func() {
-			defer wg.Done()
-
 			if tick, err2 := e.GetFuturesTicker(ctx, p.String()); err2 != nil {
 				errC <- err2
 			} else {
@@ -92,7 +89,7 @@ func (e *Exchange) GetFuturesTickers(ctx context.Context) ([]*ticker.Price, erro
 					AssetType:    asset.Futures,
 				}
 			}
-		}()
+		})
 	}
 
 	wg.Wait()

exchanges/kucoin/kucoin_websocket.go

@@ -1248,9 +1248,7 @@ func (o *orderbookManager) setNeedsFetchingBook(pair currency.Pair, assetType as
 // SynchroniseWebsocketOrderbook synchronises full orderbook for currency pair
 // asset
 func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
-	e.Websocket.Wg.Add(1)
+	e.Websocket.Wg.Go(func() {
-	go func() {
-		defer e.Websocket.Wg.Done()
 		for {
 			select {
 			case <-e.Websocket.ShutdownC:
@@ -1262,15 +1260,12 @@ func (e *Exchange) SynchroniseWebsocketOrderbook(ctx context.Context) {
 					}
 				}
 			case j := <-e.obm.jobs:
-				err := e.processJob(ctx, j.Pair, j.AssetType)
+				if err := e.processJob(ctx, j.Pair, j.AssetType); err != nil {
-				if err != nil {
+					log.Errorf(log.WebsocketMgr, "%s processing websocket orderbook error: %v", e.Name, err)
-					log.Errorf(log.WebsocketMgr,
-						"%s processing websocket orderbook error %v",
-						e.Name, err)
 				}
 			}
 		}
-	}()
+	})
 }
 
 // SeedLocalCache seeds depth data

exchanges/orderbook/orderbook_test.go

@@ -329,8 +329,7 @@ func TestProcessOrderbook(t *testing.T) {
 			break
 		}
 		m.Unlock()
-		wg.Add(1)
+		wg.Go(func() {
-		go func() {
 			newName := "Exchange" + strconv.FormatInt(rand.Int63(), 10) //nolint:gosec // no need to import crypo/rand for testing
 			newPairs := currency.NewPair(currency.NewCode("BTC"+strconv.FormatInt(rand.Int63(), 10)),
 				currency.NewCode("USD"+strconv.FormatInt(rand.Int63(), 10))) //nolint:gosec // no need to import crypo/rand for testing
@@ -351,13 +350,11 @@ func TestProcessOrderbook(t *testing.T) {
 				t.Error(err)
 				catastrophicFailure = true
 				m.Unlock()
-				wg.Done()
 				return
 			}
 			testArray = append(testArray, quick{Name: newName, P: newPairs, Bids: bids, Asks: asks})
 			m.Unlock()
-			wg.Done()
+		})
-		}()
 	}
 
 	wg.Wait()

exchanges/ticker/ticker_test.go

@@ -362,8 +362,7 @@ func TestProcessTicker(t *testing.T) { // non-appending function to tickers
 			break
 		}
 
-		wg.Add(1)
+		wg.Go(func() {
-		go func() {
 			//nolint:gosec // no need to import crypo/rand for testing
 			newName := "Exchange" + strconv.FormatInt(rand.Int63(), 10)
 			newPairs, err := currency.NewPairFromStrings("BTC"+strconv.FormatInt(rand.Int63(), 10), //nolint:gosec // no need to import crypo/rand for testing
@@ -389,8 +388,7 @@ func TestProcessTicker(t *testing.T) { // non-appending function to tickers
 
 			testArray = append(testArray, quick{Name: newName, P: newPairs, TP: tp})
 			sm.Unlock()
-			wg.Done()
+		})
-		}()
 	}
 
 	if catastrophicFailure {