Skip to content

Commit

Permalink
refactor: remove unnecessary config.Seal() (backport #3786) (#3801)
Browse files Browse the repository at this point in the history
- Add unit tests to cosmos SDK config set up
- Remove an unnecessary `config.Seal` invocation that has been around
for a [long
time](5e4a1dc#diff-9e0425d31b7cf4072a746feb0c6bc1e0045b639e01dd0b5ac2f08e8c2952c886R120)
but isn't necessary because the `init()` command always sets and seals
the config.<hr>This is an automatic backport of pull request #3786 done
by [Mergify](https://mergify.com).

---------

Co-authored-by: Rootul P <rootulp@gmail.com>
  • Loading branch information
mergify[bot] and rootulp authored Aug 20, 2024
1 parent 37c7e11 commit 3a2633a
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 16 deletions.
13 changes: 0 additions & 13 deletions app/config.go

This file was deleted.

15 changes: 15 additions & 0 deletions app/sdk_config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package app

import sdk "github.com/cosmos/cosmos-sdk/types"

func init() {
setCosmosSDKConfig()
}

func setCosmosSDKConfig() {
config := sdk.GetConfig()
config.SetBech32PrefixForAccount(Bech32PrefixAccAddr, Bech32PrefixAccPub)
config.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub)
config.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub)
config.Seal()
}
18 changes: 18 additions & 0 deletions app/sdk_config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package app

import (
"testing"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/assert"
)

func Test_setCosmosSDKConfig(t *testing.T) {
config := sdk.GetConfig()
assert.Equal(t, Bech32PrefixAccAddr, config.GetBech32AccountAddrPrefix())
assert.Equal(t, Bech32PrefixAccPub, config.GetBech32AccountPubPrefix())
assert.Equal(t, Bech32PrefixValAddr, config.GetBech32ValidatorAddrPrefix())
assert.Equal(t, Bech32PrefixValPub, config.GetBech32ValidatorPubPrefix())
assert.Equal(t, Bech32PrefixConsAddr, config.GetBech32ConsensusAddrPrefix())
assert.Equal(t, Bech32PrefixConsPub, config.GetBech32ConsensusPubPrefix())
}
3 changes: 0 additions & 3 deletions cmd/celestia-appd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ func setDefaultConsensusParams(command *cobra.Command) error {
}

func initRootCmd(rootCmd *cobra.Command, encodingConfig encoding.Config) {
cfg := sdk.GetConfig()
cfg.Seal()

rootCmd.AddCommand(
genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome),
genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome),
Expand Down

0 comments on commit 3a2633a

Please sign in to comment.