Move out const from module to testutil

testing/simapp/test_helpers.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/realio-tech/multi-staking-module/testutil"
 	multistakingtypes "github.com/realio-tech/multi-staking-module/x/multi-staking/types"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -87,8 +88,8 @@ func Setup(isCheckTx bool) *SimApp {
 	balance := banktypes.Balance{
 		Address: acc.GetAddress().String(),
 		Coins: sdk.NewCoins(
-			sdk.NewCoin(multistakingtypes.BaseDenom, sdk.NewInt(100000000000000)),
-			sdk.NewCoin(multistakingtypes.GovDenom, sdk.NewInt(100000000000000)),
+			sdk.NewCoin(testutil.MultistakingDenomA, sdk.NewInt(100000000000000)),
+			sdk.NewCoin(testutil.MultistakingDenomB, sdk.NewInt(100000000000000)),
 		),
 	}
 
@@ -138,11 +139,11 @@ func genesisStateWithValSet(app *SimApp, genesisState GenesisState,
 
 	// set multi staking genesis state
 	baseInfo := multistakingtypes.MultiStakingCoinInfo{
-		Denom:      multistakingtypes.BaseDenom,
+		Denom:      testutil.MultistakingDenomA,
 		BondWeight: sdk.OneDec(),
 	}
 	govInfo := multistakingtypes.MultiStakingCoinInfo{
-		Denom:      multistakingtypes.GovDenom,
+		Denom:      testutil.MultistakingDenomB,
 		BondWeight: sdk.MustNewDecFromStr("0.5"),
 	}
 	coinInfos := []multistakingtypes.MultiStakingCoinInfo{baseInfo, govInfo}
@@ -155,9 +156,9 @@ func genesisStateWithValSet(app *SimApp, genesisState GenesisState,
 
 	bondAmt := sdk.DefaultPowerReduction
 	for i, val := range valSet.Validators {
-		valDenom := multistakingtypes.BaseDenom
+		valDenom := testutil.MultistakingDenomA
 		if i%2 == 1 {
-			valDenom = multistakingtypes.GovDenom
+			valDenom = testutil.MultistakingDenomB
 		}
 		validatorCoins = append(validatorCoins, multistakingtypes.ValidatorMultiStakingCoin{
 			ValAddr:   sdk.ValAddress(val.Address).String(),

testutil/utils.go

@@ -0,0 +1,9 @@
+package testutil
+
+const (
+	// MultistakingDenomA defines the multi staking denomination A
+	MultistakingDenomA = "ario"
+
+	// MultistakingDenomB defines the multi staking denomination B
+	MultistakingDenomB = "arst"
+)

x/multi-staking/types/utils.go

@@ -4,14 +4,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-const (
-	// BaseDenom defines the base denomination
-	BaseDenom = "ario"
-
-	// GovDenom defines the governance denomination
-	GovDenom = "arst"
-)
-
 func AccAddrAndValAddrFromStrings(accAddrString string, valAddrStraing string) (sdk.AccAddress, sdk.ValAddress, error) {
 	accAddr, err := sdk.AccAddressFromBech32(accAddrString)
 	if err != nil {