lint: enable staticcheck for test code and fix issues (#5401)

algorand · algojohnlee · Aug 4, 2023 · May 31, 2023 · May 31, 2023 · Jun 1, 2023
commit 45cf9ab1946fdb40f473ad1e068721dec64f0a2e
diff --git a/.golangci.yml b/.golangci.yml
@@ -115,8 +115,12 @@ issues:
         # - nilerr
         - nolintlint
         # - revive
-        - staticcheck
+        # - staticcheck
         - typecheck
+    - path: _test\.go
+      linters:
+        - staticcheck
+      text: "SA4006: this value" # of X is never used
     # allow shadowing in test code
     - path: _test\.go
       linters:

diff --git a/crypto/stateproof/prover_test.go b/crypto/stateproof/prover_test.go
@@ -649,7 +649,7 @@ func BenchmarkBuildVerify(b *testing.B) {
 	data := testMessage("hello world").IntoStateProofMessageHash()
 
 	var parts []basics.Participant
-	var partkeys []*merklesignature.Secrets
+	//var partkeys []*merklesignature.Secrets
 	var sigs []merklesignature.Signature
 	for i := 0; i < npart; i++ {
 		signer := generateTestSigner(0, stateProofIntervalForTests+1, stateProofIntervalForTests, a)
@@ -662,7 +662,7 @@ func BenchmarkBuildVerify(b *testing.B) {
 		sig, err := signerInRound.SignBytes(data[:])
 		require.NoError(b, err, "failed to create keys")
 
-		partkeys = append(partkeys, signer)
+		//partkeys = append(partkeys, signer)
 		sigs = append(sigs, sig)
 		parts = append(parts, part)
 	}

diff --git a/data/transactions/verify/txnBatch_test.go b/data/transactions/verify/txnBatch_test.go
@@ -690,7 +690,7 @@ func TestStreamToBatchCtxCancelPoolQueue(t *testing.T) { //nolint:paralleltest /
 	// cancel the ctx as the sig is not yet sent to the exec pool
 	// the test might sporadically fail if between sending the txn above
 	// and the cancelation, 2 x waitForNextTxnDuration elapses (10ms)
-	time.Sleep(12)
+	time.Sleep(12 * time.Millisecond)
 	go func() {
 		// wait a bit before releasing the tasks, so that the verificationPool ctx first gets canceled
 		time.Sleep(20 * time.Millisecond)

diff --git a/data/transactions/verify/txn_test.go b/data/transactions/verify/txn_test.go
@@ -626,7 +626,7 @@ func TestPaysetGroups(t *testing.T) {
 
 func BenchmarkPaysetGroups(b *testing.B) {
 	if b.N < 2000 {
-		b.N = 2000
+		b.N = 2000 //nolint:staticcheck // intentionally setting b.N
 	}
 	_, signedTxn, secrets, addrs := generateTestObjects(b.N, 20, 0, 50)
 	blkHdr := createDummyBlockHeader()
@@ -1056,7 +1056,7 @@ func verifyGroup(t *testing.T, txnGroups [][]transactions.SignedTxn, blkHdr *boo
 
 func BenchmarkTxn(b *testing.B) {
 	if b.N < 2000 {
-		b.N = 2000
+		b.N = 2000 //nolint:staticcheck // intentionally setting b.N
 	}
 	_, signedTxn, secrets, addrs := generateTestObjects(b.N, 20, 0, 50)
 	blk := bookkeeping.Block{BlockHeader: createDummyBlockHeader()}

diff --git a/ledger/acctdeltas_test.go b/ledger/acctdeltas_test.go
@@ -793,6 +793,7 @@ func benchmarkWriteCatchpointStagingBalancesSub(b *testing.B, ascendingOrder boo
 	b.ReportMetric(float64(b.N)/float64((time.Since(accountsWritingStarted)-accountsGenerationDuration).Seconds()), "accounts/sec")
 }
 
+//nolint:staticcheck // intentionally setting b.N
 func BenchmarkWriteCatchpointStagingBalances(b *testing.B) {
 	benchSizes := []int{1024 * 100, 1024 * 200, 1024 * 400}
 	for _, size := range benchSizes {
@@ -1131,10 +1132,10 @@ func TestKVStoreNilBlobConversion(t *testing.T) {
 
 	err = dbs.Wdb.Atomic(func(ctx context.Context, tx *sql.Tx) (err0 error) {
 		writer, err0 := sqlitedriver.MakeAccountsSQLWriter(tx, false, false, true, false)
-		defer writer.Close()
 		if err0 != nil {
 			return
 		}
+		defer writer.Close()
 		for i := 0; i < len(kvPairDBPrepareSet); i++ {
 			err0 = writer.UpsertKvPair(string(kvPairDBPrepareSet[i].key), nil)
 			if err0 != nil {

diff --git a/ledger/acctonline_expired_test.go b/ledger/acctonline_expired_test.go
@@ -71,6 +71,7 @@ type onlineAcctModelAcct struct {
 func newMapOnlineAcctModel(t *testing.T) *mapOnlineAcctModel {
 	return &mapOnlineAcctModel{
 		t:        t,
+		cur:      1,
 		accts:    make(map[basics.Address]map[basics.Round]onlineAcctModelAcct),
 		expiring: make(map[basics.Round]map[basics.Address]struct{}),
 	}
@@ -94,7 +95,7 @@ func (m *mapOnlineAcctModel) lookupAcctAsOf(rnd basics.Round, addr basics.Addres
 		return onlineAcctModelAcct{}
 	}
 	// find the acct record for the most recent round <= rnd
-	for r := rnd; r >= 0; r-- {
+	for r := rnd; r > 0; r-- {
 		if acct, ok := acctRounds[r]; ok {
 			return acct
 		}
@@ -113,7 +114,7 @@ func (m *mapOnlineAcctModel) allOnlineAsOf(rnd basics.Round) map[basics.Address]
 	accts := make(map[basics.Address]onlineAcctModelAcct)
 	for addr, acctRounds := range m.accts {
 		// find the acct record for the most recent round <= rnd
-		for r := rnd; r >= 0; r-- {
+		for r := rnd; r > 0; r-- {
 			if acct, ok := acctRounds[r]; ok {
 				if acct.Status == basics.Online {
 					accts[addr] = acct

diff --git a/ledger/eval/cow_test.go b/ledger/eval/cow_test.go
@@ -104,7 +104,7 @@ func (ml *mockLedger) BlockHdr(rnd basics.Round) (bookkeeping.BlockHeader, error
 }
 
 func (ml *mockLedger) blockHdrCached(rnd basics.Round) (bookkeeping.BlockHeader, error) {
-	return ml.blockHdrCached(rnd)
+	return ml.BlockHdr(rnd)
 }
 
 func (ml *mockLedger) GetStateProofVerificationContext(rnd basics.Round) (*ledgercore.StateProofVerificationContext, error) {

diff --git a/ledger/eval/eval_test.go b/ledger/eval/eval_test.go
@@ -941,7 +941,7 @@ func (ledger *evalTestLedger) BlockHdr(rnd basics.Round) (bookkeeping.BlockHeade
 }
 
 func (ledger *evalTestLedger) BlockHdrCached(rnd basics.Round) (bookkeeping.BlockHeader, error) {
-	return ledger.BlockHdrCached(rnd)
+	return ledger.BlockHdr(rnd)
 }
 
 func (ledger *evalTestLedger) VotersForStateProof(rnd basics.Round) (*ledgercore.VotersForRound, error) {
@@ -1042,7 +1042,7 @@ func (l *testCowBaseLedger) BlockHdr(basics.Round) (bookkeeping.BlockHeader, err
 }
 
 func (l *testCowBaseLedger) BlockHdrCached(rnd basics.Round) (bookkeeping.BlockHeader, error) {
-	return l.BlockHdrCached(rnd)
+	return l.BlockHdr(rnd)
 }
 
 func (l *testCowBaseLedger) CheckDup(config.ConsensusParams, basics.Round, basics.Round, basics.Round, transactions.Txid, ledgercore.Txlease) error {

diff --git a/ledger/evalbench_test.go b/ledger/evalbench_test.go
@@ -309,7 +309,7 @@ func BenchmarkBlockEvaluatorDiskAppCalls(b *testing.B) {
 	// the setup time for this test is 1.5 minutes long. By setting the b.N = 2, we
 	// set up for success on the first iteration, and preventing a second iteration.
 	if b.N < 2 {
-		b.N = 2
+		b.N = 2 //nolint:staticcheck // intentionally setting b.N
 	}
 	// program sets all 16 available keys of len 64 bytes to same values of 64 bytes
 	source := `#pragma version 5

diff --git a/ledger/onlineaccountscache_test.go b/ledger/onlineaccountscache_test.go
@@ -216,7 +216,7 @@ func benchmarkOnlineAccountsCacheRead(b *testing.B, historyLength int) {
 	// preparation stage above non-negligible.
 	minN := 100
 	if b.N < minN {
-		b.N = minN
+		b.N = minN //nolint:staticcheck // intentionally setting b.N
 	}
 
 	var r cachedOnlineAccount