Skip to content

Commit c5d4087

Browse files
guogerdenyeart
authored andcommitted
FAB-17157 rm createTempDir method
It simply creates a temp dir or panic, and only called at one place in the same file. It's cleaner if inlined. Signed-off-by: Jay Guo <guojiannan1101@gmail.com>
1 parent e939f9c commit c5d4087

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

orderer/common/server/util.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ import (
1818

1919
func createLedgerFactory(conf *config.TopLevel, metricsProvider metrics.Provider) (blockledger.Factory, string, error) {
2020
ld := conf.FileLedger.Location
21+
var err error
2122
if ld == "" {
22-
ld = createTempDir(conf.FileLedger.Prefix)
23+
if ld, err = ioutil.TempDir("", conf.FileLedger.Prefix); err != nil {
24+
logger.Panic("Error creating temp dir:", err)
25+
}
2326
}
2427

2528
logger.Debug("Ledger dir:", ld)
@@ -29,11 +32,3 @@ func createLedgerFactory(conf *config.TopLevel, metricsProvider metrics.Provider
2932
}
3033
return lf, ld, nil
3134
}
32-
33-
func createTempDir(dirPrefix string) string {
34-
dirPath, err := ioutil.TempDir("", dirPrefix)
35-
if err != nil {
36-
logger.Panic("Error creating temp dir:", err)
37-
}
38-
return dirPath
39-
}

orderer/common/server/util_test.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,3 @@ func TestCreateLedgerFactory(t *testing.T) {
6161
})
6262
}
6363
}
64-
65-
func TestCreateTempDir(t *testing.T) {
66-
t.Run("Good", func(t *testing.T) {
67-
tempDir := createTempDir("foo")
68-
if _, err := os.Stat(tempDir); err != nil {
69-
t.Fatal(err)
70-
}
71-
})
72-
73-
t.Run("Bad", func(t *testing.T) {
74-
assert.Panics(t, func() {
75-
createTempDir("foo/bar")
76-
})
77-
})
78-
79-
}

0 commit comments

Comments
 (0)