From 967a82ab341dea907c4c8391a29492502f1d1e7e Mon Sep 17 00:00:00 2001 From: Moshe Shababo Date: Mon, 17 Feb 2020 18:00:09 +0200 Subject: [PATCH] Node id file to be stored on datadir instead of post-datadir --- cmd/node/node.go | 4 ++-- cmd/node/node_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/node/node.go b/cmd/node/node.go index 25e48aa74b..2f2fb075ae 100644 --- a/cmd/node/node.go +++ b/cmd/node/node.go @@ -874,7 +874,7 @@ func (app *SpacemeshApp) LoadOrCreateEdSigner() (*signing.EdSigner, error) { log.Warning("Failed to find identity file: %v", err) edSgn := signing.NewEdSigner() - f = filepath.Join(shared.GetInitDir(app.Config.POST.DataDir, edSgn.PublicKey().Bytes()), edKeyFileName) + f = filepath.Join(shared.GetInitDir(app.Config.DataDir(), edSgn.PublicKey().Bytes()), edKeyFileName) err := os.MkdirAll(filepath.Dir(f), filesystem.OwnerReadWriteExec) if err != nil { return nil, fmt.Errorf("failed to create directory for identity file: %v", err) @@ -910,7 +910,7 @@ func (identityFileFound) Error() string { func (app *SpacemeshApp) getIdentityFile() (string, error) { var f string - err := filepath.Walk(app.Config.POST.DataDir, func(path string, info os.FileInfo, err error) error { + err := filepath.Walk(app.Config.DataDir(), func(path string, info os.FileInfo, err error) error { if err != nil { return nil } diff --git a/cmd/node/node_test.go b/cmd/node/node_test.go index a02fabe0dc..e3b3109677 100644 --- a/cmd/node/node_test.go +++ b/cmd/node/node_test.go @@ -50,7 +50,7 @@ func TestSpacemeshApp_getEdIdentity(t *testing.T) { // setup spacemesh app app := NewSpacemeshApp() - app.Config.POST.DataDir = "tmp" + app.Config.DataDir = "tmp" app.log = log.NewDefault("logger") // get new identity