From dbc4869d71702cbf32ee9c5f434e73604d0bd1a2 Mon Sep 17 00:00:00 2001
From: yuhangcangqian <cuibuwei@qq.com>
Date: Sat, 8 Mar 2025 13:12:11 +0800
Subject: [PATCH] refactor: use t.TempDir() instead of os.MkdirTemp

Signed-off-by: yuhangcangqian <cuibuwei@qq.com>
---
 internal/api/lib_test.go | 32 ++++++++------------------------
 lib_libwasmvm_test.go    |  4 +---
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/internal/api/lib_test.go b/internal/api/lib_test.go
index c008be8b3..5879ff798 100644
--- a/internal/api/lib_test.go
+++ b/internal/api/lib_test.go
@@ -29,9 +29,7 @@ const (
 var TESTING_CAPABILITIES = []string{"staking", "stargate", "iterator", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3"}
 
 func TestInitAndReleaseCache(t *testing.T) {
-	tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 
 	config := types.VMConfig{
 		Cache: types.CacheOptions{
@@ -49,9 +47,7 @@ func TestInitAndReleaseCache(t *testing.T) {
 // wasmd expects us to create the base directory
 // https://github.com/CosmWasm/wasmd/blob/v0.30.0/x/wasm/keeper/keeper.go#L128
 func TestInitCacheWorksForNonExistentDir(t *testing.T) {
-	tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 
 	createMe := filepath.Join(tmpdir, "does-not-yet-exist")
 	config := types.VMConfig{
@@ -85,9 +81,7 @@ func TestInitCacheErrorsForBrokenDir(t *testing.T) {
 }
 
 func TestInitLockingPreventsConcurrentAccess(t *testing.T) {
-	tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 
 	config1 := types.VMConfig{
 		Cache: types.CacheOptions{
@@ -128,15 +122,9 @@ func TestInitLockingPreventsConcurrentAccess(t *testing.T) {
 }
 
 func TestInitLockingAllowsMultipleInstancesInDifferentDirs(t *testing.T) {
-	tmpdir1, err := os.MkdirTemp("", "wasmvm-testing1")
-	require.NoError(t, err)
-	tmpdir2, err := os.MkdirTemp("", "wasmvm-testing2")
-	require.NoError(t, err)
-	tmpdir3, err := os.MkdirTemp("", "wasmvm-testing3")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpdir1)
-	defer os.RemoveAll(tmpdir2)
-	defer os.RemoveAll(tmpdir3)
+	tmpdir1 := t.TempDir()
+	tmpdir2 := t.TempDir()
+	tmpdir3 := t.TempDir()
 
 	config1 := types.VMConfig{
 		Cache: types.CacheOptions{
@@ -175,9 +163,7 @@ func TestInitLockingAllowsMultipleInstancesInDifferentDirs(t *testing.T) {
 }
 
 func TestInitCacheEmptyCapabilities(t *testing.T) {
-	tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpdir)
+	tmpdir := t.TempDir()
 	config := types.VMConfig{
 		Cache: types.CacheOptions{
 			BaseDir:                  tmpdir,
@@ -193,8 +179,7 @@ func TestInitCacheEmptyCapabilities(t *testing.T) {
 
 func withCache(tb testing.TB) (Cache, func()) {
 	tb.Helper()
-	tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
-	require.NoError(tb, err)
+	tmpdir := tb.TempDir()
 	config := types.VMConfig{
 		Cache: types.CacheOptions{
 			BaseDir:                  tmpdir,
@@ -207,7 +192,6 @@ func withCache(tb testing.TB) (Cache, func()) {
 	require.NoError(tb, err)
 
 	cleanup := func() {
-		os.RemoveAll(tmpdir)
 		ReleaseCache(cache)
 	}
 	return cache, cleanup
diff --git a/lib_libwasmvm_test.go b/lib_libwasmvm_test.go
index 344ce614f..d204e113a 100644
--- a/lib_libwasmvm_test.go
+++ b/lib_libwasmvm_test.go
@@ -32,14 +32,12 @@ const (
 
 func withVM(t *testing.T) *VM {
 	t.Helper()
-	tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
-	require.NoError(t, err)
+	tmpdir := t.TempDir()
 	vm, err := NewVM(tmpdir, TESTING_CAPABILITIES, TESTING_MEMORY_LIMIT, TESTING_PRINT_DEBUG, TESTING_CACHE_SIZE)
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
 		vm.Cleanup()
-		os.RemoveAll(tmpdir)
 	})
 	return vm
 }