Skip to content

Commit 0d20e96

Browse files
committed
lntest: create GenBaseDir to generate the base dir
1 parent 5ebb293 commit 0d20e96

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

lntest/node/config.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,23 @@ func (cfg *BaseNodeConfig) BaseConfig() *BaseNodeConfig {
223223
return cfg
224224
}
225225

226+
// GenBaseDir creates a base dir that's used for the test.
227+
func (cfg *BaseNodeConfig) GenBaseDir() error {
228+
if cfg.BaseDir == "" {
229+
var err error
230+
231+
// Create a temporary directory for the node's data and logs.
232+
// Use dash suffix as a separator between base name and random
233+
// suffix.
234+
dirBaseName := fmt.Sprintf("lndtest-node-%s-", cfg.Name)
235+
cfg.BaseDir, err = os.MkdirTemp("", dirBaseName)
236+
237+
return err
238+
}
239+
240+
return nil
241+
}
242+
226243
// GenArgs generates a slice of command line arguments from the lightning node
227244
// config struct.
228245
func (cfg *BaseNodeConfig) GenArgs() []string {

lntest/node/harness_node.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,10 @@ type HarnessNode struct {
9393
// NewHarnessNode creates a new test lightning node instance from the passed
9494
// config.
9595
func NewHarnessNode(t *testing.T, cfg *BaseNodeConfig) (*HarnessNode, error) {
96-
if cfg.BaseDir == "" {
97-
var err error
98-
99-
// Create a temporary directory for the node's data and logs.
100-
// Use dash suffix as a separator between base name and random
101-
// suffix.
102-
dirBaseName := fmt.Sprintf("lndtest-node-%s-", cfg.Name)
103-
cfg.BaseDir, err = os.MkdirTemp("", dirBaseName)
104-
if err != nil {
105-
return nil, err
106-
}
96+
if err := cfg.GenBaseDir(); err != nil {
97+
return nil, err
10798
}
99+
108100
cfg.DataDir = filepath.Join(cfg.BaseDir, "data")
109101
cfg.LogDir = filepath.Join(cfg.BaseDir, "logs")
110102
cfg.TLSCertPath = filepath.Join(cfg.BaseDir, "tls.cert")

0 commit comments

Comments
 (0)