move panic from InitConfig() inside to caller aside

iotexproject · Jun 22, 2022 · 9a75119 · 9a75119
1 parent 4d7d30e
commit 9a75119
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/ioctl/newcmd/config/config.go b/ioctl/newcmd/config/config.go
@@ -20,7 +20,6 @@ import (
 
 	serverCfg "github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/ioctl/config"
-	"github.com/iotexproject/iotex-core/pkg/log"
 )
 
 // Regexp patterns
@@ -49,22 +48,22 @@ type info struct {
 }
 
 // InitConfig load config data from default config file
-func InitConfig() (config.Config, string) {
+func InitConfig() (config.Config, string, error) {
 	info := &info{}
 	configDir := os.Getenv("HOME") + "/.config/ioctl/default"
 	// Create path to config directory
 	err := os.MkdirAll(configDir, 0700)
 	if err != nil {
-		log.L().Panic(err.Error())
+		return info.readConfig, info.defaultConfigFile, err
 	}
 	info.defaultConfigFile = filepath.Join(configDir, _defaultConfigFileName)
 
 	// Load or reset config file
 	info.readConfig, err = config.LoadConfig()
-	if err != nil && os.IsNotExist(err) {
+	if os.IsNotExist(err) {
 		err = info.reset() // Config file doesn't exist
 	} else if err != nil {
-		log.L().Panic(err.Error())
+		return info.readConfig, info.defaultConfigFile, err
 	}
 
 	// Check completeness of config file
@@ -86,14 +85,14 @@ func InitConfig() (config.Config, string) {
 	}
 	if !completeness {
 		if err = info.writeConfig(); err != nil {
-			log.L().Panic(err.Error())
+			return info.readConfig, info.defaultConfigFile, err
 		}
 	}
 	// Set language for ioctl
 	if info.isSupportedLanguage(info.readConfig.Language) == -1 {
 		fmt.Printf("Warn: Language %s is not supported, English instead.\n", info.readConfig.Language)
 	}
-	return info.readConfig, info.defaultConfigFile
+	return info.readConfig, info.defaultConfigFile, nil
 }
 
 // newInfo create config info

diff --git a/tools/newioctl/ioctl.go b/tools/newioctl/ioctl.go
@@ -12,10 +12,14 @@ import (
 	"github.com/iotexproject/iotex-core/ioctl"
 	"github.com/iotexproject/iotex-core/ioctl/newcmd"
 	"github.com/iotexproject/iotex-core/ioctl/newcmd/config"
+	"github.com/iotexproject/iotex-core/pkg/log"
 )
 
 func main() {
-	readConfig, defaultConfigFile := config.InitConfig()
+	readConfig, defaultConfigFile, err := config.InitConfig()
+	if err != nil {
+		log.L().Panic(err.Error())
+	}
 	client := ioctl.NewClient(readConfig, defaultConfigFile)
 	if err := newcmd.NewIoctl(client).Execute(); err != nil {
 		os.Exit(1)

diff --git a/tools/newxctl/xctl.go b/tools/newxctl/xctl.go
@@ -12,10 +12,14 @@ import (
 	"github.com/iotexproject/iotex-core/ioctl"
 	"github.com/iotexproject/iotex-core/ioctl/newcmd"
 	"github.com/iotexproject/iotex-core/ioctl/newcmd/config"
+	"github.com/iotexproject/iotex-core/pkg/log"
 )
 
 func main() {
-	readConfig, defaultConfigFile := config.InitConfig()
+	readConfig, defaultConfigFile, err := config.InitConfig()
+	if err != nil {
+		log.L().Panic(err.Error())
+	}
 	client := ioctl.NewClient(readConfig, defaultConfigFile, ioctl.EnableCryptoSm2())
 	if err := newcmd.NewXctl(client).Execute(); err != nil {
 		os.Exit(1)