build: add golangci-lint format into make fmt

Makefile

@@ -44,6 +44,7 @@ GOTAGSLIST          := sqlite_unlock_notify sqlite_omit_load_extension
 GOTAGSLIST += ${GOTAGSCUSTOM}
 
 GOTESTCOMMAND := go tool -modfile=tool.mod gotestsum --format pkgname --jsonfile testresults.json --
+GOLINTCOMMAND := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.7.1 -c .golangci.yml
 
 ifeq ($(OS_TYPE), darwin)
 # M1 Mac--homebrew install location in /opt/homebrew
@@ -97,6 +98,7 @@ default: build
 
 fmt:
 	go fmt ./...
+	$(GOLINTCOMMAND) fmt
 	./scripts/check_license.sh -i
 
 fix: build
@@ -106,7 +108,7 @@ modernize:
 	GOTOOLCHAIN=auto go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@v0.39.0 -any=false -bloop=false -rangeint=false -fmtappendf=false -waitgroup=false -stringsbuilder=false -omitzero=false -fix ./...
 
 lint:
-	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.7.1 run -c .golangci.yml
+	$(GOLINTCOMMAND) run
 
 warninglint: custom-golangci-lint
 	./custom-golangci-lint run -c .golangci-warnings.yml

agreement/agreementtest/simulate_test.go

@@ -26,9 +26,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/agreement"
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"

agreement/common_test.go

@@ -23,9 +23,10 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"

agreement/cryptoVerifier_test.go

@@ -24,10 +24,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/account"

agreement/fuzzer/dropMessageFilter_test.go

@@ -18,6 +18,7 @@ package fuzzer
 
 import (
 	"encoding/json"
+
 	"github.com/algorand/go-algorand/protocol"
 )
 

agreement/fuzzer/ledger_test.go

