Skip to content

Commit 1ecfbc0

Browse files
authoredMar 12, 2025
refactor: use t.TempDir() instead of os.MkdirTemp (#3203)
Signed-off-by: tgolang <seekseat@aliyun.com>
1 parent 67bc981 commit 1ecfbc0

File tree

5 files changed

+9
-25
lines changed

5 files changed

+9
-25
lines changed
 

‎client/asset/eth/multirpc_test_util.go

+4-8
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ func (m *MRPCTest) TestSimnetMultiRPCClient(t *testing.T, wsPort, httpPort strin
178178

179179
func (m *MRPCTest) TestMonitorNet(t *testing.T, net dex.Network) {
180180
seed, providers := m.readProviderFile(t, net)
181-
dir, _ := os.MkdirTemp("", "")
182-
defer os.RemoveAll(dir)
181+
dir := t.TempDir()
183182

184183
cl, err := m.rpcClient(dir, seed, providers, net, true)
185184
if err != nil {
@@ -202,8 +201,7 @@ func (m *MRPCTest) TestRPC(t *testing.T, net dex.Network) {
202201
if endpoint == "" {
203202
t.Fatalf("specify a provider in the PROVIDER environmental variable")
204203
}
205-
dir, _ := os.MkdirTemp("", "")
206-
defer os.RemoveAll(dir)
204+
dir := t.TempDir()
207205
cl, err := m.rpcClient(dir, encode.RandomBytes(32), []string{endpoint}, net, true)
208206
if err != nil {
209207
t.Fatal(err)
@@ -233,8 +231,7 @@ func (m *MRPCTest) TestFreeServers(t *testing.T, freeServers []string, net dex.N
233231
t.Fatalf("compatDataLookup error: %v", err)
234232
}
235233
runTest := func(endpoint string) error {
236-
dir, _ := os.MkdirTemp("", "")
237-
defer os.RemoveAll(dir)
234+
dir := t.TempDir()
238235
cl, err := m.rpcClient(dir, encode.RandomBytes(32), []string{endpoint}, net, true)
239236
if err != nil {
240237
return fmt.Errorf("tRPCClient error: %v", err)
@@ -333,8 +330,7 @@ func (m *MRPCTest) TestReceiptsHaveEffectiveGasPrice(t *testing.T) {
333330

334331
func (m *MRPCTest) withClient(t *testing.T, net dex.Network, f func(context.Context, *multiRPCClient)) {
335332
seed, providers := m.readProviderFile(t, net)
336-
dir, _ := os.MkdirTemp("", "")
337-
defer os.RemoveAll(dir)
333+
dir := t.TempDir()
338334

339335
cl, err := m.rpcClient(dir, seed, providers, net, false)
340336
if err != nil {

‎client/asset/zec/regnet_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"context"
99
"encoding/json"
1010
"fmt"
11-
"os"
1211
"os/exec"
1312
"os/user"
1413
"path/filepath"
@@ -164,8 +163,7 @@ func testDeserializeBlocks(t *testing.T, port string, upgradeHeights ...int64) {
164163
func TestMultiSplit(t *testing.T) {
165164
log := dex.StdOutLogger("T", dex.LevelTrace)
166165
c := make(chan asset.WalletNotification, 16)
167-
tmpDir, _ := os.MkdirTemp("", "")
168-
defer os.RemoveAll(tmpDir)
166+
tmpDir := t.TempDir()
169167
walletCfg := &asset.WalletConfig{
170168
Type: walletTypeRPC,
171169
Settings: map[string]string{

‎client/tor/tor_live_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ package tor
55
import (
66
"context"
77
"fmt"
8-
"os"
98
"testing"
109

1110
"decred.org/dcrdex/dex"
1211
)
1312

1413
func TestConnect(t *testing.T) {
15-
dataDir, _ := os.MkdirTemp("", "")
16-
defer os.RemoveAll(dataDir)
14+
dataDir := t.TempDir()
1715

1816
log := dex.StdOutLogger("T", dex.LevelDebug)
1917
relay, err := New(dataDir, log)

‎dex/lexi/db_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package lexi
22

33
import (
44
"bytes"
5-
"os"
65
"path/filepath"
76
"strings"
87
"testing"
@@ -12,18 +11,15 @@ import (
1211
)
1312

1413
func newTestDB(t *testing.T) (*DB, func()) {
15-
tmpDir, err := os.MkdirTemp("", "")
16-
if err != nil {
17-
t.Fatalf("error making temp dir: %v", err)
18-
}
14+
tmpDir := t.TempDir()
1915
db, err := New(&Config{
2016
Path: filepath.Join(tmpDir, "test.db"),
2117
Log: dex.StdOutLogger("T", dex.LevelInfo),
2218
})
2319
if err != nil {
2420
t.Fatalf("error constructing db: %v", err)
2521
}
26-
return db, func() { os.RemoveAll(tmpDir) }
22+
return db, func() {}
2723
}
2824

2925
func TestPrefixes(t *testing.T) {

‎server/noderelay/noderelay_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ func TestNexus(t *testing.T) {
2929
t.Fatalf("error splitting host and port from address %q", addr)
3030
}
3131

32-
dir, err := os.MkdirTemp("", "")
33-
if err != nil {
34-
t.Fatalf("Error making temp dir: %v", err)
35-
}
36-
defer os.RemoveAll(dir)
32+
dir := t.TempDir()
3733

3834
relayID := "0xabcanything_you-want"
3935

0 commit comments

Comments
 (0)