From e1be3c46a4240591f25cfca6c99a14a0c92b2abc Mon Sep 17 00:00:00 2001 From: jaeseung-bae <119839167+jaeseung-bae@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:00:11 +0900 Subject: [PATCH] fix: add string trim for PrivValidatorListenAddr string (#768) --- cmd/ostracon/commands/show_validator.go | 9 +++++---- node/node.go | 7 +++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/ostracon/commands/show_validator.go b/cmd/ostracon/commands/show_validator.go index 43b31d041..0962b0926 100644 --- a/cmd/ostracon/commands/show_validator.go +++ b/cmd/ostracon/commands/show_validator.go @@ -2,15 +2,16 @@ package commands import ( "fmt" + "strings" - "github.com/Finschia/ostracon/node" - "github.com/Finschia/ostracon/types" "github.com/spf13/cobra" cfg "github.com/Finschia/ostracon/config" tmjson "github.com/Finschia/ostracon/libs/json" tmos "github.com/Finschia/ostracon/libs/os" + "github.com/Finschia/ostracon/node" "github.com/Finschia/ostracon/privval" + "github.com/Finschia/ostracon/types" ) // ShowValidatorCmd adds capabilities for showing the validator info. @@ -24,9 +25,9 @@ var ShowValidatorCmd = &cobra.Command{ PreRun: deprecateSnakeCase, } -func showValidator(cmd *cobra.Command, args []string, config *cfg.Config) error { +func showValidator(_ *cobra.Command, _ []string, config *cfg.Config) error { var pv types.PrivValidator - if config.PrivValidatorListenAddr != "" { + if strings.TrimSpace(config.PrivValidatorListenAddr) != "" { chainID, err := loadChainID(config) if err != nil { return err diff --git a/node/node.go b/node/node.go index 6cf8156aa..732b16335 100644 --- a/node/node.go +++ b/node/node.go @@ -7,6 +7,7 @@ import ( "fmt" "net" "net/http" + _ "net/http/pprof" // nolint: gosec // securely exposed on separate, optional port "strings" "time" @@ -53,8 +54,6 @@ import ( tmtime "github.com/Finschia/ostracon/types/time" "github.com/Finschia/ostracon/version" - _ "net/http/pprof" // nolint: gosec // securely exposed on separate, optional port - _ "github.com/lib/pq" // provide the psql db driver ) @@ -124,7 +123,7 @@ func NewOstraconNode(config *cfg.Config, logger log.Logger) (*Node, error) { } var privKey types.PrivValidator - if config.PrivValidatorListenAddr == "" { + if strings.TrimSpace(config.PrivValidatorListenAddr) == "" { privKey = privval.LoadFilePV( config.PrivValidatorKeyFile(), config.PrivValidatorStateFile()) @@ -792,7 +791,7 @@ func NewNode(config *cfg.Config, // If an address is provided, listen on the socket for a connection from an // external signing process. - if config.PrivValidatorListenAddr != "" { + if strings.TrimSpace(config.PrivValidatorListenAddr) != "" { // FIXME: we should start services inside OnStart privValidator, err = CreateAndStartPrivValidatorSocketClient(config, genDoc.ChainID, logger) if err != nil {