@@ -22,6 +22,8 @@ import (
 	"maps"
 	"math/rand"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/agreement"
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
@@ -30,7 +32,6 @@ import (
 	"github.com/algorand/go-algorand/data/bookkeeping"
 	"github.com/algorand/go-algorand/data/committee"
 	"github.com/algorand/go-algorand/protocol"
-	"github.com/algorand/go-deadlock"
 )
 
 const randseed = 0

agreement/fuzzer/messageDelayFilter_test.go

@@ -19,6 +19,7 @@ package fuzzer
 import (
 	"container/heap"
 	"encoding/json"
+
 	"github.com/algorand/go-deadlock"
 
 	"github.com/algorand/go-algorand/protocol"

agreement/fuzzer/messageDuplicationFilter_test.go

@@ -20,8 +20,9 @@ import (
 	"container/heap"
 	"encoding/json"
 
-	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-deadlock"
+
+	"github.com/algorand/go-algorand/protocol"
 )
 
 // Duplicate message with delay

agreement/fuzzer/messagePriorityQueue_test.go

@@ -18,6 +18,7 @@ package fuzzer
 
 import (
 	"container/heap"
+
 	"github.com/algorand/go-algorand/protocol"
 )
 

agreement/fuzzer/messageReflectionFilter_test.go

@@ -20,8 +20,9 @@ import (
 	"container/heap"
 	"encoding/json"
 
-	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-deadlock"
+
+	"github.com/algorand/go-algorand/protocol"
 )
 
 // Simulate a 2 way mirror where messages are passed through and also reflected back to sender with a delay

agreement/proposalManager_test.go

@@ -19,9 +19,10 @@ package agreement
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 )
 
 // Creates a proposal manager, and returns it in automata and white box form, along

agreement/service_test.go

@@ -29,9 +29,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/account"

catchup/service_test.go

@@ -26,10 +26,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/agreement"
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"

cmd/algoh/blockWatcher_test.go

@@ -22,10 +22,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/rpcs"
 	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 )
 
 func bw(client Client) *blockWatcher {

cmd/algoh/blockstats_test.go

@@ -20,13 +20,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/data/bookkeeping"
 	"github.com/algorand/go-algorand/data/transactions"
 	"github.com/algorand/go-algorand/logging/telemetryspec"
 	"github.com/algorand/go-algorand/rpcs"
 	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 )
 
 type event struct {

cmd/catchupsrv/main.go

@@ -26,9 +26,10 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/algorand/websocket"
 	"github.com/gorilla/mux"
 
+	"github.com/algorand/websocket"
+
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/network"

cmd/catchupsrv/tarblocks.go

@@ -26,8 +26,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-deadlock"
+
+	"github.com/algorand/go-algorand/logging"
 )
 
 type tarBlockSet struct {

cmd/dispenser/server.go

@@ -18,7 +18,6 @@ package main
 
 import (
 	_ "embed"
-	// "bytes"
 	"encoding/json"
 	"flag"
 	"fmt"

cmd/goal/clerk.go

@@ -27,6 +27,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/spf13/cobra"
+
 	"github.com/algorand/go-algorand/cmd/util/datadir"
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
@@ -41,8 +43,6 @@ import (
 	"github.com/algorand/go-algorand/libgoal"
 	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/util"
-
-	"github.com/spf13/cobra"
 )
 
 var (

cmd/goal/commands_test.go

@@ -20,9 +20,10 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/go-algorand/cmd/util/datadir"
 	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestEnsureDataDirReturnsWhenDataDirIsProvided(t *testing.T) { // nolint:paralleltest // Sets shared OS environment variable.

cmd/goal/tealsign.go

@@ -21,13 +21,13 @@ import (
 	"encoding/base64"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/data/transactions"
 	"github.com/algorand/go-algorand/data/transactions/logic"
 	"github.com/algorand/go-algorand/protocol"
-
-	"github.com/spf13/cobra"
 )
 
 var (

cmd/tealdbg/cdtdbg.go

@@ -23,9 +23,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/gorilla/mux"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/cmd/tealdbg/cdt"
 )
 

cmd/tealdbg/webdbg.go

@@ -25,10 +25,12 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/algorand/go-algorand/protocol"
+	"github.com/gorilla/mux"
+
 	"github.com/algorand/go-deadlock"
 	"github.com/algorand/websocket"
-	"github.com/gorilla/mux"
+
+	"github.com/algorand/go-algorand/protocol"
 )
 
 // WebPageFrontend is web page debugging frontend

crypto/encoding_test.go

@@ -20,8 +20,6 @@ import (
 	"testing"
 
 	"github.com/algorand/go-algorand/test/partitiontest"
-	// "github.com/stretchr/testify/require"
-	// "github.com/algorand/go-algorand/protocol"
 )
 
 func TestEmptyEncoding(t *testing.T) {

crypto/util_test.go

@@ -20,9 +20,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestEncodeDecode(t *testing.T) {

daemon/algod/api/server/v2/dryrun.go

@@ -27,10 +27,9 @@ import (
 	"github.com/algorand/go-algorand/data/bookkeeping"
 	"github.com/algorand/go-algorand/data/transactions"
 	"github.com/algorand/go-algorand/data/transactions/logic"
+	"github.com/algorand/go-algorand/ledger"
 	"github.com/algorand/go-algorand/ledger/apply"
 	"github.com/algorand/go-algorand/ledger/ledgercore"
-
-	"github.com/algorand/go-algorand/ledger"
 	"github.com/algorand/go-algorand/protocol"
 )
 

daemon/algod/api/server/v2/utils.go

@@ -27,9 +27,10 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/algorand/go-codec/codec"
 	"github.com/labstack/echo/v4"
 
+	"github.com/algorand/go-codec/codec"
+
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/daemon/algod/api/server/v2/generated/model"
 	"github.com/algorand/go-algorand/data/basics"

daemon/kmd/server/server.go

@@ -26,9 +26,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/gofrs/flock"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/daemon/kmd/api"
 	"github.com/algorand/go-algorand/daemon/kmd/session"
 	"github.com/algorand/go-algorand/logging"

daemon/kmd/session/session.go

@@ -20,9 +20,10 @@ import (
 	"context"
 	"time"
 
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/daemon/kmd/config"
 	"github.com/algorand/go-algorand/daemon/kmd/wallet"
-	"github.com/algorand/go-deadlock"
 )
 
 type walletHandle struct {

daemon/kmd/wallet/driver/sqlite.go

@@ -24,18 +24,19 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/jmoiron/sqlx"
 	"github.com/mattn/go-sqlite3"
 
+	"github.com/algorand/go-codec/codec"
+	"github.com/algorand/go-deadlock"
+
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/daemon/kmd/config"
 	"github.com/algorand/go-algorand/daemon/kmd/wallet"
 	"github.com/algorand/go-algorand/data/transactions"
 	"github.com/algorand/go-algorand/data/transactions/logic"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/protocol"
-	"github.com/algorand/go-codec/codec"
 )
 
 const (

data/transactions/logic/backwardCompat_test.go

@@ -22,11 +22,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 )
 
 // This test ensures a program compiled with by pre-AVM v2 go-algorand