From e4efb8da8aa01c52b73577a84933f06327793afb Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Mon, 14 Jan 2019 12:25:44 +0000 Subject: [PATCH] Merge PR #3286: Print out sdk.AccAddress.String() instead of hex --- PENDING.md | 2 +- cmd/gaia/init/gentx.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PENDING.md b/PENDING.md index 490fd171fa..c67deece03 100644 --- a/PENDING.md +++ b/PENDING.md @@ -20,7 +20,6 @@ BREAKING CHANGES * [\#3162](https://github.com/cosmos/cosmos-sdk/issues/3162) The `--gas` flag now takes `auto` instead of `simulate` in order to trigger a simulation of the tx before the actual execution. - * SDK * [staking] \#2513 Validator power type from Dec -> Int * [staking] \#3233 key and value now contain duplicate fields to simplify code @@ -73,6 +72,7 @@ IMPROVEMENTS * [\#3172](https://github.com/cosmos/cosmos-sdk/pull/3172) Support minimum fees in a local testnet. * [\#3250](https://github.com/cosmos/cosmos-sdk/pull/3250) Refactor integration tests and increase coverage * [\#2859](https://github.com/cosmos/cosmos-sdk/issues/2859) Rename `TallyResult` in gov proposals to `FinalTallyResult` + * [\#3286](https://github.com/cosmos/cosmos-sdk/pull/3286) Fix `gaiad gentx` printout of account's addresses, i.e. user bech32 instead of hex. * SDK * [\#3137](https://github.com/cosmos/cosmos-sdk/pull/3137) Add tag documentation diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index 13a7a3a879..25de93aab4 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -178,8 +178,8 @@ func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins s // Ensure account contains enough funds of default bond denom if coins.AmountOf(bondDenom).GT(acc.Coins.AmountOf(bondDenom)) { return fmt.Errorf( - "Account %v is in genesis, but the only has %v%v available to stake, not %v%v", - key, acc.Coins.AmountOf(bondDenom), bondDenom, coins.AmountOf(bondDenom), bondDenom, + "account %v is in genesis, but it only has %v%v available to stake, not %v%v", + key.String(), acc.Coins.AmountOf(bondDenom), bondDenom, coins.AmountOf(bondDenom), bondDenom, ) } accountIsInGenesis = true @@ -191,7 +191,7 @@ func accountInGenesis(genesisState app.GenesisState, key sdk.AccAddress, coins s return nil } - return fmt.Errorf("Account %s in not in the app_state.accounts array of genesis.json", key) + return fmt.Errorf("account %s in not in the app_state.accounts array of genesis.json", key) } func prepareFlagsForTxCreateValidator(config *cfg.Config, nodeID, ip, chainID string,