From 117f70c7e48c7a04941a6ea13794cd03a33eca0a Mon Sep 17 00:00:00 2001 From: Peter Bukva Date: Fri, 4 Oct 2024 18:23:58 +0100 Subject: [PATCH] Cosmetic: Adding log message for loading source merge genesis json file --- app/app.go | 3 ++- app/upgrade_cudos.go | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index ff9042e5..5e163e3a 100644 --- a/app/app.go +++ b/app/app.go @@ -732,7 +732,8 @@ func getNetworkInfo(app *App, ctx *sdk.Context, manifest *UpgradeManifest, expec var networkInfo *NetworkConfig var err error if app.cudosMigrationConfigPath != "" { - app.Logger().Info("cudos merge: loading network config", "file", app.cudosMigrationConfigPath, "hash", app.cudosMigrationConfigSha256) + app.Logger().Info("cudos merge: loading network config", "file", app.cudosMigrationConfigPath, "expected sha256", app.cudosMigrationConfigSha256) + networkInfo, err = LoadNetworkConfigFromFile(app.cudosMigrationConfigPath, &app.cudosMigrationConfigSha256) if err != nil { return nil, err diff --git a/app/upgrade_cudos.go b/app/upgrade_cudos.go index c015e7a6..cb9b20e9 100644 --- a/app/upgrade_cudos.go +++ b/app/upgrade_cudos.go @@ -158,6 +158,8 @@ func LoadCudosGenesis(app *App, manifest *UpgradeManifest) (*map[string]interfac } manifest.GenesisFileSha256 = actualGenesisSha256Hex + app.Logger().Info("cudos merge: loading merge source genesis json file", "file", app.cudosGenesisPath, "expected sha256", app.cudosGenesisSha256) + _, genDoc, err := genutiltypes.GenesisStateFromGenFile(app.cudosGenesisPath) if err != nil { return nil, nil, fmt.Errorf("cudos merge: failed to unmarshal genesis state: %w", err)