From adfd428bc01c76b7b687241552d637290f214787 Mon Sep 17 00:00:00 2001
From: Manav Darji <manavdarji.india@gmail.com>
Date: Wed, 18 Oct 2023 12:16:34 +0530
Subject: [PATCH] internal/cli: set default value for keystore (#1051)

* internal/cli: set default valuee for keystore

* internal/cli: add tests

* internal/cli: fix tests
---
 internal/cli/server/command_test.go       | 4 ++++
 internal/cli/server/config.go             | 1 +
 internal/cli/server/config_legacy_test.go | 1 +
 internal/cli/server/flags.go              | 7 ++++---
 internal/cli/server/testdata/test.toml    | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/internal/cli/server/command_test.go b/internal/cli/server/command_test.go
index 9f5468f3d3..de6a2d5efa 100644
--- a/internal/cli/server/command_test.go
+++ b/internal/cli/server/command_test.go
@@ -41,6 +41,7 @@ func TestFlagsWithoutConfig(t *testing.T) {
 
 	require.Equal(t, c.config.Identity, "")
 	require.Equal(t, c.config.DataDir, "./data")
+	require.Equal(t, c.config.KeyStoreDir, "")
 	require.Equal(t, c.config.Verbosity, 3)
 	require.Equal(t, c.config.RPCBatchLimit, uint64(0))
 	require.Equal(t, c.config.Snapshot, true)
@@ -74,6 +75,7 @@ func TestFlagsWithConfig(t *testing.T) {
 
 	require.Equal(t, c.config.Identity, "")
 	require.Equal(t, c.config.DataDir, "./data")
+	require.Equal(t, c.config.KeyStoreDir, "./keystore")
 	require.Equal(t, c.config.Verbosity, 3)
 	require.Equal(t, c.config.RPCBatchLimit, uint64(0))
 	require.Equal(t, c.config.Snapshot, true)
@@ -105,6 +107,7 @@ func TestFlagsWithConfigAndFlags(t *testing.T) {
 		"--config", "./testdata/test.toml",
 		"--identity", "Anon",
 		"--datadir", "",
+		"--keystore", "",
 		"--verbosity", "0",
 		"--rpc.batchlimit", "5",
 		"--snapshot=false",
@@ -128,6 +131,7 @@ func TestFlagsWithConfigAndFlags(t *testing.T) {
 
 	require.Equal(t, c.config.Identity, "Anon")
 	require.Equal(t, c.config.DataDir, "")
+	require.Equal(t, c.config.KeyStoreDir, "")
 	require.Equal(t, c.config.Verbosity, 0)
 	require.Equal(t, c.config.RPCBatchLimit, uint64(5))
 	require.Equal(t, c.config.Snapshot, false)
diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
index 302d310374..cb682e0c40 100644
--- a/internal/cli/server/config.go
+++ b/internal/cli/server/config.go
@@ -605,6 +605,7 @@ func DefaultConfig() *Config {
 		DataDir:                 DefaultDataDir(),
 		Ancient:                 "",
 		DBEngine:                "leveldb",
+		KeyStoreDir:             "",
 		Logging: &LoggingConfig{
 			Vmodule:   "",
 			Json:      false,
diff --git a/internal/cli/server/config_legacy_test.go b/internal/cli/server/config_legacy_test.go
index e0b1a76577..aa6cffc470 100644
--- a/internal/cli/server/config_legacy_test.go
+++ b/internal/cli/server/config_legacy_test.go
@@ -17,6 +17,7 @@ func TestConfigLegacy(t *testing.T) {
 
 		testConfig.Identity = ""
 		testConfig.DataDir = "./data"
+		testConfig.KeyStoreDir = "./keystore"
 		testConfig.Verbosity = 3
 		testConfig.RPCBatchLimit = 0
 		testConfig.Snapshot = true
diff --git a/internal/cli/server/flags.go b/internal/cli/server/flags.go
index 12995977ff..35150d5a48 100644
--- a/internal/cli/server/flags.go
+++ b/internal/cli/server/flags.go
@@ -64,9 +64,10 @@ func (c *Command) Flags(config *Config) *flagset.Flagset {
 		Default: c.cliConfig.DBEngine,
 	})
 	f.StringFlag(&flagset.StringFlag{
-		Name:  "keystore",
-		Usage: "Path of the directory where keystores are located",
-		Value: &c.cliConfig.KeyStoreDir,
+		Name:    "keystore",
+		Usage:   "Path of the directory where keystores are located",
+		Value:   &c.cliConfig.KeyStoreDir,
+		Default: c.cliConfig.KeyStoreDir,
 	})
 	f.Uint64Flag(&flagset.Uint64Flag{
 		Name:    "rpc.batchlimit",
diff --git a/internal/cli/server/testdata/test.toml b/internal/cli/server/testdata/test.toml
index 522322b2a3..04b2dbed35 100644
--- a/internal/cli/server/testdata/test.toml
+++ b/internal/cli/server/testdata/test.toml
@@ -1,5 +1,6 @@
 identity = ""
 datadir = "./data"
+keystore = "./keystore"
 verbosity = 3
 "rpc.batchlimit" = 0
 snapshot = true