diff --git a/app/app.go b/app/app.go index d43ac6d1bf..26a903d746 100644 --- a/app/app.go +++ b/app/app.go @@ -80,7 +80,6 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - regentypes "github.com/regen-network/regen-ledger/types" moduletypes "github.com/regen-network/regen-ledger/types/module" "github.com/regen-network/regen-ledger/types/module/server" data "github.com/regen-network/regen-ledger/x/data/module" @@ -156,11 +155,6 @@ func init() { // this changes the power reduction from 10e6 to 10e2, which will give // every validator 10,000 times more voting power than they currently have sdk.DefaultPowerReduction = sdk.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(2), nil)) - - // TODO: remove after updating to cosmos-sdk v0.46 #857 - sdk.SetCoinDenomRegex(func() string { - return regentypes.CoinDenomRegex - }) } // Extended ABCI application @@ -547,7 +541,6 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest } app.SetAnteHandler(anteHandler) - if loadLatest { if err := app.LoadLatestVersion(); err != nil { tmos.Exit(err.Error()) diff --git a/types/coin.go b/types/coin.go deleted file mode 100644 index b91b0ba24f..0000000000 --- a/types/coin.go +++ /dev/null @@ -1,8 +0,0 @@ -package types - -var ( - // CoinDenomRegex is used instead of DefaultCoinDenomRegex - // to support basket denomination and DID characters - // TODO: remove after updating to cosmos-sdk v0.46 #857 - CoinDenomRegex = `[a-zA-Z][a-zA-Z0-9/:._-]{2,127}` -) diff --git a/x/ecocredit/server/server_test.go b/x/ecocredit/server/server_test.go index 23a3da19b7..ec8121eeaa 100644 --- a/x/ecocredit/server/server_test.go +++ b/x/ecocredit/server/server_test.go @@ -68,7 +68,7 @@ func setup(t *testing.T) (*server.FixtureFactory, paramstypes.Subspace, bankkeep } accountKeeper := authkeeper.NewAccountKeeper( - cdc, authKey, authSubspace, authtypes.ProtoBaseAccount, maccPerms, sdk.DefaultBondDenom, + cdc, authKey, authSubspace, authtypes.ProtoBaseAccount, maccPerms, "regen", ) bankKeeper := bankkeeper.NewBaseKeeper(