From 33843613e021d8ef596a884249b4b087e3fa66c7 Mon Sep 17 00:00:00 2001
From: Rafael Sampaio <5679073+r4f4ss@users.noreply.github.com>
Date: Tue, 15 Oct 2024 17:41:29 -0300
Subject: [PATCH] code cleanup and improved variable names

---
 cmd/shisui/main.go |  4 ++--
 cmd/utils/flags.go | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/shisui/main.go b/cmd/shisui/main.go
index a0a1e89cbf..6260029552 100644
--- a/cmd/shisui/main.go
+++ b/cmd/shisui/main.go
@@ -73,7 +73,6 @@ var (
 		utils.PortalBootNodesFlag,
 		utils.PortalPrivateKeyFlag,
 		utils.PortalNetworksFlag,
-		utils.LogFormatFlag,
 	}
 	historyRpcFlags = []cli.Flag{
 		utils.PortalRPCListenAddrFlag,
@@ -81,6 +80,7 @@ var (
 		utils.PortalDataDirFlag,
 		utils.PortalDataCapacityFlag,
 		utils.PortalLogLevelFlag,
+		utils.PortalLogFormatFlag,
 	}
 	metricsFlags = []cli.Flag{
 		utils.MetricsEnabledFlag,
@@ -113,7 +113,7 @@ func main() {
 }
 
 func shisui(ctx *cli.Context) error {
-	err := setDefaultLogger(ctx.Int(utils.PortalLogLevelFlag.Name), ctx.String(utils.LogFormatFlag.Name))
+	err := setDefaultLogger(ctx.Int(utils.PortalLogLevelFlag.Name), ctx.String(utils.PortalLogFormatFlag.Name))
 	if err != nil {
 		return err
 	}
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 1a82ce2846..28be4f466e 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1008,6 +1008,12 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
 		Category: flags.PortalNetworkCategory,
 	}
 
+	PortalLogFormatFlag = &cli.StringFlag{
+		Name:     "logformat",
+		Usage:    "Log format to use (json|logfmt|terminal)",
+		Category: flags.PortalNetworkCategory,
+	}
+
 	PortalPrivateKeyFlag = &cli.StringFlag{
 		Name:     "private.key",
 		Usage:    "Private key of p2p node, hex format without 0x prifix",
@@ -1026,11 +1032,6 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
 		Category: flags.PortalNetworkCategory,
 		Value:    cli.NewStringSlice(portalwire.History.Name()),
 	}
-	LogFormatFlag = &cli.StringFlag{
-		Name:     "logformat",
-		Usage:    "Log format to use (json|logfmt|terminal)",
-		Category: flags.PortalNetworkCategory,
-	}
 )
 
 var (