From 3cabca63325b640caf997085d3868725b270ea7f Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Mon, 6 Apr 2020 12:11:08 -0400 Subject: [PATCH 1/2] x/genutil: fix InitializeNodeValidatorFiles --- x/genutil/utils.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/genutil/utils.go b/x/genutil/utils.go index 7d1a761ef562..3d8aa8f2ed00 100644 --- a/x/genutil/utils.go +++ b/x/genutil/utils.go @@ -52,7 +52,7 @@ func InitializeNodeValidatorFiles(config *cfg.Config, nodeKey, err := p2p.LoadOrGenNodeKey(config.NodeKeyFile()) if err != nil { - return nodeID, valPubKey, err + return "", nil, err } nodeID = string(nodeKey.ID()) @@ -60,12 +60,12 @@ func InitializeNodeValidatorFiles(config *cfg.Config, pvKeyFile := config.PrivValidatorKeyFile() if err := tmos.EnsureDir(filepath.Dir(pvKeyFile), 0777); err != nil { - return nodeID, valPubKey, nil + return "", nil, err } pvStateFile := config.PrivValidatorStateFile() if err := tmos.EnsureDir(filepath.Dir(pvStateFile), 0777); err != nil { - return nodeID, valPubKey, nil + return "", nil, err } valPubKey = privval.LoadOrGenFilePV(pvKeyFile, pvStateFile).GetPubKey() From fabfbd0aa474353088c79cbb598990dbd47043ff Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Mon, 6 Apr 2020 12:15:06 -0400 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bcbedca0ae0..4f1fc9c7bbd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,6 +98,7 @@ when method receivers are offline/multisig keys. types (eg. keys) to the `auth` module internal amino codec. * (rest) [\#5906](https://github.com/cosmos/cosmos-sdk/pull/5906) Fix an issue that make some REST calls panic when sending invalid or incomplete requests. +* (x/genutil) [\#5938](https://github.com/cosmos/cosmos-sdk/pull/5938) Fix `InitializeNodeValidatorFiles` error handling. ### State Machine Breaking