Revert "replace valopers"

This reverts commit 4074f2f.

Author: swelf19

app/upgrades/v6.0.0/deics.go

@@ -37,10 +37,6 @@ const (
 //go:embed validators/staking
 var Vals embed.FS
 
-var ValoperReplacements = map[string]string{
-	"neutronvaloper15x2ml0qepktnd6egk4l0rtl0z8fpfxktmzww59": "neutronvaloper1sgr7u20etqn453k3qcfqldrj5fnahl4q8vngzu",
-}
-
 type StakingValidator struct {
 	Valoper         string         `json:"valoper"`
 	Moniker         string         `json:"moniker,omitempty"`
@@ -120,29 +116,20 @@ func MoveICSToStaking(ctx sdk.Context, sk stakingkeeper.Keeper, bk bankkeeper.Ke
 
 	// Add all ICS validators to staking module
 	for i, v := range consumerValidators {
-		va := v.GetAddress()
-		valoperAddr, err := bech32.ConvertAndEncode("neutronvaloper", va)
-		if err != nil {
-			return err
-		}
-
-		if replacement, ok := ValoperReplacements[valoperAddr]; ok {
-			valoperAddr = replacement
-			_, va, err = bech32.DecodeAndConvert(valoperAddr)
-			if err != nil {
-				return err
-			}
-		}
-
 		// funding ICS valopers from DAO to stake a coin
-		err = bk.SendCoins(ctx, DAOaddr, va, sdk.NewCoins(sdk.Coin{
+		err := bk.SendCoins(ctx, DAOaddr, v.GetAddress(), sdk.NewCoins(sdk.Coin{
 			Denom:  params.DefaultDenom,
 			Amount: math.NewInt(ICSSelfStake),
 		}))
 		if err != nil {
 			return err
 		}
 
+		valoperAddr, err := bech32.ConvertAndEncode("neutronvaloper", v.GetAddress())
+		if err != nil {
+			return err
+		}
+
 		consPubKey, err := v.ConsPubKey()
 		if err != nil {
 			return err
@@ -184,12 +171,12 @@ func MoveICSToStaking(ctx sdk.Context, sk stakingkeeper.Keeper, bk bankkeeper.Ke
 			return err
 		}
 
-		err = sk.SetLastValidatorPower(ctx, va, 1)
+		err = sk.SetLastValidatorPower(ctx, v.GetAddress(), 1)
 		if err != nil {
 			return err
 		}
 
-		savedVal, err := sk.GetValidator(ctx, va)
+		savedVal, err := sk.GetValidator(ctx, v.GetAddress())
 		if err != nil {
 			return err
 		}

app/upgrades/v6.0.0/upgrades_test.go

@@ -145,11 +145,6 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 			commonAddress = expVals[mapKeys(expVals)[0]]
 			pk = &commonAddress
 		}
-		if i == 1 {
-			addr = "neutronvaloper15x2ml0qepktnd6egk4l0rtl0z8fpfxktmzww59" // first valoper map key
-			_, ccvAddr, err = bech32.DecodeAndConvert(addr)
-			require.NoError(t, err)
-		}
 		ccvVals[addr] = pk
 		anyPK, err := types2.NewAnyWithValue(pk)
 		require.NoError(t, err)
@@ -213,7 +208,8 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 			countStaking++
 			require.Equal(t, newVal.Status, types.Unbonded)
 			require.Equal(t, newVal.Tokens, math.NewInt(v600.SovereignSelfStake))
-		} else if _, ok := ccvVals[newVal.OperatorAddress]; ok {
+		}
+		if _, ok := ccvVals[newVal.OperatorAddress]; ok {
 			countCCV++
 			require.Equal(t, newVal.Status, types.Bonded)
 			require.Equal(t, newVal.Tokens, math.NewInt(v600.ICSSelfStake))
@@ -223,8 +219,7 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 	require.Equal(t, countStaking, len(expectedVals))
 
 	// all ccv vals in the set, except the one we created as common
-	// -1 because of shared valoper
-	require.Equal(t, countCCV, len(ccvVals)-commonValidators-1)
+	require.Equal(t, countCCV, len(ccvVals)-commonValidators)
 
 	bondedBalanceAfter, err := app.BankKeeper.Balance(ctx, &banktypes.QueryBalanceRequest{
 		Address: authtypes.NewModuleAddress(types.BondedPoolName).String(),