From 2a27ebc9ab2cba3ebe5a586895c82ae349d69b8c Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Tue, 23 Jul 2019 13:00:26 -0400 Subject: [PATCH] Merge PR #4767: Sort genesis JSON before printing --- .pending/bugfixes/_Sort-state-JSON-dur | 1 + server/export.go | 7 +++---- x/genutil/client/cli/init.go | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .pending/bugfixes/_Sort-state-JSON-dur diff --git a/.pending/bugfixes/_Sort-state-JSON-dur b/.pending/bugfixes/_Sort-state-JSON-dur new file mode 100644 index 0000000000..6904939213 --- /dev/null +++ b/.pending/bugfixes/_Sort-state-JSON-dur @@ -0,0 +1 @@ +Sort state JSON during export and initialization diff --git a/server/export.go b/server/export.go index d2b21c96d6..ec50fe6a80 100644 --- a/server/export.go +++ b/server/export.go @@ -4,18 +4,17 @@ package server import ( "fmt" + "io/ioutil" "os" "github.com/spf13/cobra" "github.com/spf13/viper" - - "io/ioutil" - dbm "github.com/tendermint/tendermint/libs/db" tmtypes "github.com/tendermint/tendermint/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" ) const ( @@ -81,7 +80,7 @@ func ExportCmd(ctx *Context, cdc *codec.Codec, appExporter AppExporter) *cobra.C return err } - fmt.Println(string(encoded)) + fmt.Println(string(sdk.MustSortJSON(encoded))) return nil }, } diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go index 947f9b64b1..028f80fc44 100644 --- a/x/genutil/client/cli/init.go +++ b/x/genutil/client/cli/init.go @@ -16,6 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/genutil" ) @@ -51,8 +52,8 @@ func displayInfo(cdc *codec.Codec, info printInfo) error { return err } - fmt.Fprintf(os.Stderr, "%s\n", string(out)) // nolint: errcheck - return nil + _, err = fmt.Fprintf(os.Stderr, "%s\n", string(sdk.MustSortJSON(out))) + return err } // InitCmd returns a command that initializes all files needed for Tendermint