fix default account addr prefix (#472)

cosmos · Aug 25, 2020 · b3c895d · b3c895d
1 parent 98610e4
commit b3c895d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/types/config_test.go b/types/config_test.go
@@ -24,4 +24,11 @@ func TestSetBech32Prefixes(t *testing.T) {
  require.Equal(t, Bech32PrefixValPub, config.GetBech32ValidatorPubPrefix())
  require.Equal(t, Bech32PrefixConsAddr, config.GetBech32ConsensusAddrPrefix())
  require.Equal(t, Bech32PrefixConsPub, config.GetBech32ConsensusPubPrefix())
+
+ require.Equal(t, sdk.GetConfig().GetBech32AccountAddrPrefix(), config.GetBech32AccountAddrPrefix())
+ require.Equal(t, sdk.GetConfig().GetBech32AccountPubPrefix(), config.GetBech32AccountPubPrefix())
+ require.Equal(t, sdk.GetConfig().GetBech32ValidatorAddrPrefix(), config.GetBech32ValidatorAddrPrefix())
+ require.Equal(t, sdk.GetConfig().GetBech32ValidatorPubPrefix(), config.GetBech32ValidatorPubPrefix())
+ require.Equal(t, sdk.GetConfig().GetBech32ConsensusAddrPrefix(), config.GetBech32ConsensusAddrPrefix())
+ require.Equal(t, sdk.GetConfig().GetBech32ConsensusPubPrefix(), config.GetBech32ConsensusPubPrefix())
 }
diff --git a/x/evm/client/cli/utils.go b/x/evm/client/cli/utils.go
@@ -12,7 +12,7 @@ import (
 )
 
 func accountToHex(addr string) (string, error) {
- if strings.HasPrefix(addr, sdk.Bech32PrefixAccAddr) {
+ if strings.HasPrefix(addr, sdk.GetConfig().GetBech32AccountAddrPrefix()) {
  // Check to see if address is Cosmos bech32 formatted
  toAddr, err := sdk.AccAddressFromBech32(addr)
  if err != nil {
@@ -47,7 +47,7 @@ func formatKeyToHash(key string) string {
 }
 
 func cosmosAddressFromArg(addr string) (sdk.AccAddress, error) {
- if strings.HasPrefix(addr, sdk.Bech32PrefixAccAddr) {
+ if strings.HasPrefix(addr, sdk.GetConfig().GetBech32AccountAddrPrefix()) {
  // Check to see if address is Cosmos bech32 formatted
  toAddr, err := sdk.AccAddressFromBech32(addr)
  if err != nil {