fix strange address name conflicts

x/common/constants.go

@@ -7,9 +7,9 @@ const (
 	// TO_MICRO: multiplier for converting between units and micro-units.
 	TO_MICRO = int64(1_000_000)
 
-	NibiruTeam = "nibi1l8dxzwz9d4peazcqjclnkj2mhvtj7mpnkqx85mg0ndrlhwrnh7gskkzg0v"
+	NIBIRU_TEAM = "nibi1l8dxzwz9d4peazcqjclnkj2mhvtj7mpnkqx85mg0ndrlhwrnh7gskkzg0v"
 )
 
 func NibiruTeamAddr() sdk.AccAddress {
-	return sdk.MustAccAddressFromBech32(NibiruTeam)
+	return sdk.MustAccAddressFromBech32(NIBIRU_TEAM)
 }

x/common/testutil/const.go

@@ -0,0 +1,6 @@
+package testutil
+
+const (
+	ADDR_GUARD_CREAM = "nibi1zaavvzxez0elundtn32qnk9lkm8kmcsz44g7xl"
+	ADDR_SUDO_ROOT   = "nibi1qqx5reauy4glpskmppy88pz25qp2py5yxvpxdt"
+)

x/common/testutil/testapp/testapp.go

@@ -15,6 +15,7 @@ import (
 	"github.com/NibiruChain/nibiru/app"
 	"github.com/NibiruChain/nibiru/x/common/asset"
 	"github.com/NibiruChain/nibiru/x/common/denoms"
+	"github.com/NibiruChain/nibiru/x/common/testutil"
 	epochstypes "github.com/NibiruChain/nibiru/x/epochs/types"
 	inflationtypes "github.com/NibiruChain/nibiru/x/inflation/types"
 	"github.com/NibiruChain/nibiru/x/perp/v2/types"
@@ -52,7 +53,6 @@ func NewContext(nibiru *app.NibiruApp) sdk.Context {
 
 // DefaultSudoers: State for the x/sudo module for the default test app.
 func DefaultSudoers() sudotypes.Sudoers {
-	EnsureNibiruPrefix()
 	addr := DefaultSudoRoot().String()
 	return sudotypes.Sudoers{
 		Root:      addr,
@@ -61,7 +61,7 @@ func DefaultSudoers() sudotypes.Sudoers {
 }
 
 func DefaultSudoRoot() sdk.AccAddress {
-	return sdk.MustAccAddressFromBech32("nibi1zaavvzxez0elundtn32qnk9lkm8kmcsz44g7xl")
+	return sdk.MustAccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
 }
 
 // NewNibiruTestAppAndZeroTimeCtx: Runs NewNibiruTestAppAndZeroTimeCtx with the

x/perp/v2/integration/action/market.go

@@ -207,7 +207,7 @@ func (c setCollateral) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, err
 	if err != nil {
 		return ctx, err, true
 	}
-	sudoers.Root = common.NibiruTeam
+	sudoers.Root = common.NIBIRU_TEAM
 	app.SudoKeeper.Sudoers.Set(ctx, sudoers)
 
 	senderAddr, err := sdk.AccAddressFromBech32(c.Sender)
@@ -221,6 +221,6 @@ func (c setCollateral) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, err
 func SetCollateral(denom string) action.Action {
 	return setCollateral{
 		Denom:  denom,
-		Sender: common.NibiruTeam,
+		Sender: common.NIBIRU_TEAM,
 	}
 }

x/perp/v2/module/genesis_test.go

@@ -84,7 +84,7 @@ func RunTestGenesis(t *testing.T, tc TestCase) {
 	pair := asset.Registry.Pair(denoms.BTC, denoms.NUSD)
 
 	// Initialize sudo state
-	nibiruTeam := common.NibiruTeam
+	nibiruTeam := common.NIBIRU_TEAM
 	sudoers := PerpSudoers()
 	sudoersRoot := sdk.MustAccAddressFromBech32(nibiruTeam)
 	sudoers.Root = sudoersRoot.String()

x/spot/genesis_test.go

@@ -13,6 +13,7 @@ import (
 )
 
 func TestGenesis(t *testing.T) {
+	testapp.EnsureNibiruPrefix()
 	genesisState := types.GenesisState{
 		Params: types.DefaultParams(),
 		Pools: []types.Pool{

x/spot/keeper/balances_test.go

@@ -52,6 +52,7 @@ func TestCheckBalances(t *testing.T) {
 	for _, tc := range tests {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
+			testapp.EnsureNibiruPrefix()
 			app, ctx := testapp.NewNibiruTestAppAndContext()
 
 			// fund user account