fix path account management (#291)

* fix path account management * lint fix * delete default path * lint fix
Ethernal-Tech · Jun 21, 2024 · d38f1bd · d38f1bd
1 parent 4dd7d2e
commit d38f1bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go
@@ -4,7 +4,6 @@ import (
 	"crypto/ecdsa"
 	"errors"
 	"fmt"
-	"path/filepath"
 	"reflect"
 	"sync"
 	"time"
@@ -24,8 +23,6 @@ var (
 	// ErrAccountAlreadyExists is returned if an account attempted to import is
 	// already present in the keystore.
 	ErrAccountAlreadyExists = errors.New("account already exists")
-
-	DefaultStorage, _ = filepath.Abs(filepath.Join("data-storage")) //nolint:gocritic
 )
 
 var KeyStoreType = reflect.TypeOf(&KeyStore{})

diff --git a/server/server.go b/server/server.go
@@ -347,7 +347,11 @@ func NewServer(config *Config) (*Server, error) {
 
 	// setup account manager
 	{
-		keystore, err := keystore.NewKeyStore(keystore.DefaultStorage, keystore.LightScryptN, keystore.LightScryptP, m.logger)
+		keystore, err := keystore.NewKeyStore(
+			filepath.Join(config.DataDir, "account-store"),
+			keystore.LightScryptN,
+			keystore.LightScryptP,
+			m.logger)
 		if err != nil {
 			return nil, err
 		}