build: replace tenv linter with usetesting (#31172)

levisyin · web-flow · commit d103f179b917 · 2025-02-21T13:36:18.000+01:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,7 +25,7 @@ linters:
     - gocheckcompilerdirectives
     - reassign
     - mirror
-    - tenv
+    - usetesting
     ### linters we tried and will not be using:
     ###
     # - structcheck # lots of false positives
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ archives are published at https://geth.ethereum.org/downloads/.
 
 For prerequisites and detailed build instructions please read the [Installation Instructions](https://geth.ethereum.org/docs/getting-started/installing-geth).
 
-Building `geth` requires both a Go (version 1.22 or later) and a C compiler. You can install
+Building `geth` requires both a Go (version 1.23 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell
diff --git a/cmd/clef/run_test.go b/cmd/clef/run_test.go
@@ -57,13 +57,7 @@ func TestMain(m *testing.M) {
 // This method creates a temporary  keystore folder which will be removed after
 // the test exits.
 func runClef(t *testing.T, args ...string) *testproc {
-	ddir, err := os.MkdirTemp("", "cleftest-*")
-	if err != nil {
-		return nil
-	}
-	t.Cleanup(func() {
-		os.RemoveAll(ddir)
-	})
+	ddir := t.TempDir()
 	return runWithKeystore(t, ddir, args...)
 }
 
diff --git a/cmd/utils/history_test.go b/cmd/utils/history_test.go
@@ -87,11 +87,7 @@ func TestHistoryImportAndExport(t *testing.T) {
 	}
 
 	// Make temp directory for era files.
-	dir, err := os.MkdirTemp("", "history-export-test")
-	if err != nil {
-		t.Fatalf("error creating temp test directory: %v", err)
-	}
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	// Export history to temp directory.
 	if err := ExportHistory(chain, dir, 0, count, step); err != nil {
diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go
@@ -21,6 +21,7 @@ import (
 	"crypto/ecdsa"
 	"crypto/sha256"
 	"errors"
+	"fmt"
 	"math"
 	"math/big"
 	"os"
@@ -452,8 +453,7 @@ func TestOpenDrops(t *testing.T) {
 	//log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, true)))
 
 	// Create a temporary folder for the persistent backend
-	storage, _ := os.MkdirTemp("", "blobpool-")
-	defer os.RemoveAll(storage)
+	storage := t.TempDir()
 
 	os.MkdirAll(filepath.Join(storage, pendingTransactionStore), 0700)
 	store, _ := billy.Open(billy.Options{Path: filepath.Join(storage, pendingTransactionStore)}, newSlotter(testMaxBlobsPerBlock), nil)
@@ -775,8 +775,7 @@ func TestOpenIndex(t *testing.T) {
 	//log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, true)))
 
 	// Create a temporary folder for the persistent backend
-	storage, _ := os.MkdirTemp("", "blobpool-")
-	defer os.RemoveAll(storage)
+	storage := t.TempDir()
 
 	os.MkdirAll(filepath.Join(storage, pendingTransactionStore), 0700)
 	store, _ := billy.Open(billy.Options{Path: filepath.Join(storage, pendingTransactionStore)}, newSlotter(testMaxBlobsPerBlock), nil)
@@ -864,8 +863,7 @@ func TestOpenHeap(t *testing.T) {
 	//log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, true)))
 
 	// Create a temporary folder for the persistent backend
-	storage, _ := os.MkdirTemp("", "blobpool-")
-	defer os.RemoveAll(storage)
+	storage := t.TempDir()
 
 	os.MkdirAll(filepath.Join(storage, pendingTransactionStore), 0700)
 	store, _ := billy.Open(billy.Options{Path: filepath.Join(storage, pendingTransactionStore)}, newSlotter(testMaxBlobsPerBlock), nil)
@@ -951,8 +949,7 @@ func TestOpenCap(t *testing.T) {
 	//log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, true)))
 
 	// Create a temporary folder for the persistent backend
-	storage, _ := os.MkdirTemp("", "blobpool-")
-	defer os.RemoveAll(storage)
+	storage := t.TempDir()
 
 	os.MkdirAll(filepath.Join(storage, pendingTransactionStore), 0700)
 	store, _ := billy.Open(billy.Options{Path: filepath.Join(storage, pendingTransactionStore)}, newSlotter(testMaxBlobsPerBlock), nil)
@@ -1041,8 +1038,7 @@ func TestChangingSlotterSize(t *testing.T) {
 	//log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelTrace, true)))
 
 	// Create a temporary folder for the persistent backend
-	storage, _ := os.MkdirTemp("", "blobpool-")
-	defer os.RemoveAll(storage)
+	storage := t.TempDir()
 
 	os.MkdirAll(filepath.Join(storage, pendingTransactionStore), 0700)
 	store, _ := billy.Open(billy.Options{Path: filepath.Join(storage, pendingTransactionStore)}, newSlotter(6), nil)
@@ -1508,8 +1504,7 @@ func TestAdd(t *testing.T) {
 	}
 	for i, tt := range tests {
 		// Create a temporary folder for the persistent backend
-		storage, _ := os.MkdirTemp("", "blobpool-")
-		defer os.RemoveAll(storage) // late defer, still ok
+		storage := filepath.Join(t.TempDir(), fmt.Sprintf("test-%d", i))
 
 		os.MkdirAll(filepath.Join(storage, pendingTransactionStore), 0700)
 		store, _ := billy.Open(billy.Options{Path: filepath.Join(storage, pendingTransactionStore)}, newSlotter(testMaxBlobsPerBlock), nil)
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
@@ -181,7 +181,7 @@ func TestLoadECDSA(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		f, err := os.CreateTemp("", "loadecdsa_test.*.txt")
+		f, err := os.CreateTemp(t.TempDir(), "loadecdsa_test.*.txt")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -202,7 +202,7 @@ func TestLoadECDSA(t *testing.T) {
 }
 
 func TestSaveECDSA(t *testing.T) {
-	f, err := os.CreateTemp("", "saveecdsa_test.*.txt")
+	f, err := os.CreateTemp(t.TempDir(), "saveecdsa_test.*.txt")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/crypto/signify/signify_test.go b/crypto/signify/signify_test.go
@@ -33,11 +33,10 @@ var (
 )
 
 func TestSignify(t *testing.T) {
-	tmpFile, err := os.CreateTemp("", "")
+	tmpFile, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name())
 	defer tmpFile.Close()
 
 	data := make([]byte, 1024)
@@ -52,7 +51,6 @@ func TestSignify(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name() + ".sig")
 
 	// Verify the signature using a golang library
 	sig, err := minisign.NewSignatureFromFile(tmpFile.Name() + ".sig")
@@ -75,11 +73,10 @@ func TestSignify(t *testing.T) {
 }
 
 func TestSignifyTrustedCommentTooManyLines(t *testing.T) {
-	tmpFile, err := os.CreateTemp("", "")
+	tmpFile, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name())
 	defer tmpFile.Close()
 
 	data := make([]byte, 1024)
@@ -94,15 +91,13 @@ func TestSignifyTrustedCommentTooManyLines(t *testing.T) {
 	if err == nil || err.Error() == "" {
 		t.Fatalf("should have errored on a multi-line trusted comment, got %v", err)
 	}
-	defer os.Remove(tmpFile.Name() + ".sig")
 }
 
 func TestSignifyTrustedCommentTooManyLinesLF(t *testing.T) {
-	tmpFile, err := os.CreateTemp("", "")
+	tmpFile, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name())
 	defer tmpFile.Close()
 
 	data := make([]byte, 1024)
@@ -117,15 +112,13 @@ func TestSignifyTrustedCommentTooManyLinesLF(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name() + ".sig")
 }
 
 func TestSignifyTrustedCommentEmpty(t *testing.T) {
-	tmpFile, err := os.CreateTemp("", "")
+	tmpFile, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name())
 	defer tmpFile.Close()
 
 	data := make([]byte, 1024)
@@ -140,5 +133,4 @@ func TestSignifyTrustedCommentEmpty(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(tmpFile.Name() + ".sig")
 }
diff --git a/internal/era/era_test.go b/internal/era/era_test.go
@@ -37,7 +37,7 @@ func TestEra1Builder(t *testing.T) {
 	t.Parallel()
 
 	// Get temp directory.
-	f, err := os.CreateTemp("", "era1-test")
+	f, err := os.CreateTemp(t.TempDir(), "era1-test")
 	if err != nil {
 		t.Fatalf("error creating temp file: %v", err)
 	}
@@ -78,6 +78,7 @@ func TestEra1Builder(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to open era: %v", err)
 	}
+	defer e.Close()
 	it, err := NewRawIterator(e)
 	if err != nil {
 		t.Fatalf("failed to make iterator: %s", err)
diff --git a/node/config_test.go b/node/config_test.go
@@ -53,13 +53,12 @@ func TestDatadirCreation(t *testing.T) {
 		t.Fatalf("freshly created datadir not accessible: %v", err)
 	}
 	// Verify that an impossible datadir fails creation
-	file, err := os.CreateTemp("", "")
+	file, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatalf("failed to create temporary file: %v", err)
 	}
 	defer func() {
 		file.Close()
-		os.Remove(file.Name())
 	}()
 
 	dir = filepath.Join(file.Name(), "invalid/path")

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ func TestLoadECDSA(t *testing.T) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`for _, test := range tests {`
`184`		`- f, err := os.CreateTemp("", "loadecdsa_test.*.txt")`
	`184`	`+ f, err := os.CreateTemp(t.TempDir(), "loadecdsa_test.*.txt")`
`185`	`185`	`if err != nil {`
`186`	`186`	`t.Fatal(err)`
`187`	`187`	`}`
`@@ -202,7 +202,7 @@ func TestLoadECDSA(t *testing.T) {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`func TestSaveECDSA(t *testing.T) {`
`205`		`- f, err := os.CreateTemp("", "saveecdsa_test.*.txt")`
	`205`	`+ f, err := os.CreateTemp(t.TempDir(), "saveecdsa_test.*.txt")`
`206`	`206`	`if err != nil {`
`207`	`207`	`t.Fatal(err)`
`208`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,10 @@ var (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func TestSignify(t *testing.T) {`
`36`		`- tmpFile, err := os.CreateTemp("", "")`
	`36`	`+ tmpFile, err := os.CreateTemp(t.TempDir(), "")`
`37`	`37`	`if err != nil {`
`38`	`38`	`t.Fatal(err)`
`39`	`39`	`}`
`40`		`- defer os.Remove(tmpFile.Name())`
`41`	`40`	`defer tmpFile.Close()`
`42`	`41`
`43`	`42`	`data := make([]byte, 1024)`
`@@ -52,7 +51,6 @@ func TestSignify(t *testing.T) {`
`52`	`51`	`if err != nil {`
`53`	`52`	`t.Fatal(err)`
`54`	`53`	`}`
`55`		`- defer os.Remove(tmpFile.Name() + ".sig")`
`56`	`54`
`57`	`55`	`// Verify the signature using a golang library`
`58`	`56`	`sig, err := minisign.NewSignatureFromFile(tmpFile.Name() + ".sig")`
`@@ -75,11 +73,10 @@ func TestSignify(t *testing.T) {`
`75`	`73`	`}`
`76`	`74`
`77`	`75`	`func TestSignifyTrustedCommentTooManyLines(t *testing.T) {`
`78`		`- tmpFile, err := os.CreateTemp("", "")`
	`76`	`+ tmpFile, err := os.CreateTemp(t.TempDir(), "")`
`79`	`77`	`if err != nil {`
`80`	`78`	`t.Fatal(err)`
`81`	`79`	`}`
`82`		`- defer os.Remove(tmpFile.Name())`
`83`	`80`	`defer tmpFile.Close()`
`84`	`81`
`85`	`82`	`data := make([]byte, 1024)`
`@@ -94,15 +91,13 @@ func TestSignifyTrustedCommentTooManyLines(t *testing.T) {`
`94`	`91`	`if err == nil \|\| err.Error() == "" {`
`95`	`92`	`t.Fatalf("should have errored on a multi-line trusted comment, got %v", err)`
`96`	`93`	`}`
`97`		`- defer os.Remove(tmpFile.Name() + ".sig")`
`98`	`94`	`}`
`99`	`95`
`100`	`96`	`func TestSignifyTrustedCommentTooManyLinesLF(t *testing.T) {`
`101`		`- tmpFile, err := os.CreateTemp("", "")`
	`97`	`+ tmpFile, err := os.CreateTemp(t.TempDir(), "")`
`102`	`98`	`if err != nil {`
`103`	`99`	`t.Fatal(err)`
`104`	`100`	`}`
`105`		`- defer os.Remove(tmpFile.Name())`
`106`	`101`	`defer tmpFile.Close()`
`107`	`102`
`108`	`103`	`data := make([]byte, 1024)`
`@@ -117,15 +112,13 @@ func TestSignifyTrustedCommentTooManyLinesLF(t *testing.T) {`
`117`	`112`	`if err != nil {`
`118`	`113`	`t.Fatal(err)`
`119`	`114`	`}`
`120`		`- defer os.Remove(tmpFile.Name() + ".sig")`
`121`	`115`	`}`
`122`	`116`
`123`	`117`	`func TestSignifyTrustedCommentEmpty(t *testing.T) {`
`124`		`- tmpFile, err := os.CreateTemp("", "")`
	`118`	`+ tmpFile, err := os.CreateTemp(t.TempDir(), "")`
`125`	`119`	`if err != nil {`
`126`	`120`	`t.Fatal(err)`
`127`	`121`	`}`
`128`		`- defer os.Remove(tmpFile.Name())`
`129`	`122`	`defer tmpFile.Close()`
`130`	`123`
`131`	`124`	`data := make([]byte, 1024)`
`@@ -140,5 +133,4 @@ func TestSignifyTrustedCommentEmpty(t *testing.T) {`
`140`	`133`	`if err != nil {`
`141`	`134`	`t.Fatal(err)`
`142`	`135`	`}`
`143`		`- defer os.Remove(tmpFile.Name() + ".sig")`
`144`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,12 @@ func TestDatadirCreation(t *testing.T) {`
`53`	`53`	`t.Fatalf("freshly created datadir not accessible: %v", err)`
`54`	`54`	`}`
`55`	`55`	`// Verify that an impossible datadir fails creation`
`56`		`- file, err := os.CreateTemp("", "")`
	`56`	`+ file, err := os.CreateTemp(t.TempDir(), "")`
`57`	`57`	`if err != nil {`
`58`	`58`	`t.Fatalf("failed to create temporary file: %v", err)`
`59`	`59`	`}`
`60`	`60`	`defer func() {`
`61`	`61`	`file.Close()`
`62`		`- os.Remove(file.Name())`
`63`	`62`	`}()`
`64`	`63`
`65`	`64`	`dir = filepath.Join(file.Name(), "invalid/path")